Skip to content

Commit 02ece83

Browse files
ChrisJollyAUChrisJollyAU
committed
fix tests
1 parent 95d6f3a commit 02ece83

File tree

8 files changed

+27
-39
lines changed

8 files changed

+27
-39
lines changed

‎test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17768,9 +17768,6 @@ EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericT
1776817768
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_sentinel_for_properties
1776917769
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_sentinel_for_property_type
1777017770
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unbounded_max_length_for_property_type
17771-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_primitive_collections
17772-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_properties
17773-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_property_type
1777417771
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_specify_discriminator_value
1777517772
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_specify_discriminator_without_explicit_value
1777617773
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_use_table_splitting

‎test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17775,9 +17775,6 @@ EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericT
1777517775
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_sentinel_for_properties
1777617776
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_sentinel_for_property_type
1777717777
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unbounded_max_length_for_property_type
17778-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_primitive_collections
17779-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_properties
17780-
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_set_unicode_for_property_type
1778117778
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_use_table_splitting
1778217779
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_use_table_splitting_with_schema
1778317780
EntityFrameworkCore.Jet.FunctionalTests.ModelBuilding.JetModelBuilderNonGenericTest+JetNonGenericComplexType.Can_use_TPH

‎test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -746,22 +746,22 @@ public virtual Task Filter_on_property_inside_complex_type_with_FromSql(bool asy
746746
async,
747747
ss => ((DbSet<Customer>)ss.Set<Customer>()).FromSqlRaw(
748748
"""
749-
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
749+
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[OptionalAddress_AddressLine1], [c].[OptionalAddress_AddressLine2], [c].[OptionalAddress_Tags], [c].[OptionalAddress_ZipCode], [c].[OptionalAddress_Country_Code], [c].[OptionalAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
750750
FROM [Customer] AS [c]
751751
WHERE [c].[ShippingAddress_ZipCode] = 7728
752752
"""),
753753
ss => ss.Set<Customer>().Where(c => c.ShippingAddress.ZipCode == 07728));
754754

755-
[ConditionalTheory]
756-
[MemberData(nameof(IsAsyncData))]
755+
756+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
757757
public virtual Task Filter_on_property_inside_complex_type_after_subquery_with_FromSql(bool async)
758758
=> AssertQuery(
759759
async,
760760
ss => ((DbSet<Customer>)ss.Set<Customer>()).FromSql(
761761
$"""
762-
SELECT DISTINCT [t].[Id], [t].[Name], [t].[BillingAddress_AddressLine1], [t].[BillingAddress_AddressLine2], [t].[BillingAddress_Tags], [t].[BillingAddress_ZipCode], [t].[BillingAddress_Country_Code], [t].[BillingAddress_Country_FullName], [t].[ShippingAddress_AddressLine1], [t].[ShippingAddress_AddressLine2], [t].[ShippingAddress_Tags], [t].[ShippingAddress_ZipCode], [t].[ShippingAddress_Country_Code], [t].[ShippingAddress_Country_FullName]
762+
SELECT DISTINCT [t].[Id], [t].[Name], [t].[BillingAddress_AddressLine1], [t].[BillingAddress_AddressLine2], [t].[BillingAddress_Tags], [t].[BillingAddress_ZipCode], [t].[BillingAddress_Country_Code], [t].[BillingAddress_Country_FullName], [t].[OptionalAddress_AddressLine1], [t].[OptionalAddress_AddressLine2], [t].[OptionalAddress_Tags], [t].[OptionalAddress_ZipCode], [t].[OptionalAddress_Country_Code], [t].[OptionalAddress_Country_FullName], [t].[ShippingAddress_AddressLine1], [t].[ShippingAddress_AddressLine2], [t].[ShippingAddress_Tags], [t].[ShippingAddress_ZipCode], [t].[ShippingAddress_Country_Code], [t].[ShippingAddress_Country_FullName]
763763
FROM (
764-
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
764+
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[OptionalAddress_AddressLine1], [c].[OptionalAddress_AddressLine2], [c].[OptionalAddress_Tags], [c].[OptionalAddress_ZipCode], [c].[OptionalAddress_Country_Code], [c].[OptionalAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
765765
FROM [Customer] AS [c]
766766
ORDER BY [c].[Id]
767767
OFFSET {1} ROWS
@@ -774,16 +774,15 @@ ORDER BY [c].[Id]
774774
.Distinct()
775775
.Where(c => c.ShippingAddress.ZipCode == 07728));
776776

777-
[ConditionalTheory]
778-
[MemberData(nameof(IsAsyncData))]
777+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
779778
public virtual Task Load_complex_type_after_subquery_on_entity_type_with_FromSql(bool async)
780779
=> AssertQuery(
781780
async,
782781
ss => ((DbSet<Customer>)ss.Set<Customer>()).FromSql(
783782
$"""
784-
SELECT DISTINCT [t].[Id], [t].[Name], [t].[BillingAddress_AddressLine1], [t].[BillingAddress_AddressLine2], [t].[BillingAddress_Tags], [t].[BillingAddress_ZipCode], [t].[BillingAddress_Country_Code], [t].[BillingAddress_Country_FullName], [t].[ShippingAddress_AddressLine1], [t].[ShippingAddress_AddressLine2], [t].[ShippingAddress_Tags], [t].[ShippingAddress_ZipCode], [t].[ShippingAddress_Country_Code], [t].[ShippingAddress_Country_FullName]
783+
SELECT DISTINCT [t].[Id], [t].[Name], [t].[BillingAddress_AddressLine1], [t].[BillingAddress_AddressLine2], [t].[BillingAddress_Tags], [t].[BillingAddress_ZipCode], [t].[BillingAddress_Country_Code], [t].[BillingAddress_Country_FullName], [t].[OptionalAddress_AddressLine1], [t].[OptionalAddress_AddressLine2], [t].[OptionalAddress_Tags], [t].[OptionalAddress_ZipCode], [t].[OptionalAddress_Country_Code], [t].[OptionalAddress_Country_FullName], [t].[ShippingAddress_AddressLine1], [t].[ShippingAddress_AddressLine2], [t].[ShippingAddress_Tags], [t].[ShippingAddress_ZipCode], [t].[ShippingAddress_Country_Code], [t].[ShippingAddress_Country_FullName]
785784
FROM (
786-
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
785+
SELECT [c].[Id], [c].[Name], [c].[BillingAddress_AddressLine1], [c].[BillingAddress_AddressLine2], [c].[BillingAddress_Tags], [c].[BillingAddress_ZipCode], [c].[BillingAddress_Country_Code], [c].[BillingAddress_Country_FullName], [c].[OptionalAddress_AddressLine1], [c].[OptionalAddress_AddressLine2], [c].[OptionalAddress_Tags], [c].[OptionalAddress_ZipCode], [c].[OptionalAddress_Country_Code], [c].[OptionalAddress_Country_FullName], [c].[ShippingAddress_AddressLine1], [c].[ShippingAddress_AddressLine2], [c].[ShippingAddress_Tags], [c].[ShippingAddress_ZipCode], [c].[ShippingAddress_Country_Code], [c].[ShippingAddress_Country_FullName]
787786
FROM [Customer] AS [c]
788787
ORDER BY [c].[Id]
789788
OFFSET {1} ROWS
@@ -794,8 +793,7 @@ ORDER BY [c].[Id]
794793
.Skip(1)
795794
.Distinct());
796795

797-
[ConditionalTheory]
798-
[MemberData(nameof(IsAsyncData))]
796+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
799797
public virtual Task Select_complex_type_with_FromSql(bool async)
800798
=> AssertQuery(
801799
async,
@@ -806,8 +804,7 @@ FROM [Customer] AS [c]
806804
""").Select(c => c.ShippingAddress),
807805
ss => ss.Set<Customer>().Select(c => c.ShippingAddress));
808806

809-
[ConditionalTheory]
810-
[MemberData(nameof(IsAsyncData))]
807+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
811808
public virtual Task Select_nested_complex_type_with_FromSql(bool async)
812809
=> AssertQuery(
813810
async,
@@ -818,8 +815,7 @@ FROM [Customer] AS [c]
818815
""").Select(c => c.ShippingAddress.Country),
819816
ss => ss.Set<Customer>().Select(c => c.ShippingAddress.Country));
820817

821-
[ConditionalTheory]
822-
[MemberData(nameof(IsAsyncData))]
818+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
823819
public virtual Task Select_single_property_on_nested_complex_type_with_FromSql(bool async)
824820
=> AssertQuery(
825821
async,
@@ -830,8 +826,7 @@ FROM [Customer] AS [c]
830826
""").Select(c => c.ShippingAddress.Country.FullName),
831827
ss => ss.Set<Customer>().Select(c => c.ShippingAddress.Country.FullName));
832828

833-
[ConditionalTheory]
834-
[MemberData(nameof(IsAsyncData))]
829+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
835830
public virtual Task Select_complex_type_Where_with_FromSql(bool async)
836831
=> AssertQuery(
837832
async,
@@ -842,8 +837,7 @@ FROM [Customer] AS [c]
842837
""").Select(c => c.ShippingAddress).Where(a => a.ZipCode == 07728),
843838
ss => ss.Set<Customer>().Select(c => c.ShippingAddress).Where(a => a.ZipCode == 07728));
844839

845-
[ConditionalTheory]
846-
[MemberData(nameof(IsAsyncData))]
840+
[ConditionalTheory, MemberData(nameof(IsAsyncData))]
847841
public virtual Task Select_complex_type_Distinct_with_FromSql(bool async)
848842
=> AssertQuery(
849843
async,

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindGroupByQueryJetTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3053,9 +3053,9 @@ public override async Task GroupBy_aggregate_after_skip_0_take_0(bool async)
30533053
FROM (
30543054
SELECT `o`.`CustomerID`
30553055
FROM `Orders` AS `o`
3056-
WHERE 0 = 1
3056+
WHERE FALSE
30573057
) AS `o1`
3058-
WHERE 0 = 1
3058+
WHERE FALSE
30593059
) AS `o2`
30603060
) AS `o0`
30613061
GROUP BY `o0`.`CustomerID`
@@ -3076,9 +3076,9 @@ public override async Task GroupBy_skip_0_take_0_aggregate(bool async)
30763076
FROM `Orders` AS `o`
30773077
WHERE `o`.`OrderID` > 10500
30783078
GROUP BY `o`.`CustomerID`
3079-
HAVING 0 = 1
3079+
HAVING FALSE
30803080
) AS `o0`
3081-
WHERE 0 = 1
3081+
WHERE FALSE
30823082
) AS `o1`
30833083
""");
30843084
}

‎test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5813,9 +5813,9 @@ public override async Task Skip_0_Take_0_works_when_parameter(bool async)
58135813
FROM (
58145814
SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
58155815
FROM `Customers` AS `c`
5816-
WHERE 0 = 1
5816+
WHERE FALSE
58175817
) AS `c0`
5818-
WHERE 0 = 1
5818+
WHERE FALSE
58195819
) AS `c1`
58205820
ORDER BY `c1`.`CustomerID`
58215821
""",

‎test/EFCore.Jet.FunctionalTests/Query/Translations/EnumTranslationsJetTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public override async Task Bitwise_and_integral_constant()
150150
"""
151151
SELECT `b`.`Id`, `b`.`Bool`, `b`.`Byte`, `b`.`ByteArray`, `b`.`DateOnly`, `b`.`DateTime`, `b`.`DateTimeOffset`, `b`.`Decimal`, `b`.`Double`, `b`.`Enum`, `b`.`FlagsEnum`, `b`.`Float`, `b`.`Guid`, `b`.`Int`, `b`.`Long`, `b`.`Short`, `b`.`String`, `b`.`TimeOnly`, `b`.`TimeSpan`
152152
FROM `BasicTypesEntities` AS `b`
153-
WHERE (CINT(`b`.`FlagsEnum`) BAND 8) = 8
153+
WHERE (CLNG(CINT(`b`.`FlagsEnum`)) BAND 8) = 8
154154
""");
155155
}
156156

‎test/EFCore.Jet.FunctionalTests/Update/NonSharedModelUpdatesJetTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public override async Task Principal_and_dependent_roundtrips_with_cycle_breakin
3232
""",
3333
//
3434
"""
35-
@p1='2'
35+
@p1='1'
3636
@p2='Alice' (Size = 255)
3737
3838
INSERT INTO `Author` (`AuthorsClubId`, `Name`)
@@ -43,7 +43,7 @@ public override async Task Principal_and_dependent_roundtrips_with_cycle_breakin
4343
""",
4444
//
4545
"""
46-
@p3='2'
46+
@p3='1'
4747
@p4=NULL (Size = 255)
4848
4949
INSERT INTO `Book` (`AuthorId`, `Title`)
@@ -70,7 +70,7 @@ public override async Task Principal_and_dependent_roundtrips_with_cycle_breakin
7070
""",
7171
//
7272
"""
73-
@p1='3'
73+
@p1='2'
7474
@p2='Author of the year 2023' (Size = 255)
7575
7676
INSERT INTO `Author` (`AuthorsClubId`, `Name`)
@@ -81,16 +81,16 @@ public override async Task Principal_and_dependent_roundtrips_with_cycle_breakin
8181
""",
8282
//
8383
"""
84-
@p3='3'
85-
@p4='2'
84+
@p3='2'
85+
@p4='1'
8686
8787
UPDATE `Book` SET `AuthorId` = @p3
8888
WHERE `Id` = @p4;
8989
SELECT @@ROWCOUNT;
9090
""",
9191
//
9292
"""
93-
@p0='2'
93+
@p0='1'
9494
9595
DELETE FROM `Author`
9696
WHERE `Id` = @p0;

‎test/EFCore.Jet.FunctionalTests/Update/StoredProcedureUpdateJetTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ CREATE PROCEDURE Entity_Delete(@Id int)
216216

217217
AssertSql(
218218
"""
219-
@p0='2'
219+
@p0='1'
220220
221221
EXEC `Entity_Delete` p0;
222222
""");

0 commit comments

Comments
 (0)