Remove JsonQuery and JsonUpdate tests as none work and will never work.

Add the base classes to the ignore list in the compliance test
pull/175/head
Christopher Jolly 2 years ago
parent 59e9723548
commit 2e4f22e30d

@ -1,11 +1,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.Update;
namespace EntityFrameworkCore.Jet.FunctionalTests
{
@ -15,17 +13,13 @@ namespace EntityFrameworkCore.Jet.FunctionalTests
protected override ICollection<Type> IgnoredTestBases { get; } = new HashSet<Type>
{
typeof(SpatialQueryRelationalTestBase<>),
typeof(Microsoft.EntityFrameworkCore.Query.SpatialQueryTestBase<>),
typeof(Microsoft.EntityFrameworkCore.SpatialTestBase<>),
typeof(PrimitiveCollectionsQueryTestBase<>),
typeof(SpatialQueryTestBase<>),
typeof(SpatialTestBase<>),
typeof(NonSharedPrimitiveCollectionsQueryTestBase),
typeof(NonSharedPrimitiveCollectionsQueryRelationalTestBase),
//Gears of War is our own customized version so we can ignore the Microsoft TestBase classes
typeof(Microsoft.EntityFrameworkCore.Query.GearsOfWarQueryTestBase<>),
typeof(Microsoft.EntityFrameworkCore.Query.TPTGearsOfWarQueryRelationalTestBase<>),
typeof(Microsoft.EntityFrameworkCore.Query.GearsOfWarQueryRelationalTestBase<>),
typeof(Microsoft.EntityFrameworkCore.Query.TPCGearsOfWarQueryRelationalTestBase<>),
typeof(Microsoft.EntityFrameworkCore.Query.GearsOfWarFromSqlQueryTestBase<>)
typeof(JsonQueryTestBase<>),
typeof(JsonQueryAdHocTestBase),
typeof(JsonUpdateTestBase<>)
};
protected override Assembly TargetAssembly { get; } = typeof(JetComplianceTest).Assembly;

@ -1,150 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using System.Collections.Generic;
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.TestUtilities;
using Xunit.Abstractions;
namespace EntityFrameworkCore.Jet.FunctionalTests.Query;
public class JsonQueryAdHocJetTest : JsonQueryAdHocTestBase
{
protected override ITestStoreFactory TestStoreFactory
=> JetTestStoreFactory.Instance;
protected override void Seed29219(MyContext29219 ctx)
{
var entity1 = new MyEntity29219
{
Id = 1,
Reference = new MyJsonEntity29219 { NonNullableScalar = 10, NullableScalar = 11 },
Collection = new List<MyJsonEntity29219>
{
new MyJsonEntity29219 { NonNullableScalar = 100, NullableScalar = 101 },
new MyJsonEntity29219 { NonNullableScalar = 200, NullableScalar = 201 },
new MyJsonEntity29219 { NonNullableScalar = 300, NullableScalar = null },
}
};
var entity2 = new MyEntity29219
{
Id = 2,
Reference = new MyJsonEntity29219 { NonNullableScalar = 20, NullableScalar = null },
Collection = new List<MyJsonEntity29219>
{
new MyJsonEntity29219 { NonNullableScalar = 1001, NullableScalar = null },
}
};
ctx.Entities.AddRange(entity1, entity2);
ctx.SaveChanges();
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Id], [Reference], [Collection])
VALUES(3, '{{ ""NonNullableScalar"" : 30 }}', '[{{ ""NonNullableScalar"" : 10001 }}]')");
}
protected override void Seed30028(MyContext30028 ctx)
{
// complete
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Id], [Json])
VALUES(
1,
'{{""RootName"":""e1"",""Collection"":[{{""BranchName"":""e1 c1"",""Nested"":{{""LeafName"":""e1 c1 l""}}}},{{""BranchName"":""e1 c2"",""Nested"":{{""LeafName"":""e1 c2 l""}}}}],""OptionalReference"":{{""BranchName"":""e1 or"",""Nested"":{{""LeafName"":""e1 or l""}}}},""RequiredReference"":{{""BranchName"":""e1 rr"",""Nested"":{{""LeafName"":""e1 rr l""}}}}}}')");
// missing collection
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Id], [Json])
VALUES(
2,
'{{""RootName"":""e2"",""OptionalReference"":{{""BranchName"":""e2 or"",""Nested"":{{""LeafName"":""e2 or l""}}}},""RequiredReference"":{{""BranchName"":""e2 rr"",""Nested"":{{""LeafName"":""e2 rr l""}}}}}}')");
// missing optional reference
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Id], [Json])
VALUES(
3,
'{{""RootName"":""e3"",""Collection"":[{{""BranchName"":""e3 c1"",""Nested"":{{""LeafName"":""e3 c1 l""}}}},{{""BranchName"":""e3 c2"",""Nested"":{{""LeafName"":""e3 c2 l""}}}}],""RequiredReference"":{{""BranchName"":""e3 rr"",""Nested"":{{""LeafName"":""e3 rr l""}}}}}}')");
// missing required reference
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Id], [Json])
VALUES(
4,
'{{""RootName"":""e4"",""Collection"":[{{""BranchName"":""e4 c1"",""Nested"":{{""LeafName"":""e4 c1 l""}}}},{{""BranchName"":""e4 c2"",""Nested"":{{""LeafName"":""e4 c2 l""}}}}],""OptionalReference"":{{""BranchName"":""e4 or"",""Nested"":{{""LeafName"":""e4 or l""}}}}}}')");
}
protected override void SeedArrayOfPrimitives(MyContextArrayOfPrimitives ctx)
{
var entity1 = new MyEntityArrayOfPrimitives
{
Id = 1,
Reference = new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 1, 2, 3 },
ListOfString = new List<string> { "Foo", "Bar", "Baz" }
},
Collection = new List<MyJsonEntityArrayOfPrimitives>
{
new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 111, 112, 113 },
ListOfString = new List<string> { "Foo11", "Bar11" }
},
new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 211, 212, 213 },
ListOfString = new List<string> { "Foo12", "Bar12" }
},
}
};
var entity2 = new MyEntityArrayOfPrimitives
{
Id = 2,
Reference = new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 10, 20, 30 },
ListOfString = new List<string> { "A", "B", "C" }
},
Collection = new List<MyJsonEntityArrayOfPrimitives>
{
new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 110, 120, 130 },
ListOfString = new List<string> { "A1", "Z1" }
},
new MyJsonEntityArrayOfPrimitives
{
IntArray = new int[] { 210, 220, 230 },
ListOfString = new List<string> { "A2", "Z2" }
},
}
};
ctx.Entities.AddRange(entity1, entity2);
ctx.SaveChanges();
}
protected override void SeedJunkInJson(MyContextJunkInJson ctx)
{
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Collection], [CollectionWithCtor], [Reference], [ReferenceWithCtor], [Id])
VALUES(
'[{{""JunkReference"":{{""Something"":""SomeValue"" }},""Name"":""c11"",""JunkProperty1"":50,""Number"":11.5,""JunkCollection1"":[],""JunkCollection2"":[{{""Foo"":""junk value""}}],""NestedCollection"":[{{""DoB"":""2002-04-01T00:00:00"",""DummyProp"":""Dummy value""}},{{""DoB"":""2002-04-02T00:00:00"",""DummyReference"":{{""Foo"":5}}}}],""NestedReference"":{{""DoB"":""2002-03-01T00:00:00""}}}},{{""Name"":""c12"",""Number"":12.5,""NestedCollection"":[{{""DoB"":""2002-06-01T00:00:00""}},{{""DoB"":""2002-06-02T00:00:00""}}],""NestedDummy"":59,""NestedReference"":{{""DoB"":""2002-05-01T00:00:00""}}}}]',
'[{{""MyBool"":true,""Name"":""c11 ctor"",""JunkReference"":{{""Something"":""SomeValue"",""JunkCollection"":[{{""Foo"":""junk value""}}]}},""NestedCollection"":[{{""DoB"":""2002-08-01T00:00:00""}},{{""DoB"":""2002-08-02T00:00:00""}}],""NestedReference"":{{""DoB"":""2002-07-01T00:00:00""}}}},{{""MyBool"":false,""Name"":""c12 ctor"",""NestedCollection"":[{{""DoB"":""2002-10-01T00:00:00""}},{{""DoB"":""2002-10-02T00:00:00""}}],""JunkCollection"":[{{""Foo"":""junk value""}}],""NestedReference"":{{""DoB"":""2002-09-01T00:00:00""}}}}]',
'{{""Name"":""r1"",""JunkCollection"":[{{""Foo"":""junk value""}}],""JunkReference"":{{""Something"":""SomeValue"" }},""Number"":1.5,""NestedCollection"":[{{""DoB"":""2000-02-01T00:00:00"",""JunkReference"":{{""Something"":""SomeValue""}}}},{{""DoB"":""2000-02-02T00:00:00""}}],""NestedReference"":{{""DoB"":""2000-01-01T00:00:00""}}}}',
'{{""MyBool"":true,""JunkCollection"":[{{""Foo"":""junk value""}}],""Name"":""r1 ctor"",""JunkReference"":{{""Something"":""SomeValue"" }},""NestedCollection"":[{{""DoB"":""2001-02-01T00:00:00""}},{{""DoB"":""2001-02-02T00:00:00""}}],""NestedReference"":{{""JunkCollection"":[{{""Foo"":""junk value""}}],""DoB"":""2001-01-01T00:00:00""}}}}',
1)");
}
protected override void SeedShadowProperties(MyContextShadowProperties ctx)
{
ctx.Database.ExecuteSqlRaw(@"INSERT INTO [Entities] ([Collection], [CollectionWithCtor], [Reference], [ReferenceWithCtor], [Id], [Name])
VALUES(
'[{{""Name"":""e1_c1"",""ShadowDouble"":5.5}},{{""ShadowDouble"":20.5,""Name"":""e1_c2""}}]',
'[{{""Name"":""e1_c1 ctor"",""ShadowNullableByte"":6}},{{""ShadowNullableByte"":null,""Name"":""e1_c2 ctor""}}]',
'{{""Name"":""e1_r"", ""ShadowString"":""Foo""}}',
'{{""ShadowInt"":143,""Name"":""e1_r ctor""}}',
1,
'e1')");
}
}

@ -1,14 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.TestUtilities;
namespace EntityFrameworkCore.Jet.FunctionalTests.Query;
public class JsonQueryJetFixture : JsonQueryFixtureBase
{
protected override ITestStoreFactory TestStoreFactory
=> JetTestStoreFactory.Instance;
}

File diff suppressed because it is too large Load Diff

@ -14,7 +14,7 @@ using Xunit;
namespace EntityFrameworkCore.Jet.FunctionalTests.Query;
public class OperatorsQuerySqlServerTest : OperatorsQueryTestBase
public class OperatorsQueryJetTest : OperatorsQueryTestBase
{
protected override ITestStoreFactory TestStoreFactory
=> JetTestStoreFactory.Instance;

@ -1,15 +0,0 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
using Microsoft.EntityFrameworkCore.TestUtilities;
using Microsoft.EntityFrameworkCore.Update;
namespace EntityFrameworkCore.Jet.FunctionalTests.Update;
public class JsonUpdateJetFixture : JsonUpdateFixtureBase
{
protected override ITestStoreFactory TestStoreFactory
=> JetTestStoreFactory.Instance;
}

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save