diff --git a/src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs b/src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs index b43f8862e15..18dc0254bf8 100644 --- a/src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs +++ b/src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs @@ -429,21 +429,6 @@ static SqlServerTypeMappingSource() return base.FindCollectionMapping(info, modelType, providerType, elementMapping); #pragma warning restore EF1001 } - // => TryFindJsonCollectionMapping( - // info.CoreTypeMappingInfo, modelType, providerType, ref elementMapping, out var comparer, out var collectionReaderWriter) - // ? (RelationalTypeMapping)FindMapping( - // info.WithConverter( - // // Note that the converter info is only used temporarily here and never creates an instance. - // new ValueConverterInfo(modelType, typeof(string), _ => null!)))! - // .WithComposedConverter( - // (ValueConverter)Activator.CreateInstance( - // typeof(CollectionToJsonStringConverter<>).MakeGenericType( - // modelType.TryGetElementType(typeof(IEnumerable<>))!), collectionReaderWriter!)!, - // comparer, - // comparer, - // elementMapping, - // collectionReaderWriter) - // : null; private static readonly List NameBasesUsingPrecision = [ diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs index 1c6e29b8206..b06258474e0 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs @@ -14,28 +14,24 @@ public OwnedNavigationsCollectionCosmosTest(OwnedNavigationsCosmosFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Count(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Count(a); - - AssertSql( - """ + public override async Task Count() + { + await base.Count(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ARRAY_LENGTH(c["RelatedCollection"]) = 2) """); - }); + } - public override Task Where(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where(a); + public override async Task Where() + { + await base.Where(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (( @@ -43,17 +39,15 @@ SELECT VALUE COUNT(1) FROM r IN c["RelatedCollection"] WHERE (r["Int"] != 8)) = 2) """); - }); + } - public override async Task OrderBy_ElementAt(bool async) + public override async Task OrderBy_ElementAt() { - if (async) - { - // 'ORDER BY' is not supported in subqueries. - await Assert.ThrowsAsync(() => base.OrderBy_ElementAt(async)); + // 'ORDER BY' is not supported in subqueries. + await Assert.ThrowsAsync(() => base.OrderBy_ElementAt()); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ARRAY( @@ -61,68 +55,57 @@ SELECT VALUE r["Int"] FROM r IN c["RelatedCollection"] ORDER BY r["Id"])[0] = 8) """); - } } - public override Task Index_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Index_constant(a); + public override async Task Index_constant() + { + await base.Index_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["RelatedCollection"][0]["Int"] = 8) """); - }); + } - public override Task Index_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Index_parameter(a); + public override async Task Index_parameter() + { + await base.Index_parameter(); - AssertSql( - """ + AssertSql( + """ @i=? SELECT VALUE c FROM root c WHERE (c["RelatedCollection"][@i]["Int"] = 8) """); - }); + } - public override async Task Index_column(bool async) + public override async Task Index_column() { - if (async) - { - // The specified query includes 'member indexer' which is currently not supported - await Assert.ThrowsAsync(() => base.Index_column(async)); + // The specified query includes 'member indexer' which is currently not supported + await Assert.ThrowsAsync(() => base.Index_column()); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["RelatedCollection"][(c["Id"] - 1)]["Int"] = 8) """); - } } - public override async Task Index_out_of_bounds(bool async) + public override async Task Index_out_of_bounds() { - if (async) - { - await base.Index_out_of_bounds(async); + await base.Index_out_of_bounds(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["RelatedCollection"][9999]["Int"] = 8) """); - } } [ConditionalFact] diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs index 6cf9e3f97f0..00135662873 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs @@ -12,47 +12,41 @@ public OwnedNavigationsMiscellaneousCosmosTest(OwnedNavigationsCosmosFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Where_related_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_related_property(a); - - AssertSql( - """ + public override async Task Where_related_property() + { + await base.Where_related_property(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["RequiredRelated"]["Int"] = 8) """); - }); + } - public override Task Where_optional_related_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_optional_related_property(a); + public override async Task Where_optional_related_property() + { + await base.Where_optional_related_property(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["OptionalRelated"]["Int"] = 8) """); - }); + } - public override Task Where_nested_related_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_nested_related_property(a); + public override async Task Where_nested_related_property() + { + await base.Where_nested_related_property(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["RequiredRelated"]["RequiredNested"]["Int"] = 8) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs index ed633963db9..0e464f41b2e 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs @@ -14,172 +14,146 @@ public OwnedNavigationsProjectionCosmosTest(OwnedNavigationsCosmosFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - await base.Select_root(a, queryTrackingBehavior); + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) + { + await base.Select_root(queryTrackingBehavior); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c """); - }); + } #region Simple properties - public override Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - await base.Select_property_on_required_related(a, queryTrackingBehavior); + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + { + await base.Select_property_on_required_related(queryTrackingBehavior); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c["RequiredRelated"]["String"] FROM root c """); - }); - - public override Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the - // result to be filtered out entirely. - await AssertQuery( - async, - ss => ss.Set().Select(x => x.OptionalRelated!.String), - ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.String), - queryTrackingBehavior: queryTrackingBehavior); + } - AssertSql( - """ + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + { + // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the + // result to be filtered out entirely. + await AssertQuery( + ss => ss.Set().Select(x => x.OptionalRelated!.String), + ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.String), + queryTrackingBehavior: queryTrackingBehavior); + + AssertSql( + """ SELECT VALUE c["OptionalRelated"]["String"] FROM root c """); - }); + } - public override Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the - // result to be filtered out entirely. - await AssertQuery( - async, - ss => ss.Set().Select(x => x.OptionalRelated!.Int), - ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.Int), - queryTrackingBehavior: queryTrackingBehavior); - - AssertSql( - """ + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) + { + // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the + // result to be filtered out entirely. + await AssertQuery( + ss => ss.Set().Select(x => x.OptionalRelated!.Int), + ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.Int), + queryTrackingBehavior: queryTrackingBehavior); + + AssertSql( + """ SELECT VALUE c["OptionalRelated"]["Int"] FROM root c """); - }); - - public override Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the - // result to be filtered out entirely. - await AssertQuery( - async, - ss => ss.Set().Select(x => (int?)x.OptionalRelated!.Int), - ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => (int?)x.OptionalRelated!.Int), - queryTrackingBehavior: queryTrackingBehavior); + } - AssertSql( - """ + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) + { + // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the + // result to be filtered out entirely. + await AssertQuery( + ss => ss.Set().Select(x => (int?)x.OptionalRelated!.Int), + ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => (int?)x.OptionalRelated!.Int), + queryTrackingBehavior: queryTrackingBehavior); + + AssertSql( + """ SELECT VALUE c["OptionalRelated"]["Int"] FROM root c """); - }); + } #endregion Simple properties #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async) - { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); - if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) - { - AssertSql( - """ + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + { + AssertSql( + """ SELECT VALUE c FROM root c """); - } } } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async) - { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); - if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) - { - AssertSql( - """ + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + { + AssertSql( + """ SELECT VALUE c FROM root c """); - } } } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async) - { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); - if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) - { - AssertSql( - """ + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + { + AssertSql( + """ SELECT VALUE c FROM root c """); - } } } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async) - { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); - if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) - { - AssertSql( - """ + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + { + AssertSql( + """ SELECT VALUE c FROM root c """); - } } } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the // result to be filtered out entirely. await Assert.ThrowsAsync(() => // #36403 AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.OptionalNested), ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.OptionalNested), queryTrackingBehavior: queryTrackingBehavior)); @@ -195,15 +169,14 @@ FROM root c } } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { // When OptionalRelated is null, the property access on it evaluates to undefined in Cosmos, causing the // result to be filtered out entirely. await Assert.ThrowsAsync(() => // #36403 AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.RequiredNested), ss => ss.Set().Where(x => x.OptionalRelated != null).Select(x => x.OptionalRelated!.RequiredNested), queryTrackingBehavior: queryTrackingBehavior)); @@ -223,29 +196,26 @@ FROM root c #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - if (async) - { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); - if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) - { - AssertSql( - """ + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + { + AssertSql( + """ SELECT VALUE c FROM root c ORDER BY c["Id"] """); - } } } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { - await Assert.ThrowsAsync(() => base.Select_nested_collection_on_required_related(async, queryTrackingBehavior)); + await Assert.ThrowsAsync(() => base.Select_nested_collection_on_required_related(queryTrackingBehavior)); AssertSql( """ @@ -256,11 +226,11 @@ ORDER BY c["Id"] } } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { - await Assert.ThrowsAsync(() => base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior)); + await Assert.ThrowsAsync(() => base.Select_nested_collection_on_optional_related(queryTrackingBehavior)); AssertSql( """ @@ -271,34 +241,34 @@ ORDER BY c["Id"] } } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { // The given key 'n' was not present in the dictionary - await Assert.ThrowsAsync(() => base.SelectMany_related_collection(async, queryTrackingBehavior)); + await Assert.ThrowsAsync(() => base.SelectMany_related_collection(queryTrackingBehavior)); AssertSql(); } } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { // The given key 'n' was not present in the dictionary - await Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior)); + await Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior)); AssertSql(); } } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - if (async && queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) + if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { // The given key 'n' was not present in the dictionary - await Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior)); + await Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior)); AssertSql(); } @@ -308,36 +278,34 @@ public override async Task SelectMany_nested_collection_on_optional_related(bool #region Multiple - public override Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Fixture.NoSyncTest( - async, async a => - { - await base.Select_root_duplicated(a, queryTrackingBehavior); + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) + { + await base.Select_root_duplicated(queryTrackingBehavior); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c """); - }); + } #endregion Multiple #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { - await AssertTranslationFailed(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + await AssertTranslationFailed(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); } } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { - await AssertTranslationFailed(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + await AssertTranslationFailed(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); } } diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs index f9be7edda2d..489dd8381fd 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs @@ -12,109 +12,89 @@ public OwnedNavigationsStructuralEqualityCosmosTest(OwnedNavigationsCosmosFixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Two_related(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Two_related(a); - - AssertSql( - """ + public override async Task Two_related() + { + await base.Two_related(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE false """); - }); + } - public override Task Two_nested(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Two_nested(a); + public override async Task Two_nested() + { + await base.Two_nested(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE false """); - }); + } - public override Task Not_equals(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Not_equals(a); + public override async Task Not_equals() + { + await base.Not_equals(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE false """); - }); + } - public override Task Related_with_inline_null(bool async) - => Assert.ThrowsAsync(() => base.Related_with_inline_null(async)); + public override Task Related_with_inline_null() + => Assert.ThrowsAsync(() => base.Related_with_inline_null()); - public override Task Related_with_parameter_null(bool async) - => Assert.ThrowsAsync(() => base.Related_with_parameter_null(async)); + public override Task Related_with_parameter_null() + => Assert.ThrowsAsync(() => base.Related_with_parameter_null()); - public override Task Nested_with_inline_null(bool async) - => Assert.ThrowsAsync(() => base.Nested_with_inline_null(async)); + public override Task Nested_with_inline_null() + => Assert.ThrowsAsync(() => base.Nested_with_inline_null()); - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - if (async) - { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); - AssertSql(); - } + AssertSql(); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - if (async) - { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); - AssertSql(); - } + AssertSql(); } - public override Task Two_nested_collections(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Two_nested_collections(a); + public override async Task Two_nested_collections() + { + await base.Two_nested_collections(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE false """); - }); + } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - if (async) - { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); - AssertSql(); - } + AssertSql(); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - if (async) - { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); - AssertSql(); - } + AssertSql(); } [ConditionalFact] diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/ByteArrayTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/ByteArrayTranslationsCosmosTest.cs index d29f7e061d4..165a117122a 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/ByteArrayTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/ByteArrayTranslationsCosmosTest.cs @@ -11,26 +11,26 @@ public ByteArrayTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITe Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Length(bool async) - => AssertTranslationFailed(() => base.Length(async)); + public override Task Length() + => AssertTranslationFailed(() => base.Length()); - public override Task Index(bool async) - => AssertTranslationFailed(() => base.Index(async)); + public override Task Index() + => AssertTranslationFailed(() => base.Index()); - public override Task First(bool async) - => AssertTranslationFailed(() => base.First(async)); + public override Task First() + => AssertTranslationFailed(() => base.First()); - public override Task Contains_with_constant(bool async) - => AssertTranslationFailed(() => base.Contains_with_constant(async)); + public override Task Contains_with_constant() + => AssertTranslationFailed(() => base.Contains_with_constant()); - public override Task Contains_with_parameter(bool async) - => AssertTranslationFailed(() => base.Contains_with_parameter(async)); + public override Task Contains_with_parameter() + => AssertTranslationFailed(() => base.Contains_with_parameter()); - public override Task Contains_with_column(bool async) - => AssertTranslationFailed(() => base.Contains_with_column(async)); + public override Task Contains_with_column() + => AssertTranslationFailed(() => base.Contains_with_column()); - public override Task SequenceEqual(bool async) - => AssertTranslationFailed(() => base.SequenceEqual(async)); + public override Task SequenceEqual() + => AssertTranslationFailed(() => base.SequenceEqual()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/EnumTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/EnumTranslationsCosmosTest.cs index efa1de7e95f..02c3ff991a8 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/EnumTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/EnumTranslationsCosmosTest.cs @@ -13,241 +13,209 @@ public EnumTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITestOut #region Equality - public override Task Equality_to_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_to_constant(a); - - AssertSql( - """ + public override async Task Equality_to_constant() + { + await base.Equality_to_constant(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Enum"] = 0) """); - }); + } - public override Task Equality_to_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_to_parameter(a); + public override async Task Equality_to_parameter() + { + await base.Equality_to_parameter(); - AssertSql( - """ + AssertSql( + """ @basicEnum=? SELECT VALUE c FROM root c WHERE (c["Enum"] = @basicEnum) """); - }); + } - public override Task Equality_nullable_enum_to_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_nullable_enum_to_constant(a); + public override async Task Equality_nullable_enum_to_constant() + { + await base.Equality_nullable_enum_to_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Enum"] = 0) """); - }); + } - public override Task Equality_nullable_enum_to_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_nullable_enum_to_parameter(a); + public override async Task Equality_nullable_enum_to_parameter() + { + await base.Equality_nullable_enum_to_parameter(); - AssertSql( - """ + AssertSql( + """ @basicEnum=? SELECT VALUE c FROM root c WHERE (c["Enum"] = @basicEnum) """); - }); + } - public override Task Equality_nullable_enum_to_null_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_nullable_enum_to_null_constant(a); + public override async Task Equality_nullable_enum_to_null_constant() + { + await base.Equality_nullable_enum_to_null_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Enum"] = null) """); - }); + } - public override Task Equality_nullable_enum_to_null_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_nullable_enum_to_null_parameter(a); + public override async Task Equality_nullable_enum_to_null_parameter() + { + await base.Equality_nullable_enum_to_null_parameter(); - AssertSql( - """ + AssertSql( + """ @basicEnum=? SELECT VALUE c FROM root c WHERE (c["Enum"] = @basicEnum) """); - }); + } - public override Task Equality_nullable_enum_to_nullable_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equality_nullable_enum_to_nullable_parameter(a); + public override async Task Equality_nullable_enum_to_nullable_parameter() + { + await base.Equality_nullable_enum_to_nullable_parameter(); - AssertSql( - """ + AssertSql( + """ @basicEnum=? SELECT VALUE c FROM root c WHERE (c["Enum"] = @basicEnum) """); - }); + } #endregion Equality - public override Task Bitwise_and_enum_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Bitwise_and_enum_constant(a); + public override async Task Bitwise_and_enum_constant() + { + await base.Bitwise_and_enum_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & 1) > 0) """, - // - """ + // + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & 1) = 1) """); - }); + } - public override async Task Bitwise_and_integral_constant(bool async) + public override async Task Bitwise_and_integral_constant() { - // Always throws for sync. - if (async) - { - // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Bitwise_and_integral_constant(async)); - - AssertSql( - """ + // Cosmos client evaluation. Issue #17246. + await AssertTranslationFailed(() => base.Bitwise_and_integral_constant()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & 8) = 8) """); - } } - public override Task Bitwise_and_nullable_enum_with_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Bitwise_and_nullable_enum_with_constant(a); + public override async Task Bitwise_and_nullable_enum_with_constant() + { + await base.Bitwise_and_nullable_enum_with_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & 8) > 0) """); - }); + } - public override Task Where_bitwise_and_nullable_enum_with_null_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_bitwise_and_nullable_enum_with_null_constant(a); + public override async Task Where_bitwise_and_nullable_enum_with_null_constant() + { + await base.Where_bitwise_and_nullable_enum_with_null_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & null) > 0) """); - }); + } - public override Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(a); + public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter() + { + await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(); - AssertSql( - """ + AssertSql( + """ @flagsEnum=? SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & @flagsEnum) > 0) """); - }); + } - public override Task Where_bitwise_and_nullable_enum_with_nullable_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(a); + public override async Task Where_bitwise_and_nullable_enum_with_nullable_parameter() + { + await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(); - AssertSql( - """ + AssertSql( + """ @flagsEnum=? SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & @flagsEnum) > 0) """, - // - """ + // + """ @flagsEnum=? SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] & @flagsEnum) > 0) """); - }); + } - public override Task Bitwise_or(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Bitwise_or(a); + public override async Task Bitwise_or() + { + await base.Bitwise_or(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["FlagsEnum"] | 8) > 0) """); - }); + } - public override Task Bitwise_projects_values_in_select(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Bitwise_projects_values_in_select(a); + public override async Task Bitwise_projects_values_in_select() + { + await base.Bitwise_projects_values_in_select(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE { "BitwiseTrue" : ((c["FlagsEnum"] & 8) = 8), @@ -258,19 +226,19 @@ FROM root c WHERE ((c["FlagsEnum"] & 8) = 8) OFFSET 0 LIMIT 1 """); - }); + } // #35317 - public override Task HasFlag(bool async) - => AssertTranslationFailed(() => base.HasFlag(async)); + public override Task HasFlag() + => AssertTranslationFailed(() => base.HasFlag()); // #35317 - public override Task HasFlag_with_non_nullable_parameter(bool async) - => AssertTranslationFailed(() => base.HasFlag(async)); + public override Task HasFlag_with_non_nullable_parameter() + => AssertTranslationFailed(() => base.HasFlag()); // #35317 - public override Task HasFlag_with_nullable_parameter(bool async) - => AssertTranslationFailed(() => base.HasFlag(async)); + public override Task HasFlag_with_nullable_parameter() + => AssertTranslationFailed(() => base.HasFlag()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/GuidTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/GuidTranslationsCosmosTest.cs index 0a637af0e81..2f01e892896 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/GuidTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/GuidTranslationsCosmosTest.cs @@ -11,53 +11,47 @@ public GuidTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITestOut Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task New_with_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.New_with_constant(a); + public override async Task New_with_constant() + { + await base.New_with_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Guid"] = "df36f493-463f-4123-83f9-6b135deeb7ba") """); - }); + } - public override Task New_with_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.New_with_parameter(a); + public override async Task New_with_parameter() + { + await base.New_with_parameter(); - AssertSql( - """ + AssertSql( + """ @p=? SELECT VALUE c FROM root c WHERE (c["Guid"] = @p) """); - }); + } - public override Task ToString_projection(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.ToString_projection(a); + public override async Task ToString_projection() + { + await base.ToString_projection(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c["Guid"] FROM root c """); - }); + } - public override async Task NewGuid(bool async) + public override async Task NewGuid() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.NewGuid(async)); + await AssertTranslationFailed(() => base.NewGuid()); AssertSql(); } diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MathTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MathTranslationsCosmosTest.cs index eed4814b0ad..7ca2373acc3 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MathTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MathTranslationsCosmosTest.cs @@ -14,881 +14,765 @@ public MathTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITestOut Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Abs_decimal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Abs_decimal(a); + public override async Task Abs_decimal() + { + await base.Abs_decimal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ABS(c["Decimal"]) = 9.5) """); - }); + } - public override Task Abs_int(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Abs_int(a); + public override async Task Abs_int() + { + await base.Abs_int(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ABS(c["Int"]) = 9) """); - }); + } - public override Task Abs_double(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Abs_double(a); + public override async Task Abs_double() + { + await base.Abs_double(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ABS(c["Double"]) = 9.5) """); - }); + } - public override Task Abs_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Abs_float(a); + public override async Task Abs_float() + { + await base.Abs_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ABS(c["Float"]) = 9.5) """); - }); + } - public override Task Ceiling(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Ceiling_float(a); + public override async Task Ceiling() + { + await base.Ceiling_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (CEILING(c["Float"]) = 9.0) """); - }); + } - public override Task Ceiling_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Ceiling_float(a); + public override async Task Ceiling_float() + { + await base.Ceiling_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (CEILING(c["Float"]) = 9.0) """); - }); + } - public override Task Floor_decimal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Floor_decimal(a); + public override async Task Floor_decimal() + { + await base.Floor_decimal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (FLOOR(c["Decimal"]) = 8.0) """); - }); + } - public override Task Floor_double(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Floor_double(a); + public override async Task Floor_double() + { + await base.Floor_double(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (FLOOR(c["Double"]) = 8.0) """); - }); + } - public override Task Floor_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Floor_float(a); + public override async Task Floor_float() + { + await base.Floor_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (FLOOR(c["Float"]) = 8.0) """); - }); + } - public override Task Exp(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Exp(a); + public override async Task Exp() + { + await base.Exp(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (EXP(c["Double"]) > 1.0) """); - }); + } - public override Task Exp_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Exp_float(a); + public override async Task Exp_float() + { + await base.Exp_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (EXP(c["Float"]) > 1.0) """); - }); + } - public override async Task Power(bool async) + public override async Task Power() { // Convert node. Issue #25120. - await AssertTranslationFailed(() => base.Power(async)); + await AssertTranslationFailed(() => base.Power()); AssertSql(); } - public override Task Power_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Power_float(a); + public override async Task Power_float() + { + await base.Power_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((POWER(c["Float"], 2.0) > 73.0) AND (POWER(c["Float"], 2.0) < 74.0)) """); - }); + } - public override Task Round_decimal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Round_decimal(a); + public override async Task Round_decimal() + { + await base.Round_decimal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ROUND(c["Decimal"]) = 9.0) """, - // - """ + // + """ SELECT VALUE ROUND(c["Decimal"]) FROM root c """); - }); + } - public override Task Round_double(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Round_double(a); + public override async Task Round_double() + { + await base.Round_double(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ROUND(c["Double"]) = 9.0) """, - // - """ + // + """ SELECT VALUE ROUND(c["Double"]) FROM root c """); - }); + } - public override Task Round_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Round_float(a); + public override async Task Round_float() + { + await base.Round_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ROUND(c["Float"]) = 9.0) """, - // - """ + // + """ SELECT VALUE ROUND(c["Float"]) FROM root c """); - }); + } - public override async Task Round_with_digits_decimal(bool async) + public override async Task Round_with_digits_decimal() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Round_with_digits_decimal(async)); + await AssertTranslationFailed(() => base.Round_with_digits_decimal()); AssertSql(); } - public override async Task Round_with_digits_double(bool async) + public override async Task Round_with_digits_double() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Round_with_digits_decimal(async)); + await AssertTranslationFailed(() => base.Round_with_digits_decimal()); AssertSql(); } - public override async Task Round_with_digits_float(bool async) + public override async Task Round_with_digits_float() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Round_with_digits_decimal(async)); + await AssertTranslationFailed(() => base.Round_with_digits_decimal()); AssertSql(); } - public override Task Truncate_decimal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Truncate_decimal(a); + public override async Task Truncate_decimal() + { + await base.Truncate_decimal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TRUNC(c["Decimal"]) = 8.0) """, - // - """ + // + """ SELECT VALUE TRUNC(c["Decimal"]) FROM root c """); - }); + } - public override Task Truncate_double(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Truncate_double(a); + public override async Task Truncate_double() + { + await base.Truncate_double(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TRUNC(c["Double"]) = 8.0) """, - // - """ + // + """ SELECT VALUE TRUNC(c["Double"]) FROM root c """); - }); + } - public override Task Truncate_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Truncate_float(a); + public override async Task Truncate_float() + { + await base.Truncate_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TRUNC(c["Float"]) = 8.0) """, - // - """ + // + """ SELECT VALUE TRUNC(c["Float"]) FROM root c """); - }); + } - public override async Task Truncate_project_and_order_by_it_twice(bool async) + public override async Task Truncate_project_and_order_by_it_twice() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. - await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice(a)); + // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. + await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice()); - AssertSql( - """ + AssertSql( + """ SELECT VALUE TRUNC(c["Double"]) FROM root c ORDER BY TRUNC(c["Double"]) """); - }); - } } - public override async Task Truncate_project_and_order_by_it_twice2(bool async) + public override async Task Truncate_project_and_order_by_it_twice2() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. - await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice2(a)); + // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. + await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice2()); - AssertSql( - """ + AssertSql( + """ SELECT VALUE TRUNC(c["Double"]) FROM root c ORDER BY TRUNC(c["Double"]) DESC """); - }); - } } - public override async Task Truncate_project_and_order_by_it_twice3(bool async) + public override async Task Truncate_project_and_order_by_it_twice3() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. - await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice3(a)); + // Unsupported ORDER BY clause. ORDER BY item expression could not be mapped to a document path. + await Assert.ThrowsAsync(() => base.Truncate_project_and_order_by_it_twice3()); - AssertSql( - """ + AssertSql( + """ SELECT VALUE TRUNC(c["Double"]) FROM root c ORDER BY TRUNC(c["Double"]) DESC """); - }); - } } - public override Task Log(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log(a); + public override async Task Log() + { + await base.Log(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Double"] > 0.0) AND (LOG(c["Double"]) != 0.0)) """); - }); + } - public override Task Log_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log_float(a); + public override async Task Log_float() + { + await base.Log_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Float"] > 0.0) AND (LOG(c["Float"]) != 0.0)) """); - }); + } - public override Task Log_with_newBase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log_with_newBase(a); + public override async Task Log_with_newBase() + { + await base.Log_with_newBase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Double"] > 0.0) AND (LOG(c["Double"], 7.0) != 0.0)) """); - }); + } - public override Task Log_with_newBase_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log_with_newBase_float(a); + public override async Task Log_with_newBase_float() + { + await base.Log_with_newBase_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Float"] > 0.0) AND (LOG(c["Float"], 7.0) != 0.0)) """); - }); + } - public override Task Log10(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log10(a); + public override async Task Log10() + { + await base.Log10(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Double"] > 0.0) AND (LOG10(c["Double"]) != 0.0)) """); - }); + } - public override Task Log10_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Log10_float(a); + public override async Task Log10_float() + { + await base.Log10_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Float"] > 0.0) AND (LOG10(c["Float"]) != 0.0)) """); - }); + } - public override async Task Log2(bool async) + public override async Task Log2() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Log2(async)); + await AssertTranslationFailed(() => base.Log2()); AssertSql(); } - public override Task Sqrt(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sqrt(a); + public override async Task Sqrt() + { + await base.Sqrt(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Double"] > 0.0) AND (SQRT(c["Double"]) > 0.0)) """); - }); + } - public override Task Sqrt_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sqrt_float(a); + public override async Task Sqrt_float() + { + await base.Sqrt_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Float"] > 0.0) AND (SQRT(c["Float"]) > 0.0)) """); - }); + } - public override Task Sign(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sign(a); + public override async Task Sign() + { + await base.Sign(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (SIGN(c["Double"]) > 0) """); - }); + } - public override Task Sign_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sign_float(a); + public override async Task Sign_float() + { + await base.Sign_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (SIGN(c["Float"]) > 0) """); - }); + } - public override async Task Max(bool async) + public override async Task Max() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Max(async)); + await AssertTranslationFailed(() => base.Max()); AssertSql(); } - public override async Task Max_nested(bool async) + public override async Task Max_nested() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Max(async)); + await AssertTranslationFailed(() => base.Max()); AssertSql(); } - public override async Task Max_nested_twice(bool async) + public override async Task Max_nested_twice() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Max(async)); + await AssertTranslationFailed(() => base.Max()); AssertSql(); } - public override async Task Min(bool async) + public override async Task Min() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Min(async)); + await AssertTranslationFailed(() => base.Min()); AssertSql(); } - public override async Task Min_nested(bool async) + public override async Task Min_nested() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Min(async)); + await AssertTranslationFailed(() => base.Min()); AssertSql(); } - public override async Task Min_nested_twice(bool async) + public override async Task Min_nested_twice() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Min(async)); + await AssertTranslationFailed(() => base.Min()); AssertSql(); } - public override Task Degrees(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Degrees(a); + public override async Task Degrees() + { + await base.Degrees(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DEGREES(c["Double"]) > 0.0) """); - }); + } - public override Task Degrees_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Degrees_float(a); + public override async Task Degrees_float() + { + await base.Degrees_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DEGREES(c["Float"]) > 0.0) """); - }); + } - public override Task Radians(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Radians(a); + public override async Task Radians() + { + await base.Radians(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (RADIANS(c["Double"]) > 0.0) """); - }); + } - public override Task Radians_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Radians_float(a); + public override async Task Radians_float() + { + await base.Radians_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (RADIANS(c["Float"]) > 0.0) """); - }); + } #region Trigonometry - public override Task Acos(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Acos(a); + public override async Task Acos() + { + await base.Acos(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Double"] >= -1.0) AND (c["Double"] <= 1.0)) AND (ACOS(c["Double"]) > 1.0)) """); - }); + } - public override Task Acos_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Acos_float(a); + public override async Task Acos_float() + { + await base.Acos_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Float"] >= -1.0) AND (c["Float"] <= 1.0)) AND (ACOS(c["Float"]) > 0.0)) """); - }); + } - public override async Task Acosh(bool async) + public override async Task Acosh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Acosh(async)); + await AssertTranslationFailed(() => base.Acosh()); AssertSql(); } - public override Task Asin(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Asin(a); + public override async Task Asin() + { + await base.Asin(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Double"] >= -1.0) AND (c["Double"] <= 1.0)) AND (ASIN(c["Double"]) > -1.7976931348623157E+308)) """); - }); + } - public override Task Asin_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Asin_float(a); + public override async Task Asin_float() + { + await base.Asin_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Float"] >= -1.0) AND (c["Float"] <= 1.0)) AND (ASIN(c["Float"]) > -1.7976931348623157E+308)) """); - }); + } - public override async Task Asinh(bool async) + public override async Task Asinh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Asinh(async)); + await AssertTranslationFailed(() => base.Asinh()); AssertSql(); } - public override Task Atan(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Atan(a); + public override async Task Atan() + { + await base.Atan(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ATAN(c["Double"]) > 0.0) """); - }); + } - public override Task Atan_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Atan_float(a); + public override async Task Atan_float() + { + await base.Atan_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ATAN(c["Float"]) > 0.0) """); - }); + } - public override async Task Atanh(bool async) + public override async Task Atanh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Atanh(async)); + await AssertTranslationFailed(() => base.Atanh()); AssertSql(); } - public override Task Atan2(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Atan2(a); + public override async Task Atan2() + { + await base.Atan2(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ATN2(c["Double"], 1.0) > 0.0) """); - }); + } - public override Task Cos(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Cos(a); + public override async Task Cos() + { + await base.Cos(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (COS(c["Double"]) > 0.0) """); - }); + } - public override Task Cos_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Cos_float(a); + public override async Task Cos_float() + { + await base.Cos_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (COS(c["Float"]) > 0.0) """); - }); + } - public override async Task Cosh(bool async) + public override async Task Cosh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Cosh(async)); + await AssertTranslationFailed(() => base.Cosh()); AssertSql(); } - public override Task Sin(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sin(a); + public override async Task Sin() + { + await base.Sin(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (SIN(c["Double"]) > 0.0) """); - }); + } - public override Task Sin_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Sin_float(a); + public override async Task Sin_float() + { + await base.Sin_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (SIN(c["Float"]) > 0.0) """); - }); + } - public override async Task Sinh(bool async) + public override async Task Sinh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Sinh(async)); + await AssertTranslationFailed(() => base.Sinh()); AssertSql(); } - public override Task Tan(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Tan(a); + public override async Task Tan() + { + await base.Tan(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TAN(c["Double"]) > 0.0) """); - }); + } - public override Task Tan_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Tan_float(a); + public override async Task Tan_float() + { + await base.Tan_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TAN(c["Float"]) > 0.0) """); - }); + } - public override async Task Tanh(bool async) + public override async Task Tanh() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Tanh(async)); + await AssertTranslationFailed(() => base.Tanh()); AssertSql(); } - public override Task Atan2_float(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Atan2_float(a); + public override async Task Atan2_float() + { + await base.Atan2_float(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (ATN2(c["Float"], 1.0) > 0.0) """); - }); + } #endregion Trigonometry diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MiscellaneousTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MiscellaneousTranslationsCosmosTest.cs index 5f1e535724a..1111e3afffe 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MiscellaneousTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/MiscellaneousTranslationsCosmosTest.cs @@ -13,58 +13,56 @@ public MiscellaneousTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, #region Random - public override Task Random_on_EF_Functions(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Random_on_EF_Functions(a); - - AssertSql( - """ + public override async Task Random_on_EF_Functions() + { + await base.Random_on_EF_Functions(); + + AssertSql( + """ SELECT VALUE COUNT(1) FROM root c WHERE ((RAND() >= 0.0) AND (RAND() < 1.0)) """); - }); + } - public override async Task Random_Shared_Next_with_no_args(bool async) + public override async Task Random_Shared_Next_with_no_args() { - await AssertTranslationFailed(() => base.Random_Shared_Next_with_no_args(async)); + await AssertTranslationFailed(() => base.Random_Shared_Next_with_no_args()); AssertSql(); } - public override async Task Random_Shared_Next_with_one_arg(bool async) + public override async Task Random_Shared_Next_with_one_arg() { - await AssertTranslationFailed(() => base.Random_Shared_Next_with_one_arg(async)); + await AssertTranslationFailed(() => base.Random_Shared_Next_with_one_arg()); AssertSql(); } - public override async Task Random_Shared_Next_with_two_args(bool async) + public override async Task Random_Shared_Next_with_two_args() { - await AssertTranslationFailed(() => base.Random_Shared_Next_with_two_args(async)); + await AssertTranslationFailed(() => base.Random_Shared_Next_with_two_args()); AssertSql(); } - public override async Task Random_new_Next_with_no_args(bool async) + public override async Task Random_new_Next_with_no_args() { - await AssertTranslationFailed(() => base.Random_new_Next_with_no_args(async)); + await AssertTranslationFailed(() => base.Random_new_Next_with_no_args()); AssertSql(); } - public override async Task Random_new_Next_with_one_arg(bool async) + public override async Task Random_new_Next_with_one_arg() { - await AssertTranslationFailed(() => base.Random_new_Next_with_one_arg(async)); + await AssertTranslationFailed(() => base.Random_new_Next_with_one_arg()); AssertSql(); } - public override async Task Random_new_Next_with_two_args(bool async) + public override async Task Random_new_Next_with_two_args() { - await AssertTranslationFailed(() => base.Random_new_Next_with_two_args(async)); + await AssertTranslationFailed(() => base.Random_new_Next_with_two_args()); AssertSql(); } @@ -73,66 +71,66 @@ public override async Task Random_new_Next_with_two_args(bool async) #region Convert - public override async Task Convert_ToBoolean(bool async) + public override async Task Convert_ToBoolean() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToBoolean(async)); + await AssertTranslationFailed(() => base.Convert_ToBoolean()); AssertSql(); } - public override async Task Convert_ToByte(bool async) + public override async Task Convert_ToByte() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToByte(async)); + await AssertTranslationFailed(() => base.Convert_ToByte()); AssertSql(); } - public override async Task Convert_ToDecimal(bool async) + public override async Task Convert_ToDecimal() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToDecimal(async)); + await AssertTranslationFailed(() => base.Convert_ToDecimal()); AssertSql(); } - public override async Task Convert_ToDouble(bool async) + public override async Task Convert_ToDouble() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToDouble(async)); + await AssertTranslationFailed(() => base.Convert_ToDouble()); AssertSql(); } - public override async Task Convert_ToInt16(bool async) + public override async Task Convert_ToInt16() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToInt16(async)); + await AssertTranslationFailed(() => base.Convert_ToInt16()); AssertSql(); } - public override async Task Convert_ToInt32(bool async) + public override async Task Convert_ToInt32() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToInt32(async)); + await AssertTranslationFailed(() => base.Convert_ToInt32()); AssertSql(); } - public override async Task Convert_ToInt64(bool async) + public override async Task Convert_ToInt64() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToInt64(async)); + await AssertTranslationFailed(() => base.Convert_ToInt64()); AssertSql(); } - public override async Task Convert_ToString(bool async) + public override async Task Convert_ToString() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Convert_ToString(async)); + await AssertTranslationFailed(() => base.Convert_ToString()); AssertSql(); } @@ -141,26 +139,26 @@ public override async Task Convert_ToString(bool async) #region Compare - public override async Task Int_Compare_to_simple_zero(bool async) + public override async Task Int_Compare_to_simple_zero() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Int_Compare_to_simple_zero(async)); + await AssertTranslationFailed(() => base.Int_Compare_to_simple_zero()); AssertSql(); } - public override async Task DateTime_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task DateTime_Compare_to_simple_zero(bool compareTo) { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.DateTime_Compare_to_simple_zero(async, compareTo)); + await AssertTranslationFailed(() => base.DateTime_Compare_to_simple_zero(compareTo)); AssertSql(); } - public override async Task TimeSpan_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task TimeSpan_Compare_to_simple_zero(bool compareTo) { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TimeSpan_Compare_to_simple_zero(async, compareTo)); + await AssertTranslationFailed(() => base.TimeSpan_Compare_to_simple_zero(compareTo)); AssertSql(); } diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsCosmosTest.cs index 9ac1dc57a13..a53334d97e3 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsCosmosTest.cs @@ -12,75 +12,65 @@ public ArithmeticOperatorTranslationsCosmosTest(BasicTypesQueryCosmosFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Add(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Add(a); + public override async Task Add() + { + await base.Add(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] + 2) = 10) """); - }); + } - public override Task Subtract(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Subtract(a); + public override async Task Subtract() + { + await base.Subtract(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] - 3) = 5) """); - }); + } - public override Task Multiply(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Multiply(a); + public override async Task Multiply() + { + await base.Multiply(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] * 2) = 16) """); - }); + } - public override Task Modulo(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Modulo(a); + public override async Task Modulo() + { + await base.Modulo(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] % 3) = 2) """); - }); + } - public override Task Minus(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Minus(a); + public override async Task Minus() + { + await base.Minus(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (-(c["Int"]) = -8) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsCosmosTest.cs index f3758d07810..b6e4304d4d6 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsCosmosTest.cs @@ -14,43 +14,33 @@ public BitwiseOperatorTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Or(bool async) - => AssertTranslationFailed(() => base.Or(async)); + public override Task Or() + => AssertTranslationFailed(() => base.Or()); - public override async Task Or_over_boolean(bool async) + public override async Task Or_over_boolean() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.Or_over_boolean(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.Or_over_boolean()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] = 12) | (c["String"] = "Seattle")) """); - } } - public override async Task Or_multiple(bool async) + public override async Task Or_multiple() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.Or_multiple(async)); - - AssertSql(); - } + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.Or_multiple()); + + AssertSql(); } - public override Task And(bool async) - => Fixture.NoSyncTest( - async, async a => + public override async Task And() { - await base.And(a); + await base.And(); AssertSql( """ @@ -63,184 +53,150 @@ FROM root c SELECT VALUE (c["Int"] & c["Short"]) FROM root c """); - }); + } - public override async Task And_over_boolean(bool async) + public override async Task And_over_boolean() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.And_over_boolean(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.And_over_boolean()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] = 8) & (c["String"] = "Seattle")) """); - } } - public override Task Xor(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Xor(a); + public override async Task Xor() + { + await base.Xor(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] ^ c["Short"]) = 1) """, - // - """ + // + """ SELECT VALUE (c["Int"] ^ c["Short"]) FROM root c """); - }); + } - public override Task Xor_over_boolean(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Xor_over_boolean(a); + public override async Task Xor_over_boolean() + { + await base.Xor_over_boolean(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] = c["Short"]) != (c["String"] = "Seattle")) """); - }); + } - public override Task Complement(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Complement(a); + public override async Task Complement() + { + await base.Complement(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (~(c["Int"]) = -9) """); - }); + } - public override async Task And_or_over_boolean(bool async) + public override async Task And_or_over_boolean() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.And_or_over_boolean(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.And_or_over_boolean()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 12) & (c["Short"] = 12)) | (c["String"] = "Seattle")) """); - } } - public override async Task Or_with_logical_or(bool async) + public override async Task Or_with_logical_or() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.Or_with_logical_or(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.Or_with_logical_or()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 12) | (c["Short"] = 12)) OR (c["String"] = "Seattle")) """); - } } - public override async Task And_with_logical_and(bool async) + public override async Task And_with_logical_and() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.And_with_logical_and(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.And_with_logical_and()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 8) & (c["Short"] = 8)) AND (c["String"] = "Seattle")) """); - } } - public override async Task Or_with_logical_and(bool async) + public override async Task Or_with_logical_and() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.Or_with_logical_and(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.Or_with_logical_and()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 8) | (c["Short"] = 9)) AND (c["String"] = "Seattle")) """); - } } - public override async Task And_with_logical_or(bool async) + public override async Task And_with_logical_or() { - // Always throws for sync. - if (async) - { - // Bitwise operators on booleans. Issue #13168. - await Assert.ThrowsAsync(() => base.And_with_logical_or(async)); - - AssertSql( - """ + // Bitwise operators on booleans. Issue #13168. + await Assert.ThrowsAsync(() => base.And_with_logical_or()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 12) & (c["Short"] = 12)) OR (c["String"] = "Seattle")) """); - } } - public override Task Left_shift(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Left_shift(a); + public override async Task Left_shift() + { + await base.Left_shift(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] << 1) = 16) """); - }); + } - public override Task Right_shift(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Right_shift(a); + public override async Task Right_shift() + { + await base.Right_shift(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] >> 1) = 4) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsTest.cs index c9cfb598a1b..304b2c867f8 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsTest.cs @@ -12,89 +12,77 @@ public ComparisonOperatorTranslationsCosmosTest(BasicTypesQueryCosmosFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Equal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equal(a); - - AssertSql( - """ + public override async Task Equal() + { + await base.Equal(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] = 8) """); - }); + } - public override Task NotEqual(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.NotEqual(a); + public override async Task NotEqual() + { + await base.NotEqual(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] != 8) """); - }); + } - public override Task GreaterThan(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.GreaterThan(a); + public override async Task GreaterThan() + { + await base.GreaterThan(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] > 8) """); - }); + } - public override Task GreaterThanOrEqual(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.GreaterThanOrEqual(a); + public override async Task GreaterThanOrEqual() + { + await base.GreaterThanOrEqual(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] >= 8) """); - }); + } - public override Task LessThan(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.LessThan(a); + public override async Task LessThan() + { + await base.LessThan(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] < 8) """); - }); + } - public override Task LessThanOrEqual(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.LessThanOrEqual(a); + public override async Task LessThanOrEqual() + { + await base.LessThanOrEqual(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Int"] <= 8) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsCosmosTest.cs index e41894c7e1a..b0658d98a5e 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsCosmosTest.cs @@ -12,89 +12,77 @@ public LogicalOperatorTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task And(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.And(a); - - AssertSql( - """ + public override async Task And() + { + await base.And(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] = 8) AND (c["String"] = "Seattle")) """); - }); + } - public override Task And_with_bool_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.And_with_bool_property(a); + public override async Task And_with_bool_property() + { + await base.And_with_bool_property(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Bool"] AND (c["String"] = "Seattle")) """); - }); + } - public override Task Or(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Or(a); + public override async Task Or() + { + await base.Or(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["Int"] = 999) OR (c["String"] = "Seattle")) """); - }); + } - public override Task Or_with_bool_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Or_with_bool_property(a); + public override async Task Or_with_bool_property() + { + await base.Or_with_bool_property(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["Bool"] OR (c["String"] = "Seattle")) """); - }); + } - public override Task Not(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Not(a); + public override async Task Not() + { + await base.Not(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE NOT((c["Int"] = 999)) """); - }); + } - public override Task Not_with_bool_property(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Not_with_bool_property(a); + public override async Task Not_with_bool_property() + { + await base.Not_with_bool_property(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE NOT(c["Bool"]) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsCosmosTest.cs index d5956681596..55d81882f15 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsCosmosTest.cs @@ -12,33 +12,29 @@ public MiscellaneousOperatorTranslationsSqlServerTest(BasicTypesQueryCosmosFixtu Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Conditional(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Conditional(a); - - AssertSql( - """ + public override async Task Conditional() + { + await base.Conditional(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["Int"] = 8) ? c["String"] : "Foo") = "Seattle") """); - }); + } - public override Task Coalesce(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Coalesce(a); + public override async Task Coalesce() + { + await base.Coalesce(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (((c["String"] != null) ? c["String"] : "Unknown") = "Seattle") """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs index 195b9e16703..0d0a32be8a6 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs @@ -13,340 +13,298 @@ public StringTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITestO #region Equals - public override Task Equals(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equals(a); - - AssertSql( - """ + public override async Task Equals() + { + await base.Equals(); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["String"] = "Seattle") """); - }); + } - public override Task Equals_with_OrdinalIgnoreCase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equals_with_OrdinalIgnoreCase(a); + public override async Task Equals_with_OrdinalIgnoreCase() + { + await base.Equals_with_OrdinalIgnoreCase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STRINGEQUALS(c["String"], "seattle", true) """); - }); + } - public override Task Equals_with_Ordinal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Equals_with_Ordinal(a); + public override async Task Equals_with_Ordinal() + { + await base.Equals_with_Ordinal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STRINGEQUALS(c["String"], "Seattle") """); - }); + } - public override Task Static_Equals(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Static_Equals(a); + public override async Task Static_Equals() + { + await base.Static_Equals(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["String"] = "Seattle") """); - }); + } - public override Task Static_Equals_with_OrdinalIgnoreCase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Static_Equals_with_OrdinalIgnoreCase(a); + public override async Task Static_Equals_with_OrdinalIgnoreCase() + { + await base.Static_Equals_with_OrdinalIgnoreCase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STRINGEQUALS(c["String"], "seattle", true) """); - }); + } - public override Task Static_Equals_with_Ordinal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Static_Equals_with_Ordinal(a); + public override async Task Static_Equals_with_Ordinal() + { + await base.Static_Equals_with_Ordinal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STRINGEQUALS(c["String"], "Seattle") """); - }); + } #endregion Equals #region Miscellaneous - public override Task Length(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Length(a); + public override async Task Length() + { + await base.Length(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (LENGTH(c["String"]) = 7) """); - }); + } - public override Task ToUpper(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.ToUpper(a); + public override async Task ToUpper() + { + await base.ToUpper(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (UPPER(c["String"]) = "SEATTLE") """, - // - """ + // + """ SELECT VALUE UPPER(c["String"]) FROM root c """); - }); + } - public override Task ToLower(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.ToLower(a); + public override async Task ToLower() + { + await base.ToLower(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (LOWER(c["String"]) = "seattle") """, - // - """ + // + """ SELECT VALUE LOWER(c["String"]) FROM root c """); - }); + } #endregion Miscellaneous #region IndexOf - public override Task IndexOf(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf(a); + public override async Task IndexOf() + { + await base.IndexOf(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (INDEX_OF(c["String"], "eattl") != -1) """); - }); + } - public override Task IndexOf_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_Char(a); + public override async Task IndexOf_Char() + { + await base.IndexOf_Char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (INDEX_OF(c["String"], "e") != -1) """); - }); + } - public override Task IndexOf_with_empty_string(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_empty_string(a); + public override async Task IndexOf_with_empty_string() + { + await base.IndexOf_with_empty_string(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (INDEX_OF(c["String"], "") = 0) """); - }); + } - public override Task IndexOf_with_one_parameter_arg(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_one_parameter_arg(a); + public override async Task IndexOf_with_one_parameter_arg() + { + await base.IndexOf_with_one_parameter_arg(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE (INDEX_OF(c["String"], @pattern) = 1) """); - }); + } - public override Task IndexOf_with_one_parameter_arg_char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_one_parameter_arg_char(a); + public override async Task IndexOf_with_one_parameter_arg_char() + { + await base.IndexOf_with_one_parameter_arg_char(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE (INDEX_OF(c["String"], @pattern) = 1) """); - }); + } - public override Task IndexOf_with_constant_starting_position(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_constant_starting_position(a); + public override async Task IndexOf_with_constant_starting_position() + { + await base.IndexOf_with_constant_starting_position(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) > 2) AND (INDEX_OF(c["String"], "e", 2) = 6)) """); - }); + } - public override Task IndexOf_with_constant_starting_position_char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_constant_starting_position_char(a); + public override async Task IndexOf_with_constant_starting_position_char() + { + await base.IndexOf_with_constant_starting_position_char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) > 2) AND (INDEX_OF(c["String"], "e", 2) = 6)) """); - }); + } - public override Task IndexOf_with_parameter_starting_position(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_parameter_starting_position(a); + public override async Task IndexOf_with_parameter_starting_position() + { + await base.IndexOf_with_parameter_starting_position(); - AssertSql( - """ + AssertSql( + """ @start=? SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) > 2) AND (INDEX_OF(c["String"], "e", @start) = 6)) """); - }); + } - public override Task IndexOf_with_parameter_starting_position_char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.IndexOf_with_parameter_starting_position_char(a); + public override async Task IndexOf_with_parameter_starting_position_char() + { + await base.IndexOf_with_parameter_starting_position_char(); - AssertSql( - """ + AssertSql( + """ @start=? SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) > 2) AND (INDEX_OF(c["String"], "e", @start) = 6)) """); - }); + } - public override Task IndexOf_after_ToString(bool async) - => AssertTranslationFailed(() => base.IndexOf_after_ToString(async)); + public override Task IndexOf_after_ToString() + => AssertTranslationFailed(() => base.IndexOf_after_ToString()); - public override Task IndexOf_over_ToString(bool async) - => AssertTranslationFailed(() => base.IndexOf_over_ToString(async)); + public override Task IndexOf_over_ToString() + => AssertTranslationFailed(() => base.IndexOf_over_ToString()); #endregion IndexOf #region Replace - public override Task Replace(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Replace(a); + public override async Task Replace() + { + await base.Replace(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (REPLACE(c["String"], "Sea", "Rea") = "Reattle") """); - }); + } - public override Task Replace_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Replace_Char(a); + public override async Task Replace_Char() + { + await base.Replace_Char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (REPLACE(c["String"], "S", "R") = "Reattle") """); - }); + } - public override Task Replace_with_empty_string(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Replace_with_empty_string(a); + public override async Task Replace_with_empty_string() + { + await base.Replace_with_empty_string(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["String"] != "") AND (REPLACE(c["String"], c["String"], "") = "")) """); - }); + } - public override async Task Replace_using_property_arguments(bool async) + public override async Task Replace_using_property_arguments() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Replace_using_property_arguments(async)); + await AssertTranslationFailed(() => base.Replace_using_property_arguments()); AssertSql(); } @@ -355,146 +313,130 @@ public override async Task Replace_using_property_arguments(bool async) #region Substring - public override Task Substring(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring(a); + public override async Task Substring() + { + await base.Substring(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 3) AND (SUBSTRING(c["String"], 1, 2) = "ea")) """); - }); + } - public override Task Substring_with_one_arg_with_zero_startIndex(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_one_arg_with_zero_startIndex(a); + public override async Task Substring_with_one_arg_with_zero_startIndex() + { + await base.Substring_with_one_arg_with_zero_startIndex(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (SUBSTRING(c["String"], 0, LENGTH(c["String"])) = "Seattle") """); - }); + } - public override Task Substring_with_one_arg_with_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_one_arg_with_constant(a); + public override async Task Substring_with_one_arg_with_constant() + { + await base.Substring_with_one_arg_with_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 1) AND (SUBSTRING(c["String"], 1, LENGTH(c["String"])) = "eattle")) """); - }); + } - public override Task Substring_with_one_arg_with_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_one_arg_with_parameter(a); + public override async Task Substring_with_one_arg_with_parameter() + { + await base.Substring_with_one_arg_with_parameter(); - AssertSql( - """ + AssertSql( + """ @start=? SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 2) AND (SUBSTRING(c["String"], @start, LENGTH(c["String"])) = "attle")) """); - }); + } - public override Task Substring_with_two_args_with_zero_startIndex(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_two_args_with_zero_startIndex(a); + public override async Task Substring_with_two_args_with_zero_startIndex() + { + await base.Substring_with_two_args_with_zero_startIndex(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 3) AND (LEFT(c["String"], 3) = "Sea")) """); - }); + } - public override Task Substring_with_two_args_with_zero_length(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_two_args_with_zero_length(a); + public override async Task Substring_with_two_args_with_zero_length() + { + await base.Substring_with_two_args_with_zero_length(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 2) AND (SUBSTRING(c["String"], 2, 0) = "")) """); - }); + } - public override Task Substring_with_two_args_with_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_two_args_with_parameter(a); + public override async Task Substring_with_two_args_with_parameter() + { + await base.Substring_with_two_args_with_parameter(); - AssertSql( - """ + AssertSql( + """ @start=? SELECT VALUE c FROM root c WHERE ((LENGTH(c["String"]) >= 5) AND (SUBSTRING(c["String"], @start, 3) = "att")) """); - }); + } - public override Task Substring_with_two_args_with_IndexOf(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Substring_with_two_args_with_IndexOf(a); + public override async Task Substring_with_two_args_with_IndexOf() + { + await base.Substring_with_two_args_with_IndexOf(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (CONTAINS(c["String"], "a") AND (SUBSTRING(c["String"], INDEX_OF(c["String"], "a"), 3) = "att")) """); - }); + } #endregion Substring #region IsNullOrEmpty/Whitespace - public override async Task IsNullOrEmpty(bool async) + public override async Task IsNullOrEmpty() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.IsNullOrEmpty(async)); + await AssertTranslationFailed(() => base.IsNullOrEmpty()); AssertSql(); } - public override async Task IsNullOrEmpty_negated(bool async) + public override async Task IsNullOrEmpty_negated() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.IsNullOrEmpty_negated(async)); + await AssertTranslationFailed(() => base.IsNullOrEmpty_negated()); AssertSql(); } - public override async Task IsNullOrWhiteSpace(bool async) + public override async Task IsNullOrWhiteSpace() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.IsNullOrWhiteSpace(async)); + await AssertTranslationFailed(() => base.IsNullOrWhiteSpace()); AssertSql(); } @@ -503,399 +445,347 @@ public override async Task IsNullOrWhiteSpace(bool async) #region StartsWith - public override Task StartsWith_Literal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_Literal(a); + public override async Task StartsWith_Literal() + { + await base.StartsWith_Literal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], "Se") """); - }); + } - public override Task StartsWith_Literal_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_Literal_Char(a); + public override async Task StartsWith_Literal_Char() + { + await base.StartsWith_Literal_Char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], "S") """); - }); + } - public override Task StartsWith_Parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_Parameter(a); + public override async Task StartsWith_Parameter() + { + await base.StartsWith_Parameter(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], @pattern) """); - }); + } - public override Task StartsWith_Parameter_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_Parameter_Char(a); + public override async Task StartsWith_Parameter_Char() + { + await base.StartsWith_Parameter_Char(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], @pattern) """); - }); + } - public override Task StartsWith_Column(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_Column(a); + public override async Task StartsWith_Column() + { + await base.StartsWith_Column(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], c["String"]) """); - }); + } - public override Task StartsWith_with_StringComparison_Ordinal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_with_StringComparison_Ordinal(a); + public override async Task StartsWith_with_StringComparison_Ordinal() + { + await base.StartsWith_with_StringComparison_Ordinal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], "Se", false) """); - }); + } - public override Task StartsWith_with_StringComparison_OrdinalIgnoreCase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(a); + public override async Task StartsWith_with_StringComparison_OrdinalIgnoreCase() + { + await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE STARTSWITH(c["String"], "Se", true) """); - }); + } - public override async Task StartsWith_with_StringComparison_unsupported(bool async) + public override async Task StartsWith_with_StringComparison_unsupported() { - // Always throws for sync. - if (async) - { - await base.StartsWith_with_StringComparison_unsupported(async); - } + await base.StartsWith_with_StringComparison_unsupported(); + + AssertSql(); } #endregion StartsWith #region EndsWith - public override Task EndsWith_Literal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_Literal(a); + public override async Task EndsWith_Literal() + { + await base.EndsWith_Literal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], "le") """); - }); + } - public override Task EndsWith_Literal_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_Literal_Char(a); + public override async Task EndsWith_Literal_Char() + { + await base.EndsWith_Literal_Char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], "e") """); - }); + } - public override Task EndsWith_Parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_Parameter(a); + public override async Task EndsWith_Parameter() + { + await base.EndsWith_Parameter(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], @pattern) """); - }); + } - public override Task EndsWith_Parameter_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_Parameter_Char(a); + public override async Task EndsWith_Parameter_Char() + { + await base.EndsWith_Parameter_Char(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], @pattern) """); - }); + } - public override Task EndsWith_Column(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_Column(a); + public override async Task EndsWith_Column() + { + await base.EndsWith_Column(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], c["String"]) """); - }); + } - public override Task EndsWith_with_StringComparison_Ordinal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_with_StringComparison_Ordinal(a); + public override async Task EndsWith_with_StringComparison_Ordinal() + { + await base.EndsWith_with_StringComparison_Ordinal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], "le", false) """); - }); + } - public override Task EndsWith_with_StringComparison_OrdinalIgnoreCase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(a); + public override async Task EndsWith_with_StringComparison_OrdinalIgnoreCase() + { + await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ENDSWITH(c["String"], "LE", true) """); - }); + } - public override async Task EndsWith_with_StringComparison_unsupported(bool async) + public override async Task EndsWith_with_StringComparison_unsupported() { - // Always throws for sync. - if (async) - { - await base.EndsWith_with_StringComparison_unsupported(async); - } + await base.EndsWith_with_StringComparison_unsupported(); + + AssertSql(); } #endregion EndsWith #region Contains - public override Task Contains_Literal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_Literal(a); + public override async Task Contains_Literal() + { + await base.Contains_Literal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], "eattl") """); - }); + } - public override Task Contains_Literal_Char(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_Literal_Char(a); + public override async Task Contains_Literal_Char() + { + await base.Contains_Literal_Char(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], "e") """); - }); + } - public override Task Contains_Column(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_Column(a); + public override async Task Contains_Column() + { + await base.Contains_Column(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], c["String"]) """, - // - """ + // + """ SELECT VALUE CONTAINS(c["String"], c["String"]) FROM root c """); - }); + } - public override Task Contains_negated(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_negated(a); + public override async Task Contains_negated() + { + await base.Contains_negated(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE NOT(CONTAINS(c["String"], "eattle")) """, - // - """ + // + """ SELECT VALUE NOT(CONTAINS(c["String"], "eattle")) FROM root c """); - }); + } - public override Task Contains_with_StringComparison_Ordinal(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_with_StringComparison_Ordinal(a); + public override async Task Contains_with_StringComparison_Ordinal() + { + await base.Contains_with_StringComparison_Ordinal(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], "eattl", false) """); - }); + } - public override Task Contains_with_StringComparison_OrdinalIgnoreCase(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_with_StringComparison_OrdinalIgnoreCase(a); + public override async Task Contains_with_StringComparison_OrdinalIgnoreCase() + { + await base.Contains_with_StringComparison_OrdinalIgnoreCase(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], "EATTL", true) """); - }); + } - public override async Task Contains_with_StringComparison_unsupported(bool async) + public override async Task Contains_with_StringComparison_unsupported() { - // Always throws for sync. - if (async) - { - await base.Contains_with_StringComparison_unsupported(async); - } + await base.Contains_with_StringComparison_unsupported(); + + AssertSql(); } - public override Task Contains_constant_with_whitespace(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_constant_with_whitespace(a); + public override async Task Contains_constant_with_whitespace() + { + await base.Contains_constant_with_whitespace(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], " ") """); - }); + } - public override Task Contains_parameter_with_whitespace(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Contains_parameter_with_whitespace(a); + public override async Task Contains_parameter_with_whitespace() + { + await base.Contains_parameter_with_whitespace(); - AssertSql( - """ + AssertSql( + """ @pattern=? SELECT VALUE c FROM root c WHERE CONTAINS(c["String"], @pattern) """); - }); + } #endregion Contains #region TrimStart - public override Task TrimStart_without_arguments(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.TrimStart_without_arguments(a); + public override async Task TrimStart_without_arguments() + { + await base.TrimStart_without_arguments(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (LTRIM(c["String"]) = "Boston ") """); - }); + } - public override async Task TrimStart_with_char_argument(bool async) + public override async Task TrimStart_with_char_argument() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TrimStart_with_char_argument(async)); + await AssertTranslationFailed(() => base.TrimStart_with_char_argument()); AssertSql(); } - public override async Task TrimStart_with_char_array_argument(bool async) + public override async Task TrimStart_with_char_array_argument() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TrimStart_with_char_array_argument(async)); + await AssertTranslationFailed(() => base.TrimStart_with_char_array_argument()); AssertSql(); } @@ -904,32 +794,30 @@ public override async Task TrimStart_with_char_array_argument(bool async) #region TrimEnd - public override Task TrimEnd_without_arguments(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.TrimEnd_without_arguments(a); + public override async Task TrimEnd_without_arguments() + { + await base.TrimEnd_without_arguments(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (RTRIM(c["String"]) = " Boston") """); - }); + } - public override async Task TrimEnd_with_char_argument(bool async) + public override async Task TrimEnd_with_char_argument() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TrimEnd_with_char_argument(async)); + await AssertTranslationFailed(() => base.TrimEnd_with_char_argument()); AssertSql(); } - public override async Task TrimEnd_with_char_array_argument(bool async) + public override async Task TrimEnd_with_char_array_argument() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TrimEnd_with_char_array_argument(async)); + await AssertTranslationFailed(() => base.TrimEnd_with_char_array_argument()); AssertSql(); } @@ -938,32 +826,30 @@ public override async Task TrimEnd_with_char_array_argument(bool async) #region Trim - public override Task Trim_without_argument_in_predicate(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Trim_without_argument_in_predicate(a); + public override async Task Trim_without_argument_in_predicate() + { + await base.Trim_without_argument_in_predicate(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (TRIM(c["String"]) = "Boston") """); - }); + } - public override async Task Trim_with_char_argument_in_predicate(bool async) + public override async Task Trim_with_char_argument_in_predicate() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate()); AssertSql(); } - public override async Task Trim_with_char_array_argument_in_predicate(bool async) + public override async Task Trim_with_char_array_argument_in_predicate() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate()); AssertSql(); } @@ -972,26 +858,26 @@ public override async Task Trim_with_char_array_argument_in_predicate(bool async #region Compare - public override async Task Compare_simple_zero(bool async) + public override async Task Compare_simple_zero() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_simple_zero(async)); + await AssertTranslationFailed(() => base.Compare_simple_zero()); AssertSql(); } - public override async Task Compare_simple_one(bool async) + public override async Task Compare_simple_one() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_simple_one(async)); + await AssertTranslationFailed(() => base.Compare_simple_one()); AssertSql(); } - public override async Task Compare_with_parameter(bool async) + public override async Task Compare_with_parameter() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_with_parameter(async)); + await AssertTranslationFailed(() => base.Compare_with_parameter()); AssertSql( """ @@ -999,50 +885,50 @@ public override async Task Compare_with_parameter(bool async) """); } - public override async Task Compare_simple_more_than_one(bool async) + public override async Task Compare_simple_more_than_one() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_simple_more_than_one(async)); + await AssertTranslationFailed(() => base.Compare_simple_more_than_one()); AssertSql(); } - public override async Task Compare_nested(bool async) + public override async Task Compare_nested() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_nested(async)); + await AssertTranslationFailed(() => base.Compare_nested()); AssertSql(); } - public override async Task Compare_multi_predicate(bool async) + public override async Task Compare_multi_predicate() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_multi_predicate(async)); + await AssertTranslationFailed(() => base.Compare_multi_predicate()); AssertSql(); } - public override async Task CompareTo_simple_zero(bool async) + public override async Task CompareTo_simple_zero() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.CompareTo_simple_zero(async)); + await AssertTranslationFailed(() => base.CompareTo_simple_zero()); AssertSql(); } - public override async Task CompareTo_simple_one(bool async) + public override async Task CompareTo_simple_one() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.CompareTo_simple_one(async)); + await AssertTranslationFailed(() => base.CompareTo_simple_one()); AssertSql(); } - public override async Task CompareTo_with_parameter(bool async) + public override async Task CompareTo_with_parameter() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.CompareTo_with_parameter(async)); + await AssertTranslationFailed(() => base.CompareTo_with_parameter()); AssertSql( """ @@ -1050,26 +936,26 @@ public override async Task CompareTo_with_parameter(bool async) """); } - public override async Task CompareTo_simple_more_than_one(bool async) + public override async Task CompareTo_simple_more_than_one() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.CompareTo_simple_more_than_one(async)); + await AssertTranslationFailed(() => base.CompareTo_simple_more_than_one()); AssertSql(); } - public override async Task CompareTo_nested(bool async) + public override async Task CompareTo_nested() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.CompareTo_nested(async)); + await AssertTranslationFailed(() => base.CompareTo_nested()); AssertSql(); } - public override async Task Compare_to_multi_predicate(bool async) + public override async Task Compare_to_multi_predicate() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Compare_to_multi_predicate(async)); + await AssertTranslationFailed(() => base.Compare_to_multi_predicate()); AssertSql(); } @@ -1078,115 +964,107 @@ public override async Task Compare_to_multi_predicate(bool async) #region Join - public override Task Join_over_non_nullable_column(bool async) - => AssertTranslationFailed(() => base.Join_over_non_nullable_column(async)); + public override Task Join_over_non_nullable_column() + => AssertTranslationFailed(() => base.Join_over_non_nullable_column()); - public override Task Join_with_predicate(bool async) - => AssertTranslationFailed(() => base.Join_with_predicate(async)); + public override Task Join_with_predicate() + => AssertTranslationFailed(() => base.Join_with_predicate()); - public override Task Join_with_ordering(bool async) - => AssertTranslationFailed(() => base.Join_with_ordering(async)); + public override Task Join_with_ordering() + => AssertTranslationFailed(() => base.Join_with_ordering()); - public override Task Join_over_nullable_column(bool async) - => AssertTranslationFailed(() => base.Join_over_nullable_column(async)); + public override Task Join_over_nullable_column() + => AssertTranslationFailed(() => base.Join_over_nullable_column()); - public override Task Join_non_aggregate(bool async) - => AssertTranslationFailed(() => base.Join_non_aggregate(async)); + public override Task Join_non_aggregate() + => AssertTranslationFailed(() => base.Join_non_aggregate()); #endregion Join #region Concatenation - public override Task Concat_operator(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Concat_operator(a); + public override async Task Concat_operator() + { + await base.Concat_operator(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["String"] || "Boston") = "SeattleBoston") """); - }); + } - public override Task Concat_aggregate(bool async) - => AssertTranslationFailed(() => base.Concat_aggregate(async)); + public override Task Concat_aggregate() + => AssertTranslationFailed(() => base.Concat_aggregate()); - public override Task Concat_string_string_comparison(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Concat_string_string_comparison(a); + public override async Task Concat_string_string_comparison() + { + await base.Concat_string_string_comparison(); - AssertSql( - """ + AssertSql( + """ @i=? SELECT VALUE c FROM root c WHERE ((@i || c["String"]) = "ASeattle") """); - }); + } - public override async Task Concat_string_int_comparison1(bool async) + public override async Task Concat_string_int_comparison1() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Concat_string_int_comparison1(async)); + await AssertTranslationFailed(() => base.Concat_string_int_comparison1()); AssertSql(); } - public override async Task Concat_string_int_comparison2(bool async) + public override async Task Concat_string_int_comparison2() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Concat_string_int_comparison2(async)); + await AssertTranslationFailed(() => base.Concat_string_int_comparison2()); AssertSql(); } - public override async Task Concat_string_int_comparison3(bool async) + public override async Task Concat_string_int_comparison3() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Concat_string_int_comparison3(async)); + await AssertTranslationFailed(() => base.Concat_string_int_comparison3()); AssertSql(); } - public override async Task Concat_string_int_comparison4(bool async) + public override async Task Concat_string_int_comparison4() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Concat_string_int_comparison4(async)); + await AssertTranslationFailed(() => base.Concat_string_int_comparison4()); AssertSql( ); } - public override Task Concat_method_comparison(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Concat_method_comparison(a); + public override async Task Concat_method_comparison() + { + await base.Concat_method_comparison(); - AssertSql( - """ + AssertSql( + """ @i=? SELECT VALUE c FROM root c WHERE ((@i || c["String"]) = "ASeattle") """); - }); + } - public override Task Concat_method_comparison_2(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Concat_method_comparison_2(a); + public override async Task Concat_method_comparison_2() + { + await base.Concat_method_comparison_2(); - AssertSql( - """ + AssertSql( + """ @i=? @j=? @@ -1194,16 +1072,14 @@ SELECT VALUE c FROM root c WHERE ((@i || (@j || c["String"])) = "ABSeattle") """); - }); + } - public override Task Concat_method_comparison_3(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Concat_method_comparison_3(a); + public override async Task Concat_method_comparison_3() + { + await base.Concat_method_comparison_3(); - AssertSql( - """ + AssertSql( + """ @i=? @j=? @k=? @@ -1212,197 +1088,189 @@ SELECT VALUE c FROM root c WHERE ((@i || (@j || (@k || c["String"]))) = "ABCSeattle") """); - }); + } #endregion Concatenation #region LINQ Operators - public override Task FirstOrDefault(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.FirstOrDefault(a); + public override async Task FirstOrDefault() + { + await base.FirstOrDefault(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (LEFT(c["String"], 1) = "S") """); - }); + } - public override Task LastOrDefault(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.LastOrDefault(a); + public override async Task LastOrDefault() + { + await base.LastOrDefault(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (RIGHT(c["String"], 1) = "e") """); - }); + } #endregion LINQ Operators #region Regex - public override Task Regex_IsMatch(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Regex_IsMatch(a); + public override async Task Regex_IsMatch() + { + await base.Regex_IsMatch(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE RegexMatch(c["String"], "^S") """); - }); + } - public override Task Regex_IsMatch_constant_input(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Regex_IsMatch_constant_input(a); + public override async Task Regex_IsMatch_constant_input() + { + await base.Regex_IsMatch_constant_input(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE RegexMatch("Seattle", c["String"]) """); - }); - -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_None(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.None))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T", "i") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_Multiline(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.Multiline))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T", "m") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_Singleline(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.Singleline))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T", "s") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_IgnorePatternWhitespace(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnorePatternWhitespace))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T", "x") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase_and_IgnorePatternWhitespace(bool async) -// => Fixture.NoSyncTest( -// async, async a => -// { -// await AssertQuery( -// async, -// ss => ss.Set().Where( -// o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace))); -// -// AssertSql( -// """ -// SELECT VALUE c -// FROM root c -// WHERE RegexMatch(c["id"], "^T", "ix") -// """); -// }); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_RightToLeft(bool async) -// => AssertTranslationFailed( -// () => AssertQuery( -// async, -// ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.RightToLeft)))); -// -// [ConditionalTheory] -// [MemberData(nameof(IsAsyncData))] -// public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase_and_RightToLeft(bool async) -// => AssertTranslationFailed( -// () => AssertQuery( -// async, -// ss => ss.Set() -// .Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase | RegexOptions.RightToLeft)))); + } + + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_None() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.None))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T", "i") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_Multiline() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.Multiline))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T", "m") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_Singleline() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.Singleline))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T", "s") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_IgnorePatternWhitespace() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnorePatternWhitespace))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T", "x") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase_and_IgnorePatternWhitespace() + // => Fixture.NoSyncTest( + // async, async a => + // { + // await AssertQuery( + // async, + // ss => ss.Set().Where( + // o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace))); + // + // AssertSql( + // """ + // SELECT VALUE c + // FROM root c + // WHERE RegexMatch(c["id"], "^T", "ix") + // """); + // } + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_RightToLeft() + // => AssertTranslationFailed( + // () => AssertQuery( + // async, + // ss => ss.Set().Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.RightToLeft)))); + // + // [ConditionalTheory] + // [MemberData(nameof(IsAsyncData))] + // public virtual Task Regex_IsMatch_with_RegexOptions_IgnoreCase_and_RightToLeft() + // => AssertTranslationFailed( + // () => AssertQuery( + // async, + // ss => ss.Set() + // .Where(o => Regex.IsMatch(o.CustomerID, "^T", RegexOptions.IgnoreCase | RegexOptions.RightToLeft)))); #endregion Regex diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsCosmosTest.cs index f75d73ba3fa..be899ef1350 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsCosmosTest.cs @@ -11,61 +11,61 @@ public DateOnlyTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Year(bool async) - => AssertTranslationFailed(() => base.Year(async)); + public override Task Year() + => AssertTranslationFailed(() => base.Year()); - public override Task Month(bool async) - => AssertTranslationFailed(() => base.Month(async)); + public override Task Month() + => AssertTranslationFailed(() => base.Month()); - public override Task Day(bool async) - => AssertTranslationFailed(() => base.Day(async)); + public override Task Day() + => AssertTranslationFailed(() => base.Day()); - public override Task DayOfYear(bool async) - => AssertTranslationFailed(() => base.DayOfYear(async)); + public override Task DayOfYear() + => AssertTranslationFailed(() => base.DayOfYear()); - public override Task DayOfWeek(bool async) - => AssertTranslationFailed(() => base.DayOfWeek(async)); + public override Task DayOfWeek() + => AssertTranslationFailed(() => base.DayOfWeek()); // Cosmos does not support DateTimeDiff with years under 1601 - public override Task DayNumber(bool async) - => AssertTranslationFailed(() => base.DayNumber(async)); + public override Task DayNumber() + => AssertTranslationFailed(() => base.DayNumber()); - public override Task AddYears(bool async) - => AssertTranslationFailed(() => base.AddYears(async)); + public override Task AddYears() + => AssertTranslationFailed(() => base.AddYears()); - public override Task AddMonths(bool async) - => AssertTranslationFailed(() => base.AddMonths(async)); + public override Task AddMonths() + => AssertTranslationFailed(() => base.AddMonths()); - public override Task AddDays(bool async) - => AssertTranslationFailed(() => base.AddDays(async)); + public override Task AddDays() + => AssertTranslationFailed(() => base.AddDays()); // Cosmos does not support DateTimeDiff with years under 1601 - public override Task DayNumber_subtraction(bool async) - => AssertTranslationFailed(() => base.DayNumber_subtraction(async)); + public override Task DayNumber_subtraction() + => AssertTranslationFailed(() => base.DayNumber_subtraction()); - public override Task FromDateTime(bool async) - => AssertTranslationFailed(() => base.FromDateTime(async)); + public override Task FromDateTime() + => AssertTranslationFailed(() => base.FromDateTime()); - public override Task FromDateTime_compared_to_property(bool async) - => AssertTranslationFailed(() => base.FromDateTime(async)); + public override Task FromDateTime_compared_to_property() + => AssertTranslationFailed(() => base.FromDateTime()); - public override Task FromDateTime_compared_to_constant_and_parameter(bool async) - => AssertTranslationFailed(() => base.FromDateTime(async)); + public override Task FromDateTime_compared_to_constant_and_parameter() + => AssertTranslationFailed(() => base.FromDateTime()); - public override Task ToDateTime_property_with_constant_TimeOnly(bool async) - => AssertTranslationFailed(() => base.ToDateTime_property_with_constant_TimeOnly(async)); + public override Task ToDateTime_property_with_constant_TimeOnly() + => AssertTranslationFailed(() => base.ToDateTime_property_with_constant_TimeOnly()); - public override Task ToDateTime_property_with_property_TimeOnly(bool async) - => AssertTranslationFailed(() => base.ToDateTime_property_with_property_TimeOnly(async)); + public override Task ToDateTime_property_with_property_TimeOnly() + => AssertTranslationFailed(() => base.ToDateTime_property_with_property_TimeOnly()); - public override Task ToDateTime_constant_DateTime_with_property_TimeOnly(bool async) - => AssertTranslationFailed(() => base.ToDateTime_constant_DateTime_with_property_TimeOnly(async)); + public override Task ToDateTime_constant_DateTime_with_property_TimeOnly() + => AssertTranslationFailed(() => base.ToDateTime_constant_DateTime_with_property_TimeOnly()); - public override Task ToDateTime_with_complex_DateTime(bool async) - => AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime(async)); + public override Task ToDateTime_with_complex_DateTime() + => AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime()); - public override Task ToDateTime_with_complex_TimeOnly(bool async) - => AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly(async)); + public override Task ToDateTime_with_complex_TimeOnly() + => AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsCosmosTest.cs index 6f087471e65..b80406d30d3 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsCosmosTest.cs @@ -13,406 +13,272 @@ public DateTimeOffsetTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Now(async)); + await AssertTranslationFailed(() => base.Now()); AssertSql(); } - public override Task UtcNow(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.UtcNow(a); + public override async Task UtcNow() + { + await base.UtcNow(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["DateTimeOffset"] != GetCurrentDateTime()) """); - }); + } - public override async Task Date(bool async) + public override async Task Date() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Date(async)); + await AssertTranslationFailed(() => base.Date()); AssertSql(); } - public override async Task Year(bool async) + public override async Task Year() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Year(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Year()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("yyyy", c["DateTimeOffset"]) = 1998) """); - }); - } } - public override async Task Month(bool async) + public override async Task Month() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Month(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Month()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("mm", c["DateTimeOffset"]) = 5) """); - }); - } } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.DayOfYear(async)); + await AssertTranslationFailed(() => base.DayOfYear()); AssertSql(); } - public override async Task Day(bool async) + public override async Task Day() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Day(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Day()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("dd", c["DateTimeOffset"]) = 4) """); - }); - } } - public override async Task Hour(bool async) + public override async Task Hour() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Hour(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Hour()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("hh", c["DateTimeOffset"]) = 15) """); - }); - } } - public override async Task Minute(bool async) + public override async Task Minute() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Minute(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Minute()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("mi", c["DateTimeOffset"]) = 30) """); - }); - } } - public override async Task Second(bool async) + public override async Task Second() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Second(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Second()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("ss", c["DateTimeOffset"]) = 10) """); - }); - } } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Millisecond(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Millisecond()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("ms", c["DateTimeOffset"]) = 123) """); - }); - } } - public override async Task Microsecond(bool async) + public override async Task Microsecond() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Microsecond(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Microsecond()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((DateTimePart("mcs", c["DateTimeOffset"]) % 1000) = 456) """); - }); - } } - public override async Task Nanosecond(bool async) + public override async Task Nanosecond() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.Nanosecond(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.Nanosecond()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((DateTimePart("ns", c["DateTimeOffset"]) % 1000) = 400) """); - }); - } } - public override Task TimeOfDay(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.TimeOfDay(a); + public override async Task TimeOfDay() + { + await base.TimeOfDay(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c["DateTimeOffset"] FROM root c """); - }); + } - public override async Task AddYears(bool async) + public override async Task AddYears() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddYears(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddYears()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("yyyy", 1, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddMonths(bool async) + public override async Task AddMonths() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddMonths(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddMonths()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("mm", 1, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddDays(bool async) + public override async Task AddDays() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddSeconds(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddSeconds()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("ss", 1.0, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddHours(bool async) + public override async Task AddHours() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddHours(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddHours()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("hh", 1.0, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddMinutes(bool async) + public override async Task AddMinutes() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddMinutes(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddMinutes()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("mi", 1.0, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddSeconds(bool async) + public override async Task AddSeconds() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddSeconds(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddSeconds()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("ss", 1.0, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override async Task AddMilliseconds(bool async) + public override async Task AddMilliseconds() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 - await Assert.ThrowsAsync(() => base.AddMilliseconds(a)); - - AssertSql( - """ + // Our persisted representation of DateTimeOffset (xxx+00:00) isn't supported by Cosmos (should be xxxZ). #35310 + await Assert.ThrowsAsync(() => base.AddMilliseconds()); + + AssertSql( + """ SELECT VALUE DateTimeAdd("ms", 300.0, c["DateTimeOffset"]) FROM root c """); - }); - } } - public override Task ToUnixTimeMilliseconds(bool async) - => AssertTranslationFailed(() => base.ToUnixTimeMilliseconds(async)); + public override Task ToUnixTimeMilliseconds() + => AssertTranslationFailed(() => base.ToUnixTimeMilliseconds()); - public override Task ToUnixTimeSecond(bool async) - => AssertTranslationFailed(() => base.ToUnixTimeSecond(async)); + public override Task ToUnixTimeSecond() + => AssertTranslationFailed(() => base.ToUnixTimeSecond()); - public override Task Milliseconds_parameter_and_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Milliseconds_parameter_and_constant(a); + public override async Task Milliseconds_parameter_and_constant() + { + await base.Milliseconds_parameter_and_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE COUNT(1) FROM root c WHERE (c["DateTimeOffset"] = "1902-01-02T10:00:00.1234567+01:30") """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsCosmosTest.cs index f000eca2ada..4886247ccbc 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsCosmosTest.cs @@ -11,241 +11,215 @@ public DateTimeTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Now(async)); + await AssertTranslationFailed(() => base.Now()); AssertSql(); } - public override Task UtcNow(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.UtcNow(a); + public override async Task UtcNow() + { + await base.UtcNow(); - AssertSql( - """ + AssertSql( + """ @myDatetime=? SELECT VALUE c FROM root c WHERE (GetCurrentDateTime() != @myDatetime) """); - }); + } - public override async Task Today(bool async) + public override async Task Today() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Today(async)); + await AssertTranslationFailed(() => base.Today()); AssertSql(); } - public override async Task Date(bool async) + public override async Task Date() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.Date(async)); + await AssertTranslationFailed(() => base.Date()); AssertSql(); } - public override Task AddYear(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.AddYear(a); + public override async Task AddYear() + { + await base.AddYear(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("yyyy", DateTimeAdd("yyyy", 1, c["DateTime"])) = 1999) """); - }); + } - public override Task Year(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Year(a); + public override async Task Year() + { + await base.Year(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("yyyy", c["DateTime"]) = 1998) """); - }); + } - public override Task Month(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Month(a); + public override async Task Month() + { + await base.Month(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("mm", c["DateTime"]) = 5) """); - }); + } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { // DateTime.DayOfYear not supported by Cosmos - await AssertTranslationFailed(() => base.DayOfYear(async)); + await AssertTranslationFailed(() => base.DayOfYear()); AssertSql(); } - public override Task Day(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Day(a); + public override async Task Day() + { + await base.Day(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("dd", c["DateTime"]) = 4) """); - }); + } - public override Task Hour(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Hour(a); + public override async Task Hour() + { + await base.Hour(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("hh", c["DateTime"]) = 15) """); - }); + } - public override Task Minute(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Minute(a); + public override async Task Minute() + { + await base.Minute(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("mi", c["DateTime"]) = 30) """); - }); + } - public override Task Second(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Second(a); + public override async Task Second() + { + await base.Second(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("ss", c["DateTime"]) = 10) """); - }); + } - public override Task Millisecond(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Millisecond(a); + public override async Task Millisecond() + { + await base.Millisecond(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (DateTimePart("ms", c["DateTime"]) = 123) """); - }); + } - public override async Task TimeOfDay(bool async) + public override async Task TimeOfDay() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.TimeOfDay(async)); + await AssertTranslationFailed(() => base.TimeOfDay()); AssertSql(); } - public override async Task subtract_and_TotalDays(bool async) + public override async Task subtract_and_TotalDays() { // Cosmos client evaluation. Issue #17246. - await AssertTranslationFailed(() => base.subtract_and_TotalDays(async)); + await AssertTranslationFailed(() => base.subtract_and_TotalDays()); AssertSql(); } - public override Task Parse_with_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Parse_with_constant(a); + public override async Task Parse_with_constant() + { + await base.Parse_with_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["DateTime"] = "1998-05-04T15:30:10") """); - }); + } - public override Task Parse_with_parameter(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.Parse_with_parameter(a); + public override async Task Parse_with_parameter() + { + await base.Parse_with_parameter(); - AssertSql( - """ + AssertSql( + """ @Parse=? SELECT VALUE c FROM root c WHERE (c["DateTime"] = @Parse) """); - }); + } - public override Task New_with_constant(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.New_with_constant(a); + public override async Task New_with_constant() + { + await base.New_with_constant(); - AssertSql( - """ + AssertSql( + """ SELECT VALUE c FROM root c WHERE (c["DateTime"] = "1998-05-04T15:30:10") """); - }); + } - public override Task New_with_parameters(bool async) - => Fixture.NoSyncTest( - async, async a => - { - await base.New_with_parameters(a); + public override async Task New_with_parameters() + { + await base.New_with_parameters(); - AssertSql( - """ + AssertSql( + """ @p=? SELECT VALUE c FROM root c WHERE (c["DateTime"] = @p) """); - }); + } [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsCosmosTest.cs index 5c797025083..7043ef8feff 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsCosmosTest.cs @@ -13,74 +13,66 @@ public TimeOnlyTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Hour(bool async) - => AssertTranslationFailed(() => base.Hour(async)); + public override Task Hour() + => AssertTranslationFailed(() => base.Hour()); - public override Task Minute(bool async) - => AssertTranslationFailed(() => base.Minute(async)); + public override Task Minute() + => AssertTranslationFailed(() => base.Minute()); - public override Task Second(bool async) - => AssertTranslationFailed(() => base.Second(async)); + public override Task Second() + => AssertTranslationFailed(() => base.Second()); - public override Task Millisecond(bool async) - => AssertTranslationFailed(() => base.Millisecond(async)); + public override Task Millisecond() + => AssertTranslationFailed(() => base.Millisecond()); - public override Task Microsecond(bool async) - => AssertTranslationFailed(() => base.Microsecond(async)); + public override Task Microsecond() + => AssertTranslationFailed(() => base.Microsecond()); - public override Task Nanosecond(bool async) - => AssertTranslationFailed(() => base.Nanosecond(async)); + public override Task Nanosecond() + => AssertTranslationFailed(() => base.Nanosecond()); - public override Task AddHours(bool async) - => AssertTranslationFailed(() => base.AddHours(async)); + public override Task AddHours() + => AssertTranslationFailed(() => base.AddHours()); - public override Task AddMinutes(bool async) - => AssertTranslationFailed(() => base.AddMinutes(async)); + public override Task AddMinutes() + => AssertTranslationFailed(() => base.AddMinutes()); - public override Task Add_TimeSpan(bool async) - => AssertTranslationFailed(() => base.Add_TimeSpan(async)); + public override Task Add_TimeSpan() + => AssertTranslationFailed(() => base.Add_TimeSpan()); - public override Task IsBetween(bool async) - => AssertTranslationFailed(() => base.IsBetween(async)); + public override Task IsBetween() + => AssertTranslationFailed(() => base.IsBetween()); - public override async Task Subtract(bool async) + public override async Task Subtract() { - // Always throws for sync. - if (async) - { - await Fixture.NoSyncTest( - async, async a => - { - // See #35311 - await Assert.ThrowsAsync(() => base.Subtract(a)); - - AssertSql( - """ + // See #35311 + await Assert.ThrowsAsync(() => base.Subtract()); + + AssertSql( + """ SELECT VALUE c FROM root c WHERE ((c["TimeOnly"] - "03:00:00") = "12:30:10") """); - }); - } } - public override Task FromDateTime_compared_to_property(bool async) - => AssertTranslationFailed(() => base.FromDateTime_compared_to_property(async)); + public override Task FromDateTime_compared_to_property() + => AssertTranslationFailed(() => base.FromDateTime_compared_to_property()); - public override Task FromDateTime_compared_to_parameter(bool async) - => AssertTranslationFailed(() => base.FromDateTime_compared_to_parameter(async)); + public override Task FromDateTime_compared_to_parameter() + => AssertTranslationFailed(() => base.FromDateTime_compared_to_parameter()); - public override Task FromDateTime_compared_to_constant(bool async) - => AssertTranslationFailed(() => base.FromDateTime_compared_to_constant(async)); + public override Task FromDateTime_compared_to_constant() + => AssertTranslationFailed(() => base.FromDateTime_compared_to_constant()); - public override Task FromTimeSpan_compared_to_property(bool async) - => AssertTranslationFailed(() => base.FromTimeSpan_compared_to_property(async)); + public override Task FromTimeSpan_compared_to_property() + => AssertTranslationFailed(() => base.FromTimeSpan_compared_to_property()); - public override Task FromTimeSpan_compared_to_parameter(bool async) - => AssertTranslationFailed(() => base.FromTimeSpan_compared_to_parameter(async)); + public override Task FromTimeSpan_compared_to_parameter() + => AssertTranslationFailed(() => base.FromTimeSpan_compared_to_parameter()); - public override Task Order_by_FromTimeSpan(bool async) - => AssertTranslationFailed(() => base.Order_by_FromTimeSpan(async)); + public override Task Order_by_FromTimeSpan() + => AssertTranslationFailed(() => base.Order_by_FromTimeSpan()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsCosmosTest.cs index c699dd26c29..58c72fbdf77 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsCosmosTest.cs @@ -11,23 +11,23 @@ public TimeSpanTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override Task Hours(bool async) - => AssertTranslationFailed(() => base.Hours(async)); + public override Task Hours() + => AssertTranslationFailed(() => base.Hours()); - public override Task Minutes(bool async) - => AssertTranslationFailed(() => base.Minutes(async)); + public override Task Minutes() + => AssertTranslationFailed(() => base.Minutes()); - public override Task Seconds(bool async) - => AssertTranslationFailed(() => base.Seconds(async)); + public override Task Seconds() + => AssertTranslationFailed(() => base.Seconds()); - public override Task Milliseconds(bool async) - => AssertTranslationFailed(() => base.Milliseconds(async)); + public override Task Milliseconds() + => AssertTranslationFailed(() => base.Milliseconds()); - public override Task Microseconds(bool async) - => AssertTranslationFailed(() => base.Microseconds(async)); + public override Task Microseconds() + => AssertTranslationFailed(() => base.Microseconds()); - public override Task Nanoseconds(bool async) - => AssertTranslationFailed(() => base.Nanoseconds(async)); + public override Task Nanoseconds() + => AssertTranslationFailed(() => base.Nanoseconds()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.InMemory.FunctionalTests/Query/Translations/StringTranslationsInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/Translations/StringTranslationsInMemoryTest.cs index 2bce9c144ee..1819e8a51b3 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/Translations/StringTranslationsInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/Translations/StringTranslationsInMemoryTest.cs @@ -8,12 +8,12 @@ public class StringTranslationsInMemoryTest(BasicTypesQueryInMemoryFixture fixtu { // StringComparison.CurrentCulture{,IgnoreCase} and InvariantCulture{,IgnoreCase} are not supported in real providers, but the in-memory // provider does support them. - public override Task StartsWith_with_StringComparison_unsupported(bool async) + public override Task StartsWith_with_StringComparison_unsupported() => Task.CompletedTask; - public override Task EndsWith_with_StringComparison_unsupported(bool async) + public override Task EndsWith_with_StringComparison_unsupported() => Task.CompletedTask; - public override Task Contains_with_StringComparison_unsupported(bool async) + public override Task Contains_with_StringComparison_unsupported() => Task.CompletedTask; } diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs index 6e8269ea31a..54ec7285792 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs @@ -16,8 +16,8 @@ public ComplexTableSplittingMiscellaneousRelationalTestBase(TFixture fixture, IT } // TODO: Optional complex properties not yet supported (#31376) - public override Task Where_optional_related_property(bool async) - => AssertTranslationFailed(() => base.Where_optional_related_property(async)); + public override Task Where_optional_related_property() + => AssertTranslationFailed(() => base.Where_optional_related_property()); protected void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs index ac87561b03a..3ff62477ccd 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs @@ -17,32 +17,32 @@ public ComplexTableSplittingProjectionRelationalTestBase(TFixture fixture, ITest } // Complex JSON collections, update pipeline not yet supported so no seeding, #31237 - public override Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.Select_related_collection(async, queryTrackingBehavior)); + public override Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.Select_related_collection(queryTrackingBehavior)); // Complex JSON collections, update pipeline not yet supported so no seeding, #31237 - public override Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.Select_nested_collection_on_required_related(async, queryTrackingBehavior)); + public override Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.Select_nested_collection_on_required_related(queryTrackingBehavior)); // Optional complex types, #31376 - public override Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.Select_optional_nested_on_required_related(async, queryTrackingBehavior)); + public override Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.Select_optional_nested_on_required_related(queryTrackingBehavior)); // Optional complex types, #31376 - public override Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); // Complex JSON collections, update pipeline not yet supported so no seeding, #31237 - public override Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.SelectMany_related_collection(async, queryTrackingBehavior)); + public override Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.SelectMany_related_collection(queryTrackingBehavior)); // Optional complex types, #31376 - public override Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior)); // Optional complex types, #31376 - public override Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => Assert.ThrowsAsync(() => base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior)); protected void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs index 4130e083424..852dd8202d4 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs @@ -17,34 +17,34 @@ public ComplexTableSplittingStructuralEqualityRelationalTestBase(TFixture fixtur // TODO: All the tests below rely on access OptionalRelated, but optional complex properties not yet supported (#31376) - public override Task Two_related(bool async) - => Assert.ThrowsAsync(() => base.Two_related(async)); + public override Task Two_related() + => Assert.ThrowsAsync(() => base.Two_related()); - public override Task Two_nested(bool async) - => Assert.ThrowsAsync(() => base.Two_nested(async)); + public override Task Two_nested() + => Assert.ThrowsAsync(() => base.Two_nested()); - public override Task Not_equals(bool async) - => Assert.ThrowsAsync(() => base.Not_equals(async)); + public override Task Not_equals() + => Assert.ThrowsAsync(() => base.Not_equals()); - public override Task Related_with_inline_null(bool async) - => Assert.ThrowsAsync(() => base.Related_with_inline_null(async)); + public override Task Related_with_inline_null() + => Assert.ThrowsAsync(() => base.Related_with_inline_null()); - public override Task Related_with_parameter_null(bool async) - => Assert.ThrowsAsync(() => base.Related_with_parameter_null(async)); + public override Task Related_with_parameter_null() + => Assert.ThrowsAsync(() => base.Related_with_parameter_null()); - public override Task Nested_with_inline_null(bool async) - => Assert.ThrowsAsync(() => base.Nested_with_inline_null(async)); + public override Task Nested_with_inline_null() + => Assert.ThrowsAsync(() => base.Nested_with_inline_null()); - public override Task Two_nested_collections(bool async) - => Assert.ThrowsAsync(() => base.Two_nested_collections(async)); + public override Task Two_nested_collections() + => Assert.ThrowsAsync(() => base.Two_nested_collections()); // Collection equality with owned collections is not supported - public override Task Nested_collection_with_inline(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_inline(async)); + public override Task Nested_collection_with_inline() + => Assert.ThrowsAsync(() => base.Nested_collection_with_inline()); // Collection equality with owned collections is not supported - public override Task Nested_collection_with_parameter(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter(async)); + public override Task Nested_collection_with_parameter() + => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter()); protected void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs index 7934a42f7ed..9923e883166 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs @@ -16,9 +16,8 @@ public NavigationsProjectionRelationalTestBase(TFixture fixture, ITestOutputHelp // Traditional relational collections navigations projected from null instances are returned as empty collections rather than null. // This is in contrast to client evaluation behavior - and also the JSON collection behavior - where we get null instance (coalescing). - public override Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection), ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection ?? new List()), assertOrder: true, diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs index 9054118a6c6..0b6801f199f 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs @@ -18,14 +18,14 @@ public NavigationsStructuralEqualityRelationalTestBase(TFixture fixture, ITestOu // Traditional relational collections navigations can't be compared reliably. // The failure below is because collections on from null instances are returned as empty collections rather than null; but // even disregarding that, elements in the collection don't preserve ordering and so can't be compared reliably. - public override Task Two_nested_collections(bool async) - => Assert.ThrowsAsync(() => base.Two_nested_collections(async)); + public override Task Two_nested_collections() + => Assert.ThrowsAsync(() => base.Two_nested_collections()); - public override Task Nested_collection_with_inline(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_inline(async)); + public override Task Nested_collection_with_inline() + => Assert.ThrowsAsync(() => base.Nested_collection_with_inline()); - public override Task Nested_collection_with_parameter(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter(async)); + public override Task Nested_collection_with_parameter() + => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter()); protected void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs index 92122b8eb9d..a15d16d4471 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs @@ -17,8 +17,8 @@ public OwnedJsonStructuralEqualityRelationalTestBase(TFixture fixture, ITestOutp } // #36401 - public override Task Related_with_parameter_null(bool async) - => Assert.ThrowsAsync(() => base.Related_with_parameter_null(async)); + public override Task Related_with_parameter_null() + => Assert.ThrowsAsync(() => base.Related_with_parameter_null()); protected void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs index e7769118e2f..b4c5a469d0d 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs @@ -16,11 +16,10 @@ public OwnedNavigationsProjectionRelationalTestBase(TFixture fixture, ITestOutpu // Traditional relational collections navigations projected from null instances are returned as empty collections rather than null. // This is in contrast to client evaluation behavior - and also the JSON collection behavior - where we get null instance (coalescing). - public override Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll - ? base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior) + ? base.Select_nested_collection_on_optional_related(queryTrackingBehavior) : AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection), ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection ?? new List()), assertOrder: true, diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs index 990ce547818..f99d261232f 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs @@ -19,11 +19,10 @@ public OwnedTableSplittingProjectionRelationalTestBase(TFixture fixture, ITestOu // Traditional relational collections navigations can't be compared reliably. // The failure below is because collections on from null instances are returned as empty collections rather than null; but // even disregarding that, elements in the collection don't preserve ordering and so can't be compared reliably. - public override Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertOwnedTrackingQuery( queryTrackingBehavior, () => AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection), ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection ?? new List()), assertOrder: true, diff --git a/test/EFCore.Relational.Specification.Tests/Query/Translations/MiscellaneousTranslationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Translations/MiscellaneousTranslationsRelationalTestBase.cs index cda5ff03a2f..3697afb29f4 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Translations/MiscellaneousTranslationsRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Translations/MiscellaneousTranslationsRelationalTestBase.cs @@ -6,21 +6,21 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations; public abstract class MiscellaneousTranslationsRelationalTestBase(TFixture fixture) : MiscellaneousTranslationsTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - public override Task Random_Shared_Next_with_no_args(bool async) - => AssertTranslationFailed(() => base.Random_Shared_Next_with_no_args(async)); + public override Task Random_Shared_Next_with_no_args() + => AssertTranslationFailed(() => base.Random_Shared_Next_with_no_args()); - public override Task Random_Shared_Next_with_one_arg(bool async) - => AssertTranslationFailed(() => base.Random_Shared_Next_with_one_arg(async)); + public override Task Random_Shared_Next_with_one_arg() + => AssertTranslationFailed(() => base.Random_Shared_Next_with_one_arg()); - public override Task Random_Shared_Next_with_two_args(bool async) - => AssertTranslationFailed(() => base.Random_Shared_Next_with_two_args(async)); + public override Task Random_Shared_Next_with_two_args() + => AssertTranslationFailed(() => base.Random_Shared_Next_with_two_args()); - public override Task Random_new_Next_with_no_args(bool async) - => AssertTranslationFailed(() => base.Random_new_Next_with_no_args(async)); + public override Task Random_new_Next_with_no_args() + => AssertTranslationFailed(() => base.Random_new_Next_with_no_args()); - public override Task Random_new_Next_with_one_arg(bool async) - => AssertTranslationFailed(() => base.Random_new_Next_with_one_arg(async)); + public override Task Random_new_Next_with_one_arg() + => AssertTranslationFailed(() => base.Random_new_Next_with_one_arg()); - public override Task Random_new_Next_with_two_args(bool async) - => AssertTranslationFailed(() => base.Random_new_Next_with_two_args(async)); + public override Task Random_new_Next_with_two_args() + => AssertTranslationFailed(() => base.Random_new_Next_with_two_args()); } diff --git a/test/EFCore.Relational.Specification.Tests/Query/Translations/StringTranslationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Translations/StringTranslationsRelationalTestBase.cs index e9beda59ea9..a3311e88891 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Translations/StringTranslationsRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Translations/StringTranslationsRelationalTestBase.cs @@ -13,69 +13,61 @@ public abstract class StringTranslationsRelationalTestBase(TFixture fi // All the following tests specify case sensitivity (via StringComparison), which isn't supported in relational databases, where the // column collation is used to control comparison semantics. - public override Task Equals_with_OrdinalIgnoreCase(bool async) - => AssertTranslationFailed(() => base.Equals_with_OrdinalIgnoreCase(async)); + public override Task Equals_with_OrdinalIgnoreCase() + => AssertTranslationFailed(() => base.Equals_with_OrdinalIgnoreCase()); - public override Task Equals_with_Ordinal(bool async) - => AssertTranslationFailed(() => base.Equals_with_OrdinalIgnoreCase(async)); + public override Task Equals_with_Ordinal() + => AssertTranslationFailed(() => base.Equals_with_OrdinalIgnoreCase()); - public override Task Static_Equals_with_OrdinalIgnoreCase(bool async) - => AssertTranslationFailed(() => base.Static_Equals_with_OrdinalIgnoreCase(async)); + public override Task Static_Equals_with_OrdinalIgnoreCase() + => AssertTranslationFailed(() => base.Static_Equals_with_OrdinalIgnoreCase()); - public override Task Static_Equals_with_Ordinal(bool async) - => AssertTranslationFailed(() => base.Static_Equals_with_Ordinal(async)); + public override Task Static_Equals_with_Ordinal() + => AssertTranslationFailed(() => base.Static_Equals_with_Ordinal()); - public override Task StartsWith_with_StringComparison_Ordinal(bool async) - => AssertTranslationFailed(() => base.StartsWith_with_StringComparison_Ordinal(async)); + public override Task StartsWith_with_StringComparison_Ordinal() + => AssertTranslationFailed(() => base.StartsWith_with_StringComparison_Ordinal()); - public override Task StartsWith_with_StringComparison_OrdinalIgnoreCase(bool async) - => AssertTranslationFailed(() => base.StartsWith_with_StringComparison_OrdinalIgnoreCase(async)); + public override Task StartsWith_with_StringComparison_OrdinalIgnoreCase() + => AssertTranslationFailed(() => base.StartsWith_with_StringComparison_OrdinalIgnoreCase()); - public override Task EndsWith_with_StringComparison_Ordinal(bool async) - => AssertTranslationFailed(() => base.EndsWith_with_StringComparison_Ordinal(async)); + public override Task EndsWith_with_StringComparison_Ordinal() + => AssertTranslationFailed(() => base.EndsWith_with_StringComparison_Ordinal()); - public override Task EndsWith_with_StringComparison_OrdinalIgnoreCase(bool async) - => AssertTranslationFailed(() => base.EndsWith_with_StringComparison_OrdinalIgnoreCase(async)); + public override Task EndsWith_with_StringComparison_OrdinalIgnoreCase() + => AssertTranslationFailed(() => base.EndsWith_with_StringComparison_OrdinalIgnoreCase()); - public override Task Contains_with_StringComparison_Ordinal(bool async) - => AssertTranslationFailed(() => base.Contains_with_StringComparison_Ordinal(async)); + public override Task Contains_with_StringComparison_Ordinal() + => AssertTranslationFailed(() => base.Contains_with_StringComparison_Ordinal()); - public override Task Contains_with_StringComparison_OrdinalIgnoreCase(bool async) - => AssertTranslationFailed(() => base.Contains_with_StringComparison_OrdinalIgnoreCase(async)); + public override Task Contains_with_StringComparison_OrdinalIgnoreCase() + => AssertTranslationFailed(() => base.Contains_with_StringComparison_OrdinalIgnoreCase()); #endregion Case sensitivity #region Like - [ConditionalTheory] // #26661, precedence/parentheses - belongs in OperatorsQueryTestBase - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_Like_and_comparison(bool async) + [ConditionalFact] // #26661, precedence/parentheses - belongs in OperatorsQueryTestBase + public virtual Task Where_Like_and_comparison() => AssertQuery( - async, ss => ss.Set().Where(c => EF.Functions.Like(c.String, "S%") && c.Int == 8), ss => ss.Set().Where(c => c.String.StartsWith("S") && c.Int == 8)); - [ConditionalTheory] // #26661, precedence/parentheses - belongs in OperatorsQueryTestBase - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_Like_or_comparison(bool async) + [ConditionalFact] // #26661, precedence/parentheses - belongs in OperatorsQueryTestBase + public virtual Task Where_Like_or_comparison() => AssertQuery( - async, ss => ss.Set().Where(c => EF.Functions.Like(c.String, "S%") || c.Int == int.MaxValue), ss => ss.Set().Where(c => c.String.StartsWith("S") || c.Id == int.MaxValue)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Like_with_non_string_column_using_ToString(bool async) + [ConditionalFact] + public virtual Task Like_with_non_string_column_using_ToString() => AssertQuery( - async, ss => ss.Set().Where(o => EF.Functions.Like(o.Int.ToString(), "%5%")), ss => ss.Set().Where(o => o.Int.ToString().Contains("5"))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Like_with_non_string_column_using_double_cast(bool async) + [ConditionalFact] + public virtual Task Like_with_non_string_column_using_double_cast() => AssertQuery( - async, ss => ss.Set().Where(o => EF.Functions.Like((string)(object)o.Int, "%5%")), ss => ss.Set().Where(o => o.Int.ToString().Contains("5"))); diff --git a/test/EFCore.Specification.Tests/Query/QueryTestBase.cs b/test/EFCore.Specification.Tests/Query/QueryTestBase.cs index cddfb2b59f2..ce4ee35feae 100644 --- a/test/EFCore.Specification.Tests/Query/QueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/QueryTestBase.cs @@ -41,14 +41,35 @@ protected virtual Expression RewriteExpectedQueryExpression(Expression expectedQ public static readonly IEnumerable IsAsyncData = [[false], [true]]; - public static readonly IEnumerable AsyncAndTrackingData = + public static readonly IEnumerable TrackingData = [ - [false, QueryTrackingBehavior.TrackAll], - [false, QueryTrackingBehavior.NoTracking], - [true, QueryTrackingBehavior.TrackAll], - [true, QueryTrackingBehavior.NoTracking] + [QueryTrackingBehavior.TrackAll], + [QueryTrackingBehavior.NoTracking] ]; + public Task AssertQuery( + Func> query, + Func? elementSorter = null, + Action? elementAsserter = null, + bool assertOrder = false, + bool assertEmpty = false, + QueryTrackingBehavior? queryTrackingBehavior = null, + [CallerMemberName] string testMethodName = "") + => AssertQuery(async: true, query, query, elementSorter, elementAsserter, assertOrder, assertEmpty, queryTrackingBehavior, testMethodName); + + public Task AssertQuery( + Func> actualQuery, + Func> expectedQuery, + Func? elementSorter = null, + Action? elementAsserter = null, + bool assertOrder = false, + bool assertEmpty = false, + QueryTrackingBehavior? queryTrackingBehavior = null, + [CallerMemberName] string testMethodName = "") + => TestOutputWrapper( + () => QueryAsserter.AssertQuery( + actualQuery, expectedQuery, elementSorter, elementAsserter, assertOrder, assertEmpty, async: true, queryTrackingBehavior, testMethodName)); + public Task AssertQuery( bool async, Func> query, @@ -74,6 +95,15 @@ public Task AssertQuery( () => QueryAsserter.AssertQuery( actualQuery, expectedQuery, elementSorter, elementAsserter, assertOrder, assertEmpty, async, queryTrackingBehavior, testMethodName)); + public Task AssertQueryScalar( + Func> query, + Action? asserter = null, + bool assertOrder = false, + bool assertEmpty = false, + [CallerMemberName] string testMethodName = "") + where TResult : struct + => AssertQueryScalar(async: true, query, asserter, assertOrder, assertEmpty, testMethodName); + public Task AssertQueryScalar( bool async, Func> query, @@ -84,6 +114,17 @@ public Task AssertQueryScalar( where TResult : struct => AssertQueryScalar(async, query, query, asserter, assertOrder, assertEmpty, testMethodName); + public Task AssertQueryScalar( + Func> actualQuery, + Func> expectedQuery, + Action? asserter = null, + bool assertOrder = false, + bool assertEmpty = false, + [CallerMemberName] string testMethodName = "") + where TResult : struct + => TestOutputWrapper( + () => AssertQueryScalar(async: true, actualQuery, expectedQuery, asserter, assertOrder, assertEmpty, testMethodName)); + public Task AssertQueryScalar( bool async, Func> actualQuery, @@ -207,6 +248,11 @@ protected Task AssertElementAtOrDefault( => TestOutputWrapper( () => QueryAsserter.AssertElementAtOrDefault(actualQuery, expectedQuery, actualIndex, expectedIndex, asserter, async)); + protected Task AssertFirst( + Func> query, + Action? asserter = null) + => AssertFirst(async: true, query, query, asserter); + protected Task AssertFirst( bool async, Func> query, @@ -388,11 +434,20 @@ protected Task AssertLastOrDefault( => TestOutputWrapper( () => QueryAsserter.AssertLastOrDefault(actualQuery, expectedQuery, actualPredicate, expectedPredicate, asserter, async)); + protected Task AssertCount( + Func> query) + => AssertCount(async: true, query, query); + protected Task AssertCount( bool async, Func> query) => AssertCount(async, query, query); + protected Task AssertCount( + Func> actualQuery, + Func> expectedQuery) + => AssertCount(async: true, actualQuery, expectedQuery); + protected Task AssertCount( bool async, Func> actualQuery, @@ -405,6 +460,13 @@ protected Task AssertCount( Expression> predicate) => AssertCount(async, query, query, predicate, predicate); + protected Task AssertCount( + Func> actualQuery, + Func> expectedQuery, + Expression> actualPredicate, + Expression> expectedPredicate) + => AssertCount(async: true, actualQuery, expectedQuery, actualPredicate, expectedPredicate); + protected Task AssertCount( bool async, Func> actualQuery, diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs index 4f8f13db0dc..1ed335c012e 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs @@ -11,51 +11,44 @@ public abstract class ComplexPropertiesStructuralEqualityTestBase(TFix // by-value server-side behavior of complex properties. // TODO: Ideally do this rewriting automatically via a visitor - public override Task Two_related(bool async) + public override Task Two_related() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated == e.OptionalRelated), ss => ss.Set().Where(e => e.RequiredRelated.Equals(e.OptionalRelated))); - public override Task Two_nested(bool async) + public override Task Two_nested() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested == e.OptionalRelated!.RequiredNested), ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Equals(e.OptionalRelated!.RequiredNested))); - public override Task Not_equals(bool async) + public override Task Not_equals() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated != e.OptionalRelated), ss => ss.Set().Where(e => !e.RequiredRelated.Equals(e.OptionalRelated))); - public override Task Nested_with_inline(bool async) + public override Task Nested_with_inline() => AssertQuery( - async, ss => ss.Set() .Where(e => e.RequiredRelated.RequiredNested == new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }), ss => ss.Set() .Where(e => e.RequiredRelated.RequiredNested.Equals(new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }))); - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { var nested = new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }; await AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested == nested), ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Equals(nested))); } - public override Task Two_nested_collections(bool async) + public override Task Two_nested_collections() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection == e.OptionalRelated!.NestedCollection), ss => ss.Set().Where(e => e.OptionalRelated != null && e.RequiredRelated.NestedCollection.SequenceEqual(e.OptionalRelated!.NestedCollection))); - public override Task Nested_collection_with_inline(bool async) + public override Task Nested_collection_with_inline() => AssertQuery( - async, ss => ss.Set() .Where(e => e.RequiredRelated.NestedCollection == new List { @@ -69,7 +62,7 @@ public override Task Nested_collection_with_inline(bool async) new() { Id = 1003, Name = "Root1_RequiredRelated_NestedCollection_2", Int = 8, String = "foo" } }))); - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { var nestedCollection = new List { @@ -78,7 +71,6 @@ public override async Task Nested_collection_with_parameter(bool async) }; await AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection == nestedCollection), ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection.SequenceEqual(nestedCollection))); } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs index d7ccd13408e..f48c0ad7348 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs @@ -8,45 +8,45 @@ public abstract class OwnedNavigationsProjectionTestBase(TFixture fixt { #region Non-collection - public override Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_related(async, queryTrackingBehavior)); + public override Task Select_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_related(queryTrackingBehavior)); - public override Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_related(async, queryTrackingBehavior)); + public override Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_related(queryTrackingBehavior)); - public override Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_required_nested_on_required_related(async, queryTrackingBehavior)); + public override Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_required_nested_on_required_related(queryTrackingBehavior)); - public override Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_nested_on_required_related(async, queryTrackingBehavior)); + public override Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_nested_on_required_related(queryTrackingBehavior)); - public override Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_required_nested_on_optional_related(async, queryTrackingBehavior)); + public override Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_required_nested_on_optional_related(queryTrackingBehavior)); - public override Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior)); + public override Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_optional_nested_on_optional_related(queryTrackingBehavior)); #endregion Non-collection #region Collection - public override Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_related_collection(async, queryTrackingBehavior)); + public override Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_related_collection(queryTrackingBehavior)); - public override Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_nested_collection_on_required_related(async, queryTrackingBehavior)); + public override Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_nested_collection_on_required_related(queryTrackingBehavior)); - public override Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior)); + public override Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_nested_collection_on_optional_related(queryTrackingBehavior)); - public override Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_related_collection(async, queryTrackingBehavior)); + public override Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_related_collection(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior)); #endregion Collection @@ -54,7 +54,7 @@ public override Task SelectMany_nested_collection_on_optional_related(bool async // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_trunk_and_branch_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_trunk_and_branch_duplicated(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() @@ -79,7 +79,7 @@ public override Task SelectMany_nested_collection_on_optional_related(bool async // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_trunk_and_trunk_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_trunk_and_trunk_duplicated(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() @@ -104,7 +104,7 @@ public override Task SelectMany_nested_collection_on_optional_related(bool async // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_leaf_trunk_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_leaf_trunk_root(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() @@ -126,7 +126,7 @@ public override Task SelectMany_nested_collection_on_optional_related(bool async // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_multiple_branch_leaf(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_multiple_branch_leaf(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set().Select( @@ -155,15 +155,15 @@ public override Task SelectMany_nested_collection_on_optional_related(bool async #region Subquery - public override Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); - public override Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertOwnedTrackingQuery(queryTrackingBehavior, () => base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior)); // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_trunk_FirstOrDefault_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_subquery_root_set_trunk_FirstOrDefault_collection(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() @@ -179,7 +179,7 @@ public override Task Select_subquery_optional_related_FirstOrDefault(bool async, // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_complex_projection_including_references_to_outer_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_subquery_root_set_complex_projection_including_references_to_outer_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() @@ -209,7 +209,7 @@ public override Task Select_subquery_optional_related_FirstOrDefault(bool async, // [ConditionalTheory] // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_complex_projection_FirstOrDefault_project_reference_to_outer(bool async, QueryTrackingBehavior queryTrackingBehavior) + // public virtual Task Select_subquery_root_set_complex_projection_FirstOrDefault_project_reference_to_outer(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( // async, // ss => ss.Set() diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs index f0d5f8019ad..dc6c1f6006a 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs @@ -7,47 +7,43 @@ public abstract class OwnedNavigationsStructuralEqualityTestBase(TFixt : RelationshipsStructuralEqualityTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { - public override Task Two_related(bool async) + public override Task Two_related() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated == e.OptionalRelated), ss => ss.Set().Where(e => false), // Owned entities are never equal assertEmpty: true); - public override Task Two_nested(bool async) + public override Task Two_nested() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested == e.OptionalRelated!.RequiredNested), ss => ss.Set().Where(e => false), // Owned entities are never equal assertEmpty: true); - public override Task Not_equals(bool async) + public override Task Not_equals() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated != e.OptionalRelated), ss => ss.Set().Where(e => false), // TODO: unclear, this should be true assertEmpty: true); // #36400 - public override Task Nested_with_inline(bool async) - => Assert.ThrowsAsync(() => base.Nested_with_inline(async)); + public override Task Nested_with_inline() + => Assert.ThrowsAsync(() => base.Nested_with_inline()); // #36400 - public override Task Nested_with_parameter(bool async) - => Assert.ThrowsAsync(() => base.Nested_with_parameter(async)); + public override Task Nested_with_parameter() + => Assert.ThrowsAsync(() => base.Nested_with_parameter()); - public override Task Two_nested_collections(bool async) + public override Task Two_nested_collections() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection == e.OptionalRelated!.NestedCollection), ss => ss.Set().Where(e => false), // Owned entities are never equal assertEmpty: true); // #36400 - public override Task Nested_collection_with_inline(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_inline(async)); + public override Task Nested_collection_with_inline() + => Assert.ThrowsAsync(() => base.Nested_collection_with_inline()); // #36400 - public override Task Nested_collection_with_parameter(bool async) - => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter(async)); + public override Task Nested_collection_with_parameter() + => Assert.ThrowsAsync(() => base.Nested_collection_with_parameter()); } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs index b14fdbd12e3..5f279a9f6c7 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs @@ -9,25 +9,18 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships; public abstract class RelationshipsCollectionTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : RelationshipsQueryFixtureBase, new() { - [ConditionalTheory] + [ConditionalFact] [MemberData(nameof(IsAsyncData))] - public virtual Task Count(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.RelatedCollection.Count == 2)); + public virtual Task Count() + => AssertQuery(ss => ss.Set().Where(e => e.RelatedCollection.Count == 2)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.RelatedCollection.Where(r => r.Int != 8).Count() == 2)); + [ConditionalFact] + public virtual Task Where() + => AssertQuery(ss => ss.Set().Where(e => e.RelatedCollection.Where(r => r.Int != 8).Count() == 2)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task OrderBy_ElementAt(bool async) + [ConditionalFact] + public virtual Task OrderBy_ElementAt() => AssertQuery( - async, ss => ss.Set().Where( e => e.RelatedCollection.OrderBy(r => r.Id).ElementAt(0).Int == 8), ss => ss.Set().Where(e => e.RelatedCollection.Count > 0 @@ -35,43 +28,35 @@ public virtual Task OrderBy_ElementAt(bool async) #region Index - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Index_constant(bool async) + [ConditionalFact] + public virtual Task Index_constant() => AssertOrderedCollectionQuery( () => AssertQuery( - async, ss => ss.Set().Where(e => e.RelatedCollection[0].Int == 8), ss => ss.Set().Where(e => e.RelatedCollection.Count > 0 && e.RelatedCollection[0].Int == 8))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Index_parameter(bool async) + [ConditionalFact] + public virtual Task Index_parameter() => AssertOrderedCollectionQuery(() => { var i = 0; return AssertQuery( - async, ss => ss.Set().Where(e => e.RelatedCollection[i].Int == 8), ss => ss.Set().Where(e => e.RelatedCollection.Count > 0 && e.RelatedCollection[i].Int == 8)); }); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Index_column(bool async) + [ConditionalFact] + public virtual Task Index_column() => AssertOrderedCollectionQuery( () => AssertQuery( - async, ss => ss.Set().Where(e => e.RelatedCollection[e.Id - 1].Int == 8), ss => ss.Set().Where(e => e.RelatedCollection.Count > e.Id - 1 && e.RelatedCollection[e.Id - 1].Int == 8))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Index_out_of_bounds(bool async) + [ConditionalFact] + public virtual Task Index_out_of_bounds() => AssertOrderedCollectionQuery( () => AssertQuery( - async, ss => ss.Set().Where(e => e.RelatedCollection[9999].Int == 8), ss => ss.Set().Where(e => false), assertEmpty: true)); diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs index cbd0367d7d8..3f229ba2df8 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs @@ -8,26 +8,17 @@ public abstract class RelationshipsMiscellaneousTestBase(TFixture fixt { #region Simple filters - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_related_property(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.RequiredRelated.Int == 8)); + [ConditionalFact] + public virtual Task Where_related_property() + => AssertQuery(ss => ss.Set().Where(e => e.RequiredRelated.Int == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_optional_related_property(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.OptionalRelated!.Int == 8)); + [ConditionalFact] + public virtual Task Where_optional_related_property() + => AssertQuery(ss => ss.Set().Where(e => e.OptionalRelated!.Int == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_nested_related_property(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Int == 8)); + [ConditionalFact] + public virtual Task Where_nested_related_property() + => AssertQuery(ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Int == 8)); #endregion Simple filters } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs index ea771548181..3f7c53f65d8 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs @@ -7,47 +7,42 @@ public abstract class RelationshipsProjectionTestBase(TFixture fixture where TFixture : RelationshipsQueryFixtureBase, new() { [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_root(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set(), queryTrackingBehavior: queryTrackingBehavior); #region Simple properties [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.RequiredRelated.String), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.String), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) // We have an entity with OptionalRelated null, so projecting a value type property from that throws // "Nullable object must have a value" => Assert.ThrowsAsync(() => AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.Int), queryTrackingBehavior: queryTrackingBehavior)); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => (int?)x.OptionalRelated!.Int), queryTrackingBehavior: queryTrackingBehavior); @@ -56,50 +51,44 @@ public virtual Task Select_nullable_value_type_property_on_null_related(bool asy #region Non-collection [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.RequiredRelated), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.RequiredRelated.RequiredNested), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.RequiredRelated.OptionalNested), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.RequiredNested), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => x.OptionalRelated!.OptionalNested), queryTrackingBehavior: queryTrackingBehavior); @@ -111,56 +100,50 @@ public virtual Task Select_optional_nested_on_optional_related(bool async, Query // otherwise it's difficult/unreliable to compare client-side. [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.RelatedCollection), assertOrder: true, elementAsserter: (e, a) => AssertCollection(e, a, elementSorter: r => r.Id), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.RequiredRelated.NestedCollection), assertOrder: true, elementAsserter: (e, a) => AssertCollection(e, a, elementSorter: r => r.Id), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().OrderBy(e => e.Id).Select(x => x.OptionalRelated!.NestedCollection), assertOrder: true, elementAsserter: (e, a) => AssertCollection(e, a, elementSorter: r => r.Id), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().SelectMany(x => x.RelatedCollection), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().SelectMany(x => x.RequiredRelated.NestedCollection), queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set() .SelectMany(x => x.OptionalRelated!.NestedCollection), ss => ss.Set() @@ -172,10 +155,9 @@ public virtual Task SelectMany_nested_collection_on_optional_related(bool async, #region Multiple [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set().Select(x => new { First = x, Second = x }), elementSorter: e => e.First.Id, elementAsserter: (e, a) => @@ -186,10 +168,9 @@ public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior que queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_trunk_and_branch_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_trunk_and_branch_duplicated(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .OrderBy(x => x.Id) // .Select( @@ -211,10 +192,9 @@ public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior que // queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_trunk_and_trunk_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_trunk_and_trunk_duplicated(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .OrderBy(x => x.Id) // .Select( @@ -236,10 +216,9 @@ public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior que // queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_leaf_trunk_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_leaf_trunk_root(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .Select( // x => new @@ -258,10 +237,9 @@ public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior que // queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_multiple_branch_leaf(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_multiple_branch_leaf(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set().Select( // x => new // { @@ -289,10 +267,9 @@ public virtual Task Select_root_duplicated(bool async, QueryTrackingBehavior que #region Subquery [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set() .Select( x => ss.Set() @@ -302,10 +279,9 @@ public virtual Task Select_subquery_required_related_FirstOrDefault(bool async, queryTrackingBehavior: queryTrackingBehavior); [ConditionalTheory] - [MemberData(nameof(AsyncAndTrackingData))] - public virtual Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + [MemberData(nameof(TrackingData))] + public virtual Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) => AssertQuery( - async, ss => ss.Set() .Select( x => ss.Set() @@ -315,10 +291,9 @@ public virtual Task Select_subquery_optional_related_FirstOrDefault(bool async, queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_trunk_FirstOrDefault_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_subquery_root_set_trunk_FirstOrDefault_collection(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .OrderBy(x => x.Id) // .Select( @@ -331,10 +306,9 @@ public virtual Task Select_subquery_optional_related_FirstOrDefault(bool async, // queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_complex_projection_including_references_to_outer_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_subquery_root_set_complex_projection_including_references_to_outer_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .OrderBy(x => x.Id) // .Select( @@ -361,10 +335,9 @@ public virtual Task Select_subquery_optional_related_FirstOrDefault(bool async, // queryTrackingBehavior: queryTrackingBehavior); // [ConditionalTheory] - // [MemberData(nameof(AsyncAndTrackingData))] - // public virtual Task Select_subquery_root_set_complex_projection_FirstOrDefault_project_reference_to_outer(bool async, QueryTrackingBehavior queryTrackingBehavior) + // [MemberData(nameof(TrackingData))] + // public virtual Task Select_subquery_root_set_complex_projection_FirstOrDefault_project_reference_to_outer(QueryTrackingBehavior queryTrackingBehavior) // => AssertQuery( - // async, // ss => ss.Set() // .OrderBy(x => x.Id) // .Select( diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs index 0478c76f103..7ebd34163eb 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs @@ -6,90 +6,67 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships; public abstract class RelationshipsStructuralEqualityTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : RelationshipsQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Two_related(bool async) + [ConditionalFact] + public virtual Task Two_related() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated == e.OptionalRelated), ss => ss.Set().Where(e => e.RequiredRelated.Equals(e.OptionalRelated))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Two_nested(bool async) + [ConditionalFact] + public virtual Task Two_nested() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested == e.OptionalRelated!.RequiredNested), ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Equals(e.OptionalRelated!.RequiredNested))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Not_equals(bool async) + [ConditionalFact] + public virtual Task Not_equals() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated != e.OptionalRelated), ss => ss.Set().Where(e => !e.RequiredRelated.Equals(e.OptionalRelated))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Related_with_inline_null(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.OptionalRelated == null)); + [ConditionalFact] + public virtual Task Related_with_inline_null() + => AssertQuery(ss => ss.Set().Where(e => e.OptionalRelated == null)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Related_with_parameter_null(bool async) + [ConditionalFact] + public virtual async Task Related_with_parameter_null() { RelatedType? related = null; - await AssertQuery( - async, - ss => ss.Set().Where(e => e.OptionalRelated == related)); + await AssertQuery(ss => ss.Set().Where(e => e.OptionalRelated == related)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nested_with_inline_null(bool async) - => AssertQuery( - async, - ss => ss.Set().Where(e => e.RequiredRelated.OptionalNested == null)); + [ConditionalFact] + public virtual Task Nested_with_inline_null() + => AssertQuery(ss => ss.Set().Where(e => e.RequiredRelated.OptionalNested == null)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nested_with_inline(bool async) + [ConditionalFact] + public virtual Task Nested_with_inline() => AssertQuery( - async, ss => ss.Set() .Where(e => e.RequiredRelated.RequiredNested == new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }), ss => ss.Set() .Where(e => e.RequiredRelated.RequiredNested.Equals(new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Nested_with_parameter(bool async) + [ConditionalFact] + public virtual async Task Nested_with_parameter() { var nested = new NestedType { Id = 1000, Name = "Root1_RequiredRelated_RequiredNested", Int = 8, String = "foo" }; await AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested == nested), ss => ss.Set().Where(e => e.RequiredRelated.RequiredNested.Equals(nested))); // TODO: Rewrite equality to Equals for the entire test suite for complex } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Two_nested_collections(bool async) + [ConditionalFact] + public virtual Task Two_nested_collections() => AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection == e.OptionalRelated!.NestedCollection), ss => ss.Set().Where(e => e.OptionalRelated != null && e.RequiredRelated.NestedCollection.SequenceEqual(e.OptionalRelated!.NestedCollection))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nested_collection_with_inline(bool async) + [ConditionalFact] + public virtual Task Nested_collection_with_inline() => AssertQuery( - async, ss => ss.Set() .Where(e => e.RequiredRelated.NestedCollection == new List { @@ -101,11 +78,10 @@ public virtual Task Nested_collection_with_inline(bool async) { new() { Id = 1002, Name = "Root1_RequiredRelated_NestedCollection_1", Int = 8, String = "foo" }, new() { Id = 1003, Name = "Root1_RequiredRelated_NestedCollection_2", Int = 8, String = "foo" } - }))); // TODO: Rewrite equality to Equals for the entire test suite for complex + }))); // TODO: Rewrite equality to Equals for the entire test suite for complex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Nested_collection_with_parameter(bool async) + [ConditionalFact] + public virtual async Task Nested_collection_with_parameter() { var nestedCollection = new List { @@ -114,9 +90,8 @@ public virtual async Task Nested_collection_with_parameter(bool async) }; await AssertQuery( - async, ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection == nestedCollection), - ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection.SequenceEqual(nestedCollection))); // TODO: Rewrite equality to Equals for the entire test suite for complex + ss => ss.Set().Where(e => e.RequiredRelated.NestedCollection.SequenceEqual(nestedCollection))); // TODO: Rewrite equality to Equals for the entire test suite for complex } // TODO: Equality on subquery diff --git a/test/EFCore.Specification.Tests/Query/Translations/ByteArrayTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/ByteArrayTranslationsTestBase.cs index 9a22b69f87b..b60b2494141 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/ByteArrayTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/ByteArrayTranslationsTestBase.cs @@ -8,60 +8,46 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations; public abstract class ByteArrayTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Length(bool async) + [ConditionalFact] + public virtual Task Length() => AssertQuery( - async, ss => ss.Set().Where(e => e.ByteArray.Length == 4)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Index(bool async) + [ConditionalFact] + public virtual Task Index() => AssertQuery( - async, ss => ss.Set().Where(e => e.ByteArray.Length >= 3 && e.ByteArray[2] == 0xBE)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task First(bool async) + [ConditionalFact] + public virtual Task First() => AssertQuery( - async, ss => ss.Set().Where(e => e.ByteArray.Length >= 1 && e.ByteArray.First() == 0xDE)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_with_constant(bool async) + [ConditionalFact] + public virtual Task Contains_with_constant() => AssertQuery( - async, ss => ss.Set().Where(s => s.ByteArray.Contains((byte)1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_with_parameter(bool async) + [ConditionalFact] + public virtual Task Contains_with_parameter() { byte someByte = 1; return AssertQuery( - async, ss => ss.Set().Where(s => s.ByteArray.Contains(someByte))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_with_column(bool async) + [ConditionalFact] + public virtual Task Contains_with_column() => AssertQuery( - async, ss => ss.Set().Where(s => s.ByteArray.Contains(s.Byte))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task SequenceEqual(bool async) + [ConditionalFact] + public virtual Task SequenceEqual() { var byteArrayParam = new byte[] { 0xDE, 0xAD, 0xBE, 0xEF }; return AssertQuery( - async, ss => ss.Set().Where(s => s.ByteArray.SequenceEqual(byteArrayParam))); } } diff --git a/test/EFCore.Specification.Tests/Query/Translations/EnumTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/EnumTranslationsTestBase.cs index 5520689a725..739cc3d4503 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/EnumTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/EnumTranslationsTestBase.cs @@ -10,164 +10,130 @@ public abstract class EnumTranslationsTestBase(TFixture fixture) : Que { #region Equality - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_to_constant(bool async) + [ConditionalFact] + public virtual Task Equality_to_constant() => AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == BasicEnum.One)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_to_parameter(bool async) + [ConditionalFact] + public virtual Task Equality_to_parameter() { var basicEnum = BasicEnum.One; return AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == basicEnum)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_nullable_enum_to_constant(bool async) + [ConditionalFact] + public virtual Task Equality_nullable_enum_to_constant() => AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == BasicEnum.One)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_nullable_enum_to_parameter(bool async) + [ConditionalFact] + public virtual Task Equality_nullable_enum_to_parameter() { var basicEnum = BasicEnum.One; return AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == basicEnum)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_nullable_enum_to_null_constant(bool async) + [ConditionalFact] + public virtual Task Equality_nullable_enum_to_null_constant() => AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == null)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_nullable_enum_to_null_parameter(bool async) + [ConditionalFact] + public virtual Task Equality_nullable_enum_to_null_parameter() { BasicEnum? basicEnum = null; return AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == basicEnum)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equality_nullable_enum_to_nullable_parameter(bool async) + [ConditionalFact] + public virtual Task Equality_nullable_enum_to_nullable_parameter() { BasicEnum? basicEnum = BasicEnum.One; return AssertQuery( - async, ss => ss.Set().Where(b => b.Enum == basicEnum)); } #endregion Equality - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Bitwise_and_enum_constant(bool async) + [ConditionalFact] + public virtual async Task Bitwise_and_enum_constant() { await AssertQuery( - async, ss => ss.Set().Where(g => (g.FlagsEnum & BasicFlagsEnum.One) > 0)); await AssertQuery( - async, ss => ss.Set().Where(g => (g.FlagsEnum & BasicFlagsEnum.One) == BasicFlagsEnum.One)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Bitwise_and_integral_constant(bool async) + [ConditionalFact] + public virtual async Task Bitwise_and_integral_constant() { await AssertQuery( - async, ss => ss.Set().Where(g => ((int)g.FlagsEnum & 8) == 8)); await AssertQuery( - async, ss => ss.Set().Where(g => ((long)g.FlagsEnum & 8L) == 8L)); await AssertQuery( - async, ss => ss.Set().Where(g => ((short)g.FlagsEnum & 8) == 8)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Bitwise_and_nullable_enum_with_constant(bool async) + [ConditionalFact] + public virtual Task Bitwise_and_nullable_enum_with_constant() => AssertQuery( - async, ss => ss.Set().Where(w => (w.FlagsEnum & BasicFlagsEnum.Eight) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_bitwise_and_nullable_enum_with_null_constant(bool async) + [ConditionalFact] + public virtual Task Where_bitwise_and_nullable_enum_with_null_constant() { return AssertQuery( - async, #pragma warning disable CS0458 // The result of the expression is always 'null' ss => ss.Set().Where(w => (w.FlagsEnum & null) > 0), #pragma warning restore CS0458 // The result of the expression is always 'null' assertEmpty: true); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter(bool async) + [ConditionalFact] + public virtual Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter() { var flagsEnum = BasicFlagsEnum.Eight; return AssertQuery( - async, ss => ss.Set().Where(w => (w.FlagsEnum & flagsEnum) > 0)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Where_bitwise_and_nullable_enum_with_nullable_parameter(bool async) + [ConditionalFact] + public virtual async Task Where_bitwise_and_nullable_enum_with_nullable_parameter() { BasicFlagsEnum? flagsEnum = BasicFlagsEnum.Eight; await AssertQuery( - async, ss => ss.Set().Where(w => (w.FlagsEnum & flagsEnum) > 0)); flagsEnum = null; await AssertQuery( - async, ss => ss.Set().Where(w => (w.FlagsEnum & flagsEnum) > 0), assertEmpty: true); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Bitwise_or(bool async) + [ConditionalFact] + public virtual Task Bitwise_or() => AssertQuery( - async, ss => ss.Set().Where(g => (g.FlagsEnum | BasicFlagsEnum.Eight) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Bitwise_projects_values_in_select(bool async) + [ConditionalFact] + public virtual Task Bitwise_projects_values_in_select() => AssertFirst( - async, - ss => ss.Set() + ss => ss.Set() .Where(g => (g.FlagsEnum & BasicFlagsEnum.Eight) == BasicFlagsEnum.Eight) .Select( b => new @@ -178,39 +144,32 @@ public virtual Task Bitwise_projects_values_in_select(bool async) BitwiseValue = b.FlagsEnum & BasicFlagsEnum.Eight })); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task HasFlag(bool async) + [ConditionalFact] + public virtual async Task HasFlag() { // Constant await AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag(BasicFlagsEnum.Eight))); // Expression await AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag(BasicFlagsEnum.Eight | BasicFlagsEnum.Four)), assertEmpty: true); // Casting await AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag((BasicFlagsEnum)8))); // Casting to nullable await AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag((BasicFlagsEnum?)8))); // QuerySource await AssertQuery( - async, ss => ss.Set().Where(b => BasicFlagsEnum.Eight.HasFlag(b.FlagsEnum))); // Project out await AssertFirst( - async, ss => ss.Set() .Where(b => b.FlagsEnum.HasFlag(BasicFlagsEnum.Eight)) .Select( @@ -221,25 +180,21 @@ await AssertFirst( })); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task HasFlag_with_non_nullable_parameter(bool async) + [ConditionalFact] + public virtual Task HasFlag_with_non_nullable_parameter() { var flagsEnum = BasicFlagsEnum.Eight; return AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag(flagsEnum))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task HasFlag_with_nullable_parameter(bool async) + [ConditionalFact] + public virtual Task HasFlag_with_nullable_parameter() { BasicFlagsEnum? flagsEnum = BasicFlagsEnum.Eight; return AssertQuery( - async, ss => ss.Set().Where(b => b.FlagsEnum.HasFlag(flagsEnum))); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/GuidTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/GuidTranslationsTestBase.cs index 2928274cc15..96af0d0e01a 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/GuidTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/GuidTranslationsTestBase.cs @@ -8,37 +8,28 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations; public abstract class GuidTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task New_with_constant(bool async) + [ConditionalFact] + public virtual Task New_with_constant() => AssertQuery( - async, ss => ss.Set().Where(b => b.Guid == new Guid("DF36F493-463F-4123-83F9-6B135DEEB7BA"))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task New_with_parameter(bool async) + [ConditionalFact] + public virtual async Task New_with_parameter() { var guid = "DF36F493-463F-4123-83F9-6B135DEEB7BA"; await AssertQuery( - async, ss => ss.Set().Where(b => b.Guid == new Guid(guid))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToString_projection(bool async) + [ConditionalFact] + public virtual Task ToString_projection() => AssertQuery( - async, ss => ss.Set().Select(b => b.Guid.ToString()), elementAsserter: (e, a) => Assert.Equal(e.ToLower(), a.ToLower())); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task NewGuid(bool async) + [ConditionalFact] + public virtual Task NewGuid() => AssertQuery( - async, - ss => ss.Set() - .Where(od => Guid.NewGuid() != default)); + ss => ss.Set().Where(od => Guid.NewGuid() != default)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/MathTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/MathTranslationsTestBase.cs index 9616ba4113f..da27a749d15 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/MathTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/MathTranslationsTestBase.cs @@ -8,201 +8,149 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations; public abstract class MathTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Abs_decimal(bool async) + [ConditionalFact] + public virtual Task Abs_decimal() => AssertQuery( - async, ss => ss.Set().Where(od => Math.Abs(od.Decimal) == 9.5m)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Abs_int(bool async) + [ConditionalFact] + public virtual Task Abs_int() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Abs(b.Int) == 9)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Abs_double(bool async) + [ConditionalFact] + public virtual Task Abs_double() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Abs(b.Double) == 9.5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Abs_float(bool async) + [ConditionalFact] + public virtual Task Abs_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Abs(b.Float) == 9.5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Ceiling(bool async) + [ConditionalFact] + public virtual Task Ceiling() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Ceiling(b.Double) == 9)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Ceiling_float(bool async) + [ConditionalFact] + public virtual Task Ceiling_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Ceiling(b.Float) == 9)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Floor_decimal(bool async) + [ConditionalFact] + public virtual Task Floor_decimal() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Floor(b.Decimal) == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Floor_double(bool async) + [ConditionalFact] + public virtual Task Floor_double() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Floor(b.Double) == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Floor_float(bool async) + [ConditionalFact] + public virtual Task Floor_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Floor(b.Float) == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Exp(bool async) + [ConditionalFact] + public virtual Task Exp() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Exp(b.Double) > 1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Exp_float(bool async) + [ConditionalFact] + public virtual Task Exp_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Exp(b.Float) > 1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Power(bool async) + [ConditionalFact] + public virtual Task Power() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Pow(b.Int, 2) == 64)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Power_float(bool async) + [ConditionalFact] + public virtual Task Power_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Pow(b.Float, 2) > 73 && MathF.Pow(b.Float, 2) < 74)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Round_decimal(bool async) + [ConditionalFact] + public virtual async Task Round_decimal() { await AssertQuery( - async, ss => ss.Set().Where(b => Math.Round(b.Decimal) == 9)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => Math.Round(b.Decimal))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Round_double(bool async) + [ConditionalFact] + public virtual async Task Round_double() { await AssertQuery( - async, ss => ss.Set().Where(b => Math.Round(b.Double) == 9)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => Math.Round(b.Double))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Round_float(bool async) + [ConditionalFact] + public virtual async Task Round_float() { await AssertQuery( - async, ss => ss.Set().Where(b => MathF.Round(b.Float) == 9)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => MathF.Round(b.Float))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Round_with_digits_decimal(bool async) + [ConditionalFact] + public virtual Task Round_with_digits_decimal() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Round(b.Decimal, 1) == 255.1m)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Round_with_digits_double(bool async) + [ConditionalFact] + public virtual Task Round_with_digits_double() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Round(b.Double, 1) == 255.1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Round_with_digits_float(bool async) + [ConditionalFact] + public virtual Task Round_with_digits_float() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Round(b.Float, 1) == 255.1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Truncate_decimal(bool async) + [ConditionalFact] + public virtual async Task Truncate_decimal() { await AssertQuery( - async, ss => ss.Set().Where(b => Math.Truncate(b.Decimal) == 8)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => Math.Truncate(b.Decimal))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Truncate_double(bool async) + [ConditionalFact] + public virtual async Task Truncate_double() { await AssertQuery( - async, ss => ss.Set().Where(b => Math.Truncate(b.Double) == 8)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => Math.Truncate(b.Double))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Truncate_float(bool async) + [ConditionalFact] + public virtual async Task Truncate_float() { await AssertQuery( - async, ss => ss.Set().Where(b => MathF.Truncate(b.Float) == 8)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => MathF.Truncate(b.Float))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Truncate_project_and_order_by_it_twice(bool async) + [ConditionalFact] + public virtual Task Truncate_project_and_order_by_it_twice() => AssertQuery( - async, ss => ss.Set() .Select(b => new { A = Math.Truncate(b.Double) }) .OrderBy(r => r.A) @@ -210,11 +158,9 @@ public virtual Task Truncate_project_and_order_by_it_twice(bool async) .OrderBy(r => r.A), assertOrder: true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Truncate_project_and_order_by_it_twice2(bool async) + [ConditionalFact] + public virtual Task Truncate_project_and_order_by_it_twice2() => AssertQuery( - async, ss => ss.Set() .Select(b => new { A = Math.Truncate(b.Double) }) .OrderBy(r => r.A) @@ -222,310 +168,226 @@ public virtual Task Truncate_project_and_order_by_it_twice2(bool async) .OrderByDescending(r => r.A), assertOrder: true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Truncate_project_and_order_by_it_twice3(bool async) + [ConditionalFact] + public virtual Task Truncate_project_and_order_by_it_twice3() => AssertQuery( - async, ss => ss.Set() .Select(b => new { A = Math.Truncate(b.Double) }) .OrderByDescending(r => r.A) .ThenBy(r => r.A), assertOrder: true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log(bool async) + [ConditionalFact] + public virtual Task Log() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double > 0 && Math.Log(b.Double) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log_float(bool async) + [ConditionalFact] + public virtual Task Log_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float > 0 && MathF.Log(b.Float) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log_with_newBase(bool async) + [ConditionalFact] + public virtual Task Log_with_newBase() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double > 0 && Math.Log(b.Double, 7) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log_with_newBase_float(bool async) + [ConditionalFact] + public virtual Task Log_with_newBase_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float > 0 && MathF.Log(b.Float, 7) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log10(bool async) + [ConditionalFact] + public virtual Task Log10() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double > 0 && Math.Log10(b.Double) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log10_float(bool async) + [ConditionalFact] + public virtual Task Log10_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float > 0 && MathF.Log10(b.Float) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Log2(bool async) + [ConditionalFact] + public virtual Task Log2() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double > 0 && Math.Log2(b.Double) != 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sqrt(bool async) + [ConditionalFact] + public virtual Task Sqrt() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double > 0 && Math.Sqrt(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sqrt_float(bool async) + [ConditionalFact] + public virtual Task Sqrt_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float > 0 && MathF.Sqrt(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sign(bool async) + [ConditionalFact] + public virtual Task Sign() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Sign(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sign_float(bool async) + [ConditionalFact] + public virtual Task Sign_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Sign(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Max(bool async) + [ConditionalFact] + public virtual Task Max() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Max(b.Int, b.Short - 3) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Max_nested(bool async) + [ConditionalFact] + public virtual Task Max_nested() => AssertQuery( - async, ss => ss.Set() .Where(b => Math.Max(b.Short - 3, Math.Max(b.Int, 1)) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Max_nested_twice(bool async) + [ConditionalFact] + public virtual Task Max_nested_twice() => AssertQuery( - async, ss => ss.Set() .Where(b => Math.Max(Math.Max(1, Math.Max(b.Int, 2)), b.Short - 3) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Min(bool async) + [ConditionalFact] + public virtual Task Min() => AssertQuery( - async, ss => ss.Set() .Where(b => Math.Min(b.Int, b.Short + 3) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Min_nested(bool async) + [ConditionalFact] + public virtual Task Min_nested() => AssertQuery( - async, ss => ss.Set() .Where(b => Math.Min(b.Short + 3, Math.Min(b.Int, 99999)) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Min_nested_twice(bool async) + [ConditionalFact] + public virtual Task Min_nested_twice() => AssertQuery( - async, ss => ss.Set() .Where(b => Math.Min(Math.Min(99999, Math.Min(b.Int, 99998)), b.Short + 3) == b.Int)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Degrees(bool async) + [ConditionalFact] + public virtual Task Degrees() => AssertQuery( - async, ss => ss.Set().Where(b => double.RadiansToDegrees(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Degrees_float(bool async) + [ConditionalFact] + public virtual Task Degrees_float() => AssertQuery( - async, ss => ss.Set().Where(b => float.RadiansToDegrees(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Radians(bool async) + [ConditionalFact] + public virtual Task Radians() => AssertQuery( - async, ss => ss.Set().Where(b => double.DegreesToRadians(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Radians_float(bool async) + [ConditionalFact] + public virtual Task Radians_float() => AssertQuery( - async, ss => ss.Set().Where(b => float.DegreesToRadians(b.Float) > 0)); #region Trigonometry - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Acos(bool async) + [ConditionalFact] + public virtual Task Acos() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double >= -1 && b.Double <= 1 && Math.Acos(b.Double) > 1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Acos_float(bool async) + [ConditionalFact] + public virtual Task Acos_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float >= -1 && b.Float <= 1 && MathF.Acos(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Acosh(bool async) + [ConditionalFact] + public virtual Task Acosh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Acosh(b.Double + 1) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Asin(bool async) + [ConditionalFact] + public virtual Task Asin() => AssertQuery( - async, ss => ss.Set().Where(b => b.Double >= -1 && b.Double <= 1 && Math.Asin(b.Double) > double.MinValue)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Asin_float(bool async) + [ConditionalFact] + public virtual Task Asin_float() => AssertQuery( - async, ss => ss.Set().Where(b => b.Float >= -1 && b.Float <= 1 && MathF.Asin(b.Float) > double.MinValue)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Asinh(bool async) + [ConditionalFact] + public virtual Task Asinh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Asinh(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Atan(bool async) + [ConditionalFact] + public virtual Task Atan() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Atan(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Atan_float(bool async) + [ConditionalFact] + public virtual Task Atan_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Atan(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Atanh(bool async) + [ConditionalFact] + public virtual Task Atanh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Atanh(b.Double) > double.MinValue)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Atan2(bool async) + [ConditionalFact] + public virtual Task Atan2() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Atan2(b.Double, 1) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Atan2_float(bool async) + [ConditionalFact] + public virtual Task Atan2_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Atan2(b.Float, 1) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Cos(bool async) + [ConditionalFact] + public virtual Task Cos() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Cos(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Cos_float(bool async) + [ConditionalFact] + public virtual Task Cos_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Cos(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Cosh(bool async) + [ConditionalFact] + public virtual Task Cosh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Cosh(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sin(bool async) + [ConditionalFact] + public virtual Task Sin() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Sin(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sin_float(bool async) + [ConditionalFact] + public virtual Task Sin_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Sin(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Sinh(bool async) + [ConditionalFact] + public virtual Task Sinh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Sinh(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Tan(bool async) + [ConditionalFact] + public virtual Task Tan() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Tan(b.Double) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Tan_float(bool async) + [ConditionalFact] + public virtual Task Tan_float() => AssertQuery( - async, ss => ss.Set().Where(b => MathF.Tan(b.Float) > 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Tanh(bool async) + [ConditionalFact] + public virtual Task Tanh() => AssertQuery( - async, ss => ss.Set().Where(b => Math.Tanh(b.Double) > 0)); #endregion Trigonometry diff --git a/test/EFCore.Specification.Tests/Query/Translations/MiscellaneousTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/MiscellaneousTranslationsTestBase.cs index 912332156ce..d9ee8660f2a 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/MiscellaneousTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/MiscellaneousTranslationsTestBase.cs @@ -10,66 +10,51 @@ public abstract class MiscellaneousTranslationsTestBase(TFixture fixtu { #region Random - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_on_EF_Functions(bool async) + [ConditionalFact] + public virtual Task Random_on_EF_Functions() => AssertCount( - async, ss => ss.Set(), ss => ss.Set(), ss => EF.Functions.Random() >= 0 && EF.Functions.Random() < 1, c => true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_Shared_Next_with_no_args(bool async) + [ConditionalFact] + public virtual Task Random_Shared_Next_with_no_args() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int < (Random.Shared.Next() - 2147483647)), assertEmpty: true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_Shared_Next_with_one_arg(bool async) + [ConditionalFact] + public virtual Task Random_Shared_Next_with_one_arg() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int > Random.Shared.Next(5) - 2147483647)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_Shared_Next_with_two_args(bool async) + [ConditionalFact] + public virtual Task Random_Shared_Next_with_two_args() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int > Random.Shared.Next(0, 10) - 2147483647)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_new_Next_with_no_args(bool async) + [ConditionalFact] + public virtual Task Random_new_Next_with_no_args() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int > new Random(15).Next() - 2147483647)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_new_Next_with_one_arg(bool async) + [ConditionalFact] + public virtual Task Random_new_Next_with_one_arg() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int > new Random(15).Next(5) - 2147483647)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Random_new_Next_with_two_args(bool async) + [ConditionalFact] + public virtual Task Random_new_Next_with_two_args() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int > new Random(15).Next(0, 10) - 2147483647)); #endregion Random #region Convert - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToBoolean(bool async) + [ConditionalFact] + public virtual async Task Convert_ToBoolean() { var convertMethods = new List>> { @@ -86,13 +71,12 @@ public virtual async Task Convert_ToBoolean(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToByte(bool async) + [ConditionalFact] + public virtual async Task Convert_ToByte() { var convertMethods = new List>> { @@ -110,13 +94,12 @@ public virtual async Task Convert_ToByte(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToDecimal(bool async) + [ConditionalFact] + public virtual async Task Convert_ToDecimal() { var convertMethods = new List>> { @@ -134,13 +117,12 @@ public virtual async Task Convert_ToDecimal(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToDouble(bool async) + [ConditionalFact] + public virtual async Task Convert_ToDouble() { var convertMethods = new List>> { @@ -158,13 +140,12 @@ public virtual async Task Convert_ToDouble(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToInt16(bool async) + [ConditionalFact] + public virtual async Task Convert_ToInt16() { var convertMethods = new List>> { @@ -182,13 +163,12 @@ public virtual async Task Convert_ToInt16(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToInt32(bool async) + [ConditionalFact] + public virtual async Task Convert_ToInt32() { var convertMethods = new List>> { @@ -206,13 +186,12 @@ public virtual async Task Convert_ToInt32(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToInt64(bool async) + [ConditionalFact] + public virtual async Task Convert_ToInt64() { var convertMethods = new List>> { @@ -230,13 +209,12 @@ public virtual async Task Convert_ToInt64(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Convert_ToString(bool async) + [ConditionalFact] + public virtual async Task Convert_ToString() { // Actual convert-to-string behavior varies across databases for most types and cannot be asserted upon here // (e.g. boolean converts to 1/0 on SQL Server, true/false on PG). @@ -257,7 +235,7 @@ public virtual async Task Convert_ToString(bool async) foreach (var convertMethod in convertMethods) { - await AssertQuery(async, ss => ss.Set().Where(convertMethod)); + await AssertQuery(ss => ss.Set().Where(convertMethod)); } } @@ -265,159 +243,124 @@ public virtual async Task Convert_ToString(bool async) #region Compare - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Int_Compare_to_simple_zero(bool async) + [ConditionalFact] + public virtual async Task Int_Compare_to_simple_zero() { var orderId = 8; await AssertQuery( - async, ss => ss.Set().Where(c => c.Int.CompareTo(orderId) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != c.Int.CompareTo(orderId))); await AssertQuery( - async, ss => ss.Set().Where(c => c.Int.CompareTo(orderId) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= c.Int.CompareTo(orderId))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < c.Int.CompareTo(orderId))); await AssertQuery( - async, ss => ss.Set().Where(c => c.Int.CompareTo(orderId) <= 0)); } [ConditionalTheory] - [InlineData(false, false)] - [InlineData(true, false)] - [InlineData(false, true)] - [InlineData(true, true)] - public virtual async Task DateTime_Compare_to_simple_zero(bool async, bool compareTo) + [InlineData(false)] + [InlineData(true)] + public virtual async Task DateTime_Compare_to_simple_zero(bool compareTo) { var dateTime = new DateTime(1998, 5, 4, 15, 30, 10); if (compareTo) { await AssertQuery( - async, ss => ss.Set().Where(c => c.DateTime.CompareTo(dateTime) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != c.DateTime.CompareTo(dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => c.DateTime.CompareTo(dateTime) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= c.DateTime.CompareTo(dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < c.DateTime.CompareTo(dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => c.DateTime.CompareTo(dateTime) <= 0)); } else { await AssertQuery( - async, ss => ss.Set().Where(c => DateTime.Compare(c.DateTime, dateTime) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != DateTime.Compare(c.DateTime, dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => DateTime.Compare(c.DateTime, dateTime) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= DateTime.Compare(c.DateTime, dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < DateTime.Compare(c.DateTime, dateTime))); await AssertQuery( - async, ss => ss.Set().Where(c => DateTime.Compare(c.DateTime, dateTime) <= 0)); } } [ConditionalTheory] - [InlineData(false, false)] - [InlineData(true, false)] - [InlineData(false, true)] - [InlineData(true, true)] - public virtual async Task TimeSpan_Compare_to_simple_zero(bool async, bool compareTo) + [InlineData(false)] + [InlineData(true)] + public virtual async Task TimeSpan_Compare_to_simple_zero(bool compareTo) { var timeSpan = new TimeSpan(1, 2, 3); if (compareTo) { await AssertQuery( - async, ss => ss.Set().Where(c => c.TimeSpan.CompareTo(timeSpan) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != c.TimeSpan.CompareTo(timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => c.TimeSpan.CompareTo(timeSpan) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= c.TimeSpan.CompareTo(timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < c.TimeSpan.CompareTo(timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => c.TimeSpan.CompareTo(timeSpan) <= 0)); } else { await AssertQuery( - async, ss => ss.Set().Where(c => TimeSpan.Compare(c.TimeSpan, timeSpan) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != TimeSpan.Compare(c.TimeSpan, timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => TimeSpan.Compare(c.TimeSpan, timeSpan) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= TimeSpan.Compare(c.TimeSpan, timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < TimeSpan.Compare(c.TimeSpan, timeSpan))); await AssertQuery( - async, ss => ss.Set().Where(c => TimeSpan.Compare(c.TimeSpan, timeSpan) <= 0)); } } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Operators/ArithmeticOperatorTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Operators/ArithmeticOperatorTranslationsTestBase.cs index 8a89e3feae0..a099eed2d28 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Operators/ArithmeticOperatorTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Operators/ArithmeticOperatorTranslationsTestBase.cs @@ -8,38 +8,28 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Operators; public abstract class ArithmeticOperatorTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Add(bool async) + [ConditionalFact] + public virtual async Task Add() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int + 2 == 10)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Subtract(bool async) + [ConditionalFact] + public virtual async Task Subtract() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int - 3 == 5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Multiply(bool async) + [ConditionalFact] + public virtual async Task Multiply() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int * 2 == 16)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Modulo(bool async) + [ConditionalFact] + public virtual async Task Modulo() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int % 3 == 2)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Minus(bool async) + [ConditionalFact] + public virtual async Task Minus() => await AssertQuery( - async, ss => ss.Set().Where(b => -b.Int == -8)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Operators/BitwiseOperatorTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Operators/BitwiseOperatorTranslationsTestBase.cs index d385251eb7e..09fb71ec2fc 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Operators/BitwiseOperatorTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Operators/BitwiseOperatorTranslationsTestBase.cs @@ -10,138 +10,103 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Operators; public abstract class BitwiseOperatorTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Or(bool async) + [ConditionalFact] + public virtual async Task Or() { await AssertQuery( - async, ss => ss.Set().Where(b => (b.Int | b.Long) == 7)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.Int | b.Long)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Or_over_boolean(bool async) + [ConditionalFact] + public virtual async Task Or_over_boolean() { await AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 12 | b.String == "Seattle")); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.Int == 12 | b.String == "Seattle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Or_multiple(bool async) + [ConditionalFact] + public virtual Task Or_multiple() => AssertQuery( - async, ss => ss.Set().Where(b => (b.Int | b.Short | b.Long) == 7)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task And(bool async) + [ConditionalFact] + public virtual async Task And() { await AssertQuery( - async, ss => ss.Set().Where(b => (b.Int & b.Short) == 2)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.Int & b.Short)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task And_over_boolean(bool async) + [ConditionalFact] + public virtual async Task And_over_boolean() { await AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 8 & b.String == "Seattle")); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.Int == 8 & b.String == "Seattle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Xor(bool async) + [ConditionalFact] + public virtual async Task Xor() { await AssertQuery( - async, ss => ss.Set().Where(b => (b.Int ^ b.Short) == 1)); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.Int ^ b.Short)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Xor_over_boolean(bool async) + [ConditionalFact] + public virtual Task Xor_over_boolean() => AssertQuery( - async, ss => ss.Set().Where(b => (b.Int == b.Short) ^ (b.String == "Seattle"))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Complement(bool async) + [ConditionalFact] + public virtual Task Complement() => AssertQuery( - async, ss => ss.Set().Where(b => ~b.Int == -9)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task And_or_over_boolean(bool async) + [ConditionalFact] + public virtual Task And_or_over_boolean() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 12 & b.Short == 12 | b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Or_with_logical_or(bool async) + [ConditionalFact] + public virtual Task Or_with_logical_or() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 12 | b.Short == 12 || b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task And_with_logical_and(bool async) + [ConditionalFact] + public virtual Task And_with_logical_and() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 8 & b.Short == 8 && b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Or_with_logical_and(bool async) + [ConditionalFact] + public virtual Task Or_with_logical_and() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 8 | b.Short == 9 && b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task And_with_logical_or(bool async) + [ConditionalFact] + public virtual Task And_with_logical_or() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 12 & b.Short == 12 || b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Left_shift(bool async) + [ConditionalFact] + public virtual Task Left_shift() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int << 1 == 16)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Right_shift(bool async) + [ConditionalFact] + public virtual Task Right_shift() => AssertQuery( - async, ss => ss.Set().Where(b => b.Int >> 1 == 4)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Operators/ComparisonOperatorTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Operators/ComparisonOperatorTranslationsTestBase.cs index 2c2217fecc6..1889657cffb 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Operators/ComparisonOperatorTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Operators/ComparisonOperatorTranslationsTestBase.cs @@ -8,45 +8,33 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Operators; public abstract class ComparisonOperatorTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Equal(bool async) + [ConditionalFact] + public virtual async Task Equal() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task NotEqual(bool async) + [ConditionalFact] + public virtual async Task NotEqual() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int != 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task GreaterThan(bool async) + [ConditionalFact] + public virtual async Task GreaterThan() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int > 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task GreaterThanOrEqual(bool async) + [ConditionalFact] + public virtual async Task GreaterThanOrEqual() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int >= 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task LessThan(bool async) + [ConditionalFact] + public virtual async Task LessThan() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int < 8)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task LessThanOrEqual(bool async) + [ConditionalFact] + public virtual async Task LessThanOrEqual() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int <= 8)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Operators/LogicalOperatorTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Operators/LogicalOperatorTranslationsTestBase.cs index f29ecf978db..a79f8855900 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Operators/LogicalOperatorTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Operators/LogicalOperatorTranslationsTestBase.cs @@ -8,47 +8,35 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Operators; public abstract class LogicalOperatorTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task And(bool async) + [ConditionalFact] + public virtual async Task And() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 8 && b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task And_with_bool_property(bool async) + [ConditionalFact] + public virtual async Task And_with_bool_property() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Bool && b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Or(bool async) + [ConditionalFact] + public virtual async Task Or() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Int == 999 || b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Or_with_bool_property(bool async) + [ConditionalFact] + public virtual async Task Or_with_bool_property() => await AssertQuery( - async, ss => ss.Set().Where(b => b.Bool || b.String == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Not(bool async) + [ConditionalFact] + public virtual async Task Not() => await AssertQuery( - async, // ReSharper disable once NegativeEqualityExpression ss => ss.Set().Where(b => !(b.Int == 999))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Not_with_bool_property(bool async) + [ConditionalFact] + public virtual async Task Not_with_bool_property() => await AssertQuery( - async, // ReSharper disable once NegativeEqualityExpression ss => ss.Set().Where(b => !b.Bool)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Operators/MiscellaneousOperatorTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Operators/MiscellaneousOperatorTranslationsTestBase.cs index a3e20dd93b7..6bd545d6633 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Operators/MiscellaneousOperatorTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Operators/MiscellaneousOperatorTranslationsTestBase.cs @@ -8,17 +8,13 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Operators; public abstract class MiscellaneousOperatorTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Conditional(bool async) + [ConditionalFact] + public virtual async Task Conditional() => await AssertQuery( - async, ss => ss.Set().Where(b => (b.Int == 8 ? b.String : "Foo") == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Coalesce(bool async) + [ConditionalFact] + public virtual async Task Coalesce() => await AssertQuery( - async, ss => ss.Set().Where(b => (b.String ?? "Unknown") == "Seattle")); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs index 3700cc87128..e4ce7f25a99 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs @@ -17,94 +17,72 @@ public abstract class StringTranslationsTestBase(TFixture fixture) : Q #region Equals - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equals(bool async) + [ConditionalFact] + public virtual Task Equals() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Equals("Seattle"))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.Equals("seattle")), ss => ss.Set().Where(b => b.String.Equals("seattle", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equals_with_OrdinalIgnoreCase(bool async) + [ConditionalFact] + public virtual Task Equals_with_OrdinalIgnoreCase() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Equals("seattle", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Equals_with_Ordinal(bool async) + [ConditionalFact] + public virtual Task Equals_with_Ordinal() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Equals("Seattle", StringComparison.Ordinal))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Static_Equals(bool async) + [ConditionalFact] + public virtual Task Static_Equals() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => string.Equals(b.String, "Seattle"))) : AssertQuery( - async, ss => ss.Set().Where(b => string.Equals(b.String, "seattle")), ss => ss.Set().Where(b => string.Equals(b.String, "seattle", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Static_Equals_with_OrdinalIgnoreCase(bool async) + [ConditionalFact] + public virtual Task Static_Equals_with_OrdinalIgnoreCase() => AssertQuery( - async, ss => ss.Set().Where(b => string.Equals(b.String, "seattle", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Static_Equals_with_Ordinal(bool async) + [ConditionalFact] + public virtual Task Static_Equals_with_Ordinal() => AssertQuery( - async, ss => ss.Set().Where(b => string.Equals(b.String, "Seattle", StringComparison.Ordinal))); #endregion Equals #region Miscellaneous - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Length(bool async) + [ConditionalFact] + public virtual Task Length() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length == 7)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task ToUpper(bool async) + [ConditionalFact] + public virtual async Task ToUpper() { // Note that if the database is case-insensitive, the Where() assertion checks nothing. await AssertQuery( - async, ss => ss.Set().Where(b => b.String.ToUpper() == "SEATTLE")); await AssertQuery( - async, ss => ss.Set().Select(b => b.String.ToUpper())); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task ToLower(bool async) + [ConditionalFact] + public virtual async Task ToLower() { // Note that if the database is case-insensitive, the Where() assertion checks nothing. await AssertQuery( - async, ss => ss.Set().Where(b => b.String.ToLower() == "seattle")); await AssertQuery( - async, ss => ss.Set().Select(b => b.String.ToLower())); } @@ -112,47 +90,37 @@ await AssertQuery( #region IndexOf - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf(bool async) + [ConditionalFact] + public virtual Task IndexOf() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf("eattl") != -1)) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf("Eattl") != -1), ss => ss.Set().Where(b => b.String.IndexOf("Eattl", StringComparison.OrdinalIgnoreCase) != -1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_Char(bool async) + [ConditionalFact] + public virtual Task IndexOf_Char() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf('e') != -1)) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf('e') != -1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_empty_string(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_empty_string() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf(string.Empty) == 0), ss => ss.Set().Where(b => b.String != null && b.String.IndexOf(string.Empty) == 0)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_one_parameter_arg(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_one_parameter_arg() { if (IsCaseSensitive) { var pattern = "eattl"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf(pattern) == 1)); } else @@ -160,22 +128,19 @@ public virtual Task IndexOf_with_one_parameter_arg(bool async) var pattern = "Eattl"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf(pattern) == 1), ss => ss.Set().Where(b => b.String.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) == 1)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_one_parameter_arg_char(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_one_parameter_arg_char() { if (IsCaseSensitive) { var pattern = 'e'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf(pattern) == 1)); } else @@ -183,39 +148,31 @@ public virtual Task IndexOf_with_one_parameter_arg_char(bool async) var pattern = 'e'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.IndexOf(pattern) == 1), ss => ss.Set().Where(b => b.String.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) == 1)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_constant_starting_position(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_constant_starting_position() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length > 2 && b.String.IndexOf("e", 2) == 6)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_constant_starting_position_char(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_constant_starting_position_char() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length > 2 && b.String.IndexOf('e', 2) == 6)); #pragma warning disable CA1866 // Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_parameter_starting_position(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_parameter_starting_position() { var start = 2; return IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length > 2 && b.String.IndexOf("e", start) == 6)) : AssertQuery( - async, ss => ss.Set().Where( b => b.String.Length > 2 && b.String.IndexOf("E", start) == 6), ss => ss.Set().Where( @@ -223,73 +180,57 @@ public virtual Task IndexOf_with_parameter_starting_position(bool async) } #pragma warning restore CA1866 - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_with_parameter_starting_position_char(bool async) + [ConditionalFact] + public virtual Task IndexOf_with_parameter_starting_position_char() { var start = 2; return IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length > 2 && b.String.IndexOf('e', start) == 6)) : AssertQuery( - async, ss => ss.Set().Where( b => b.String.Length > 2 && b.String.IndexOf('e', start) == 6)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_after_ToString(bool async) + [ConditionalFact] + public virtual Task IndexOf_after_ToString() => AssertQuery( - async, ss => ss.Set().Where(x => x.Int.ToString().IndexOf("55") == 1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IndexOf_over_ToString(bool async) + [ConditionalFact] + public virtual Task IndexOf_over_ToString() => AssertQuery( - async, ss => ss.Set().Where(x => "12559".IndexOf(x.Int.ToString()) == 1)); #endregion IndexOf #region Replace - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Replace(bool async) + [ConditionalFact] + public virtual Task Replace() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Replace("Sea", "Rea") == "Reattle")) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.Replace("sea", "rea") == "reattle"), ss => ss.Set().Where(b => b.String.Replace("sea", "rea", StringComparison.OrdinalIgnoreCase) == "reattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Replace_Char(bool async) + [ConditionalFact] + public virtual Task Replace_Char() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Replace('S', 'R') == "Reattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Replace_with_empty_string(bool async) + [ConditionalFact] + public virtual Task Replace_with_empty_string() => AssertQuery( - async, ss => ss .Set() .Where(c => c.String != "" && c.String.Replace(c.String, string.Empty) == "")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Replace_using_property_arguments(bool async) + [ConditionalFact] + public virtual Task Replace_using_property_arguments() => AssertQuery( - async, ss => ss .Set() .Where(c => c.String != "" && c.String.Replace(c.String, c.Int.ToString()) == c.Int.ToString())); @@ -298,68 +239,52 @@ public virtual Task Replace_using_property_arguments(bool async) #region Substring - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring(bool async) + [ConditionalFact] + public virtual Task Substring() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 3 && b.String.Substring(1, 2) == "ea")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_one_arg_with_zero_startIndex(bool async) + [ConditionalFact] + public virtual Task Substring_with_one_arg_with_zero_startIndex() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Substring(0) == "Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_one_arg_with_constant(bool async) + [ConditionalFact] + public virtual Task Substring_with_one_arg_with_constant() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 1 && b.String.Substring(1) == "eattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_one_arg_with_parameter(bool async) + [ConditionalFact] + public virtual Task Substring_with_one_arg_with_parameter() { var start = 2; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 2 && b.String.Substring(start) == "attle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_two_args_with_zero_startIndex(bool async) + [ConditionalFact] + public virtual Task Substring_with_two_args_with_zero_startIndex() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 3 && b.String.Substring(0, 3) == "Sea")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_two_args_with_zero_length(bool async) + [ConditionalFact] + public virtual Task Substring_with_two_args_with_zero_length() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 2 && b.String.Substring(2, 0) == "")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_two_args_with_parameter(bool async) + [ConditionalFact] + public virtual Task Substring_with_two_args_with_parameter() { var start = 2; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.Length >= 5 && b.String.Substring(start, 3) == "att")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Substring_with_two_args_with_IndexOf(bool async) + [ConditionalFact] + public virtual Task Substring_with_two_args_with_IndexOf() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains("a") && c.String.Substring(c.String.IndexOf("a"), 3) == "att")); @@ -367,77 +292,61 @@ public virtual Task Substring_with_two_args_with_IndexOf(bool async) #region IsNullOrEmpty/Whitespace - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task IsNullOrEmpty(bool async) + [ConditionalFact] + public virtual async Task IsNullOrEmpty() { await AssertQuery( - async, ss => ss.Set().Where(n => string.IsNullOrEmpty(n.String))); await AssertQueryScalar( - async, ss => ss.Set().Select(n => string.IsNullOrEmpty(n.String))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task IsNullOrEmpty_negated(bool async) + [ConditionalFact] + public virtual async Task IsNullOrEmpty_negated() { await AssertQuery( - async, ss => ss.Set().Where(n => !string.IsNullOrEmpty(n.String))); await AssertQuery( - async, ss => ss.Set().Select(n => !string.IsNullOrEmpty(n.String))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IsNullOrWhiteSpace(bool async) + [ConditionalFact] + public virtual Task IsNullOrWhiteSpace() => AssertQuery( - async, ss => ss.Set().Where(c => string.IsNullOrWhiteSpace(c.String))); #endregion IsNullOrEmpty/Whitespace #region StartsWith - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_Literal(bool async) + [ConditionalFact] + public virtual Task StartsWith_Literal() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith("Se"))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith("se")), ss => ss.Set().Where(b => b.String.StartsWith("se", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_Literal_Char(bool async) + [ConditionalFact] + public virtual Task StartsWith_Literal_Char() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith('S'))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith('S')), ss => ss.Set().Where(b => b.String.StartsWith('S'))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_Parameter(bool async) + [ConditionalFact] + public virtual Task StartsWith_Parameter() { if (IsCaseSensitive) { var pattern = "Se"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith(pattern))); } else @@ -445,22 +354,19 @@ public virtual Task StartsWith_Parameter(bool async) var pattern = "se"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith(pattern)), ss => ss.Set().Where(b => b.String.StartsWith(pattern, StringComparison.OrdinalIgnoreCase))); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_Parameter_Char(bool async) + [ConditionalFact] + public virtual Task StartsWith_Parameter_Char() { if (IsCaseSensitive) { var pattern = 'S'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith(pattern))); } else @@ -468,99 +374,79 @@ public virtual Task StartsWith_Parameter_Char(bool async) var pattern = 'S'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith(pattern)), ss => ss.Set().Where(b => b.String.StartsWith(pattern))); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_Column(bool async) + [ConditionalFact] + public virtual Task StartsWith_Column() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith(b.String))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_with_StringComparison_Ordinal(bool async) + [ConditionalFact] + public virtual Task StartsWith_with_StringComparison_Ordinal() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.Ordinal))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task StartsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + [ConditionalFact] + public virtual Task StartsWith_with_StringComparison_OrdinalIgnoreCase() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task StartsWith_with_StringComparison_unsupported(bool async) + [ConditionalFact] + public virtual async Task StartsWith_with_StringComparison_unsupported() { await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.CurrentCulture)))); + ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.CurrentCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.CurrentCultureIgnoreCase)))); + ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.CurrentCultureIgnoreCase)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.InvariantCulture)))); + ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.InvariantCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.InvariantCultureIgnoreCase)))); + ss => ss.Set().Where(b => b.String.StartsWith("Se", StringComparison.InvariantCultureIgnoreCase)))); } #endregion StartsWith #region EndsWith - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_Literal(bool async) + [ConditionalFact] + public virtual Task EndsWith_Literal() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith("le"))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith("Le")), ss => ss.Set().Where(b => b.String.EndsWith("Le", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_Literal_Char(bool async) + [ConditionalFact] + public virtual Task EndsWith_Literal_Char() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith('e'))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith('e'))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_Parameter(bool async) + [ConditionalFact] + public virtual Task EndsWith_Parameter() { if (IsCaseSensitive) { var pattern = "le"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith(pattern))); } else @@ -568,22 +454,19 @@ public virtual Task EndsWith_Parameter(bool async) var pattern = "LE"; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith(pattern)), ss => ss.Set().Where(b => b.String.EndsWith(pattern, StringComparison.OrdinalIgnoreCase))); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_Parameter_Char(bool async) + [ConditionalFact] + public virtual Task EndsWith_Parameter_Char() { if (IsCaseSensitive) { var pattern = 'e'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith(pattern))); } else @@ -591,189 +474,150 @@ public virtual Task EndsWith_Parameter_Char(bool async) var pattern = 'e'; return AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith(pattern)), ss => ss.Set().Where(b => b.String.EndsWith(pattern))); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_Column(bool async) + [ConditionalFact] + public virtual Task EndsWith_Column() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith(b.String))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_with_StringComparison_Ordinal(bool async) + [ConditionalFact] + public virtual Task EndsWith_with_StringComparison_Ordinal() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.Ordinal))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task EndsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + [ConditionalFact] + public virtual Task EndsWith_with_StringComparison_OrdinalIgnoreCase() => AssertQuery( - async, ss => ss.Set().Where(b => b.String.EndsWith("LE", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task EndsWith_with_StringComparison_unsupported(bool async) + [ConditionalFact] + public virtual async Task EndsWith_with_StringComparison_unsupported() { await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.CurrentCulture)))); + ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.CurrentCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.CurrentCultureIgnoreCase)))); + ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.CurrentCultureIgnoreCase)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.InvariantCulture)))); + ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.InvariantCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.InvariantCultureIgnoreCase)))); + ss => ss.Set().Where(b => b.String.EndsWith("le", StringComparison.InvariantCultureIgnoreCase)))); } #endregion EndsWith #region Contains - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_Literal(bool async) + [ConditionalFact] + public virtual Task Contains_Literal() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Contains("eattl"))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.Contains("Eattl")), ss => ss.Set().Where(b => b.String.Contains("Eattl", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_Literal_Char(bool async) + [ConditionalFact] + public virtual Task Contains_Literal_Char() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(b => b.String.Contains('e'))) : AssertQuery( - async, ss => ss.Set().Where(b => b.String.Contains('e')), ss => ss.Set().Where(b => b.String.Contains('e'))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Contains_Column(bool async) + [ConditionalFact] + public virtual async Task Contains_Column() { await AssertQuery( - async, ss => ss.Set().Where(b => b.String.Contains(b.String))); await AssertQueryScalar( - async, ss => ss.Set().Select(b => b.String.Contains(b.String))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Contains_negated(bool async) + [ConditionalFact] + public virtual async Task Contains_negated() { if (IsCaseSensitive) { await AssertQuery( - async, ss => ss.Set().Where(c => !c.String.Contains("eattle"))); await AssertQueryScalar( - async, ss => ss.Set().Select(c => !c.String.Contains("eattle"))); } else { await AssertQuery( - async, ss => ss.Set().Where(c => !c.String.Contains("Eattle")), ss => ss.Set().Where(c => !c.String.Contains("Eattle", StringComparison.OrdinalIgnoreCase))); await AssertQueryScalar( - async, ss => ss.Set().Select(c => !c.String.Contains("Eattle")), ss => ss.Set().Select(c => !c.String.Contains("Eattle", StringComparison.OrdinalIgnoreCase))); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_with_StringComparison_Ordinal(bool async) + [ConditionalFact] + public virtual Task Contains_with_StringComparison_Ordinal() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.Ordinal))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_with_StringComparison_OrdinalIgnoreCase(bool async) + [ConditionalFact] + public virtual Task Contains_with_StringComparison_OrdinalIgnoreCase() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains("EATTL", StringComparison.OrdinalIgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Contains_with_StringComparison_unsupported(bool async) + [ConditionalFact] + public virtual async Task Contains_with_StringComparison_unsupported() { await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.CurrentCulture)))); + ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.CurrentCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.CurrentCultureIgnoreCase)))); + ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.CurrentCultureIgnoreCase)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.InvariantCulture)))); + ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.InvariantCulture)))); await AssertTranslationFailed( () => AssertQuery( - async, - ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.InvariantCultureIgnoreCase)))); + ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.InvariantCultureIgnoreCase)))); } - [ConditionalTheory] // Probably belongs in FunkyDataQueryTestBase - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_constant_with_whitespace(bool async) + [ConditionalFact] // Probably belongs in FunkyDataQueryTestBase + public virtual Task Contains_constant_with_whitespace() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains(" ")), assertEmpty: true); - [ConditionalTheory] // Probably belongs in FunkyDataQueryTestBase - [MemberData(nameof(IsAsyncData))] - public virtual Task Contains_parameter_with_whitespace(bool async) + [ConditionalFact] // Probably belongs in FunkyDataQueryTestBase + public virtual Task Contains_parameter_with_whitespace() { var pattern = " "; return AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains(pattern)), assertEmpty: true); } @@ -782,177 +626,138 @@ public virtual Task Contains_parameter_with_whitespace(bool async) #region TrimStart - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimStart_without_arguments(bool async) + [ConditionalFact] + public virtual Task TrimStart_without_arguments() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimStart() == "Boston ")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimStart_with_char_argument(bool async) + [ConditionalFact] + public virtual Task TrimStart_with_char_argument() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimStart('S') == "eattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimStart_with_char_array_argument(bool async) + [ConditionalFact] + public virtual Task TrimStart_with_char_array_argument() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimStart(new [] { 'S', 'e' }) == "attle")); #endregion TrimStart #region TrimEnd - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimEnd_without_arguments(bool async) + [ConditionalFact] + public virtual Task TrimEnd_without_arguments() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimEnd() == " Boston")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimEnd_with_char_argument(bool async) + [ConditionalFact] + public virtual Task TrimEnd_with_char_argument() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimEnd('e') == "Seattl")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TrimEnd_with_char_array_argument(bool async) + [ConditionalFact] + public virtual Task TrimEnd_with_char_array_argument() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.TrimEnd(new [] { 'l', 'e' }) == "Seatt")); #endregion TrimEnd #region Trim - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Trim_without_argument_in_predicate(bool async) + [ConditionalFact] + public virtual Task Trim_without_argument_in_predicate() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Trim() == "Boston")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Trim_with_char_argument_in_predicate(bool async) + [ConditionalFact] + public virtual Task Trim_with_char_argument_in_predicate() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Trim('S') == "eattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Trim_with_char_array_argument_in_predicate(bool async) + [ConditionalFact] + public virtual Task Trim_with_char_array_argument_in_predicate() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.Trim(new [] { 'S', 'e' }) == "attl")); #endregion Trim #region Compare - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_simple_zero(bool async) + [ConditionalFact] + public virtual async Task Compare_simple_zero() { if (IsCaseSensitive) { await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != string.Compare(c.String, "Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= string.Compare(c.String, "Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < string.Compare(c.String, "Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") <= 0)); } else { await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "seattle") == 0), ss => ss.Set().Where(c => string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase) == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != string.Compare(c.String, "seattle")), ss => ss.Set().Where(c => 0 != string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "seattle") > 0), ss => ss.Set().Where(c => string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase) > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= string.Compare(c.String, "seattle")), ss => ss.Set().Where(c => 0 >= string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < string.Compare(c.String, "seattle")), ss => ss.Set().Where(c => 0 < string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "seattle") <= 0), ss => ss.Set().Where(c => string.Compare(c.String, "seattle", StringComparison.OrdinalIgnoreCase) <= 0)); } } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_simple_one(bool async) + [ConditionalFact] + public virtual async Task Compare_simple_one() { await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") == 1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 == string.Compare(c.String, "Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") < 1)); await AssertQuery( - async, ss => ss.Set().Where(c => 1 > string.Compare(c.String, "Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") > -1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 < string.Compare(c.String, "Seattle"))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_with_parameter(bool async) + [ConditionalFact] + public virtual async Task Compare_with_parameter() { BasicTypesEntity? basicTypeEntity; await using (var context = CreateContext()) @@ -963,150 +768,116 @@ public virtual async Task Compare_with_parameter(bool async) ClearLog(); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, basicTypeEntity.String) == 1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 == string.Compare(c.String, basicTypeEntity.String))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, basicTypeEntity.String) < 1)); await AssertQuery( - async, ss => ss.Set().Where(c => 1 > string.Compare(c.String, basicTypeEntity.String))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, basicTypeEntity.String) > -1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 < string.Compare(c.String, basicTypeEntity.String))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_simple_more_than_one(bool async) + [ConditionalFact] + public virtual async Task Compare_simple_more_than_one() { await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") == 42), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle") > 42), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 42 > string.Compare(c.String, "Seattle"))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_nested(bool async) + [ConditionalFact] + public virtual async Task Compare_nested() { await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "M" + c.String) == 0), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != string.Compare(c.String, c.String.Substring(0, 0)))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle".Replace("Sea", c.String)) > 0), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= string.Compare(c.String, "M" + c.String))); await AssertQuery( - async, ss => ss.Set().Where(c => 1 == string.Compare(c.String, c.String.Substring(0, 0)))); await AssertQuery( - async, ss => ss.Set().Where(c => string.Compare(c.String, "Seattle".Replace("Sea", c.String)) == -1)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_multi_predicate(bool async) + [ConditionalFact] + public virtual async Task Compare_multi_predicate() => await AssertQuery( - async, ss => ss.Set() .Where(c => string.Compare(c.String, "Seattle") > -1) .Where(c => string.Compare(c.String, "Toronto") == -1)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task CompareTo_simple_zero(bool async) + [ConditionalFact] + public virtual async Task CompareTo_simple_zero() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") == 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != c.String.CompareTo("Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") > 0)); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= c.String.CompareTo("Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => 0 < c.String.CompareTo("Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") <= 0)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task CompareTo_simple_one(bool async) + [ConditionalFact] + public virtual async Task CompareTo_simple_one() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") == 1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 == c.String.CompareTo("Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") < 1)); await AssertQuery( - async, ss => ss.Set().Where(c => 1 > c.String.CompareTo("Seattle"))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") > -1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 < c.String.CompareTo("Seattle"))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task CompareTo_with_parameter(bool async) + [ConditionalFact] + public virtual async Task CompareTo_with_parameter() { BasicTypesEntity? basicTypesEntity; using (var context = CreateContext()) @@ -1117,85 +888,66 @@ public virtual async Task CompareTo_with_parameter(bool async) ClearLog(); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo(basicTypesEntity.String) == 1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 == c.String.CompareTo(basicTypesEntity.String))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo(basicTypesEntity.String) < 1)); await AssertQuery( - async, ss => ss.Set().Where(c => 1 > c.String.CompareTo(basicTypesEntity.String))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo(basicTypesEntity.String) > -1)); await AssertQuery( - async, ss => ss.Set().Where(c => -1 < c.String.CompareTo(basicTypesEntity.String))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task CompareTo_simple_more_than_one(bool async) + [ConditionalFact] + public virtual async Task CompareTo_simple_more_than_one() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") == 42), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle") > 42), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 42 > c.String.CompareTo("Seattle"))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task CompareTo_nested(bool async) + [ConditionalFact] + public virtual async Task CompareTo_nested() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("M" + c.String) == 0), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 0 != c.String.CompareTo(c.String.Substring(0, 0)))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle".Replace("Sea", c.String)) > 0), assertEmpty: true); await AssertQuery( - async, ss => ss.Set().Where(c => 0 >= c.String.CompareTo("M" + c.String))); await AssertQuery( - async, ss => ss.Set().Where(c => 1 == c.String.CompareTo(c.String.Substring(0, 0)))); await AssertQuery( - async, ss => ss.Set().Where(c => c.String.CompareTo("Seattle".Replace("Sea", c.String)) == -1)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Compare_to_multi_predicate(bool async) + [ConditionalFact] + public virtual async Task Compare_to_multi_predicate() => await AssertQuery( - async, ss => ss.Set() .Where(c => c.String.CompareTo("Seattle") > -1) .Where(c => c.String.CompareTo("Toronto") == -1)); @@ -1204,11 +956,9 @@ public virtual async Task Compare_to_multi_predicate(bool async) #region Join - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Join_over_non_nullable_column(bool async) + [ConditionalFact] + public virtual Task Join_over_non_nullable_column() => AssertQuery( - async, ss => ss.Set() .GroupBy(c => c.Int) .Select(g => new { g.Key, Strings = string.Join("|", g.Select(e => e.String)) }), @@ -1223,11 +973,9 @@ public virtual Task Join_over_non_nullable_column(bool async) a.Strings.Split("|").OrderBy(id => id).ToArray()); }); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Join_over_nullable_column(bool async) + [ConditionalFact] + public virtual Task Join_over_nullable_column() => AssertQuery( - async, ss => ss.Set() .GroupBy(c => c.Int ?? 0) .Select(g => new { g.Key, Regions = string.Join("|", g.Select(e => e.String)) }), @@ -1242,11 +990,9 @@ public virtual Task Join_over_nullable_column(bool async) a.Regions.Split("|").OrderBy(id => id).ToArray()); }); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Join_with_predicate(bool async) + [ConditionalFact] + public virtual Task Join_with_predicate() => AssertQuery( - async, ss => ss.Set() .GroupBy(c => c.Int) .Select( @@ -1266,11 +1012,9 @@ public virtual Task Join_with_predicate(bool async) a.Strings.Split("|").OrderBy(id => id).ToArray()); }); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Join_with_ordering(bool async) + [ConditionalFact] + public virtual Task Join_with_ordering() => AssertQuery( - async, ss => ss.Set() .GroupBy(c => c.Int) .Select( @@ -1280,14 +1024,12 @@ public virtual Task Join_with_ordering(bool async) }), elementSorter: x => x.Key); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Join_non_aggregate(bool async) + [ConditionalFact] + public virtual Task Join_non_aggregate() { var foo = "foo"; return AssertQuery( - async, ss => ss.Set().Where(c => string.Join("|", new[] { c.String, foo, null, "bar" }) == "Seattle|foo||bar")); } @@ -1295,20 +1037,16 @@ public virtual Task Join_non_aggregate(bool async) #region Concatenation - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_operator(bool async) + [ConditionalFact] + public virtual Task Concat_operator() => AssertQuery( - async, ss => ss.Set().Where(b => b.String + "Boston" == "SeattleBoston")); // TODO: Possibly move to aggregate-specific test suite, not sure. Also Join above. - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_aggregate(bool async) + [ConditionalFact] + public virtual Task Concat_aggregate() => AssertQuery( - async, ss => ss.Set() .GroupBy(c => c.Int) .Select(g => new { g.Key, BasicTypesEntitys = string.Concat(g.Select(e => e.String)) }), @@ -1322,91 +1060,75 @@ public virtual Task Concat_aggregate(bool async) Assert.Equal(e.BasicTypesEntitys.OrderBy(c => c).ToArray(), a.BasicTypesEntitys.OrderBy(c => c).ToArray()); }); - [ConditionalTheory] // #31917 - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_string_int_comparison1(bool async) + [ConditionalFact] // #31917 + public virtual Task Concat_string_int_comparison1() { var i = 10; return AssertQuery( - async, ss => ss.Set().Where(c => c.String + i == "Seattle10")); } - [ConditionalTheory] // #31917 - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_string_int_comparison2(bool async) + [ConditionalFact] // #31917 + public virtual Task Concat_string_int_comparison2() { var i = 10; return AssertQuery( - async, ss => ss.Set().Where(c => i + c.String == "10Seattle")); } - [ConditionalTheory] // #31917 - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_string_int_comparison3(bool async) + [ConditionalFact] // #31917 + public virtual Task Concat_string_int_comparison3() { var i = 10; var j = 21; return AssertQuery( - async, ss => ss.Set().Where(c => i + 20 + c.String + j + 42 == "30Seattle2142")); } - [ConditionalTheory] // #31917 - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_string_int_comparison4(bool async) + [ConditionalFact] // #31917 + public virtual Task Concat_string_int_comparison4() => AssertQuery( - async, ss => ss.Set().Where(o => o.Int + o.String == "8Seattle")); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_string_string_comparison(bool async) + [ConditionalFact] + public virtual Task Concat_string_string_comparison() { var i = "A"; return AssertQuery( - async, ss => ss.Set().Where(c => i + c.String == "ASeattle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_method_comparison(bool async) + [ConditionalFact] + public virtual Task Concat_method_comparison() { var i = "A"; return AssertQuery( - async, ss => ss.Set().Where(c => string.Concat(i, c.String) == "ASeattle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_method_comparison_2(bool async) + [ConditionalFact] + public virtual Task Concat_method_comparison_2() { var i = "A"; var j = "B"; return AssertQuery( - async, ss => ss.Set().Where(c => string.Concat(i, j, c.String) == "ABSeattle")); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Concat_method_comparison_3(bool async) + [ConditionalFact] + public virtual Task Concat_method_comparison_3() { var i = "A"; var j = "B"; var k = "C"; return AssertQuery( - async, ss => ss.Set().Where(c => string.Concat(i, j, k, c.String) == "ABCSeattle")); } @@ -1414,45 +1136,35 @@ public virtual Task Concat_method_comparison_3(bool async) #region LINQ Operators - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FirstOrDefault(bool async) + [ConditionalFact] + public virtual Task FirstOrDefault() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.FirstOrDefault() == 'S')); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task LastOrDefault(bool async) + [ConditionalFact] + public virtual Task LastOrDefault() => AssertQuery( - async, ss => ss.Set().Where(c => c.String.LastOrDefault() == 'e')); #endregion LINQ Operators #region Regex - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Regex_IsMatch(bool async) + [ConditionalFact] + public virtual Task Regex_IsMatch() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(o => Regex.IsMatch(o.String, "^S"))) : AssertQuery( - async, ss => ss.Set().Where(o => Regex.IsMatch(o.String, "^s")), ss => ss.Set().Where(o => Regex.IsMatch(o.String, "^s", RegexOptions.IgnoreCase))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Regex_IsMatch_constant_input(bool async) + [ConditionalFact] + public virtual Task Regex_IsMatch_constant_input() => IsCaseSensitive ? AssertQuery( - async, ss => ss.Set().Where(o => Regex.IsMatch("Seattle", o.String))) : AssertQuery( - async, ss => ss.Set().Where(o => Regex.IsMatch("seattle", o.String)), ss => ss.Set().Where(o => Regex.IsMatch("seattle", o.String, RegexOptions.IgnoreCase))); diff --git a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateOnlyTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateOnlyTranslationsTestBase.cs index 354049a1cf7..c0a91ea538d 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateOnlyTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateOnlyTranslationsTestBase.cs @@ -8,139 +8,103 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Temporal; public abstract class DateOnlyTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Year(bool async) + [ConditionalFact] + public virtual Task Year() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.Year == 1990)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Month(bool async) + [ConditionalFact] + public virtual Task Month() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.Month == 11)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Day(bool async) + [ConditionalFact] + public virtual Task Day() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.Day == 10)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayOfYear(bool async) + [ConditionalFact] + public virtual Task DayOfYear() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.DayOfYear == 314)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayOfWeek(bool async) + [ConditionalFact] + public virtual Task DayOfWeek() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.DayOfWeek == System.DayOfWeek.Saturday)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayNumber(bool async) + [ConditionalFact] + public virtual Task DayNumber() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.DayNumber == 726780)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddYears(bool async) + [ConditionalFact] + public virtual Task AddYears() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.AddYears(3) == new DateOnly(1993, 11, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddMonths(bool async) + [ConditionalFact] + public virtual Task AddMonths() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.AddMonths(3) == new DateOnly(1991, 2, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddDays(bool async) + [ConditionalFact] + public virtual Task AddDays() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.AddDays(3) == new DateOnly(1990, 11, 13))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayNumber_subtraction(bool async) + [ConditionalFact] + public virtual Task DayNumber_subtraction() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateOnly.DayNumber - new DateOnly(1990, 11, 5).DayNumber == 5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime(bool async) + [ConditionalFact] + public virtual Task FromDateTime() => AssertQuery( - async, ss => ss.Set().Where(o => DateOnly.FromDateTime(o.DateTime) == new DateOnly(1998, 5, 4))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime_compared_to_property(bool async) + [ConditionalFact] + public virtual Task FromDateTime_compared_to_property() => AssertQuery( - async, ss => ss.Set().Where(o => DateOnly.FromDateTime(o.DateTime) == o.DateOnly)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime_compared_to_constant_and_parameter(bool async) + [ConditionalFact] + public virtual Task FromDateTime_compared_to_constant_and_parameter() { var dateOnly = new DateOnly(2, 10, 11); return AssertQuery( - async, ss => ss.Set() .Where(x => new[] { dateOnly, new DateOnly(1998, 5, 4) }.Contains(DateOnly.FromDateTime(x.DateTime)))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToDateTime_property_with_constant_TimeOnly(bool async) + [ConditionalFact] + public virtual Task ToDateTime_property_with_constant_TimeOnly() => AssertQuery( - async, ss => ss.Set() .Where(o => o.DateOnly.ToDateTime(new TimeOnly(21, 5, 19, 940, 500)) == new DateTime(2020, 1, 1, 21, 5, 19, 940, 500))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToDateTime_property_with_property_TimeOnly(bool async) + [ConditionalFact] + public virtual Task ToDateTime_property_with_property_TimeOnly() => AssertQuery( - async, ss => ss.Set() .Where(o => o.DateOnly.ToDateTime(o.TimeOnly) == new DateTime(2020, 1, 1, 15, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToDateTime_constant_DateTime_with_property_TimeOnly(bool async) + [ConditionalFact] + public virtual Task ToDateTime_constant_DateTime_with_property_TimeOnly() => AssertQuery( - async, ss => ss.Set() .Where(o => new DateOnly(1990, 11, 10).ToDateTime(o.TimeOnly) == new DateTime(1990, 11, 10, 15, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToDateTime_with_complex_DateTime(bool async) + [ConditionalFact] + public virtual Task ToDateTime_with_complex_DateTime() => AssertQuery( - async, ss => ss.Set() .Where(o => o.DateOnly.AddYears(1).ToDateTime(o.TimeOnly) == new DateTime(2021, 1, 1, 15, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToDateTime_with_complex_TimeOnly(bool async) + [ConditionalFact] + public virtual Task ToDateTime_with_complex_TimeOnly() => AssertQuery( - async, ss => ss.Set() .Where(o => o.DateOnly.ToDateTime(o.TimeOnly.AddHours(1)) == new DateTime(2020, 1, 1, 16, 30, 10)) .AsTracking()); diff --git a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeOffsetTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeOffsetTranslationsTestBase.cs index de1a854e07c..b3ade9a7633 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeOffsetTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeOffsetTranslationsTestBase.cs @@ -8,180 +8,133 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Temporal; public abstract class DateTimeOffsetTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Now(bool async) + [ConditionalFact] + public virtual Task Now() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset != DateTimeOffset.Now)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task UtcNow(bool async) + [ConditionalFact] + public virtual Task UtcNow() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset != DateTimeOffset.UtcNow)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Date(bool async) + [ConditionalFact] + public virtual Task Date() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Date > new DateTimeOffset().Date)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Year(bool async) + [ConditionalFact] + public virtual Task Year() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Year == 1998)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Month(bool async) + [ConditionalFact] + public virtual Task Month() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Month == 5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayOfYear(bool async) + [ConditionalFact] + public virtual Task DayOfYear() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.DayOfYear == 124)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Day(bool async) + [ConditionalFact] + public virtual Task Day() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Day == 4)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Hour(bool async) + [ConditionalFact] + public virtual Task Hour() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Hour == 15)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Minute(bool async) + [ConditionalFact] + public virtual Task Minute() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Minute == 30)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Second(bool async) + [ConditionalFact] + public virtual Task Second() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Second == 10)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Millisecond(bool async) + [ConditionalFact] + public virtual Task Millisecond() => AssertQuery( - async, ss => ss.Set().Where(b => b.DateTimeOffset.Millisecond == 123)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Microsecond(bool async) + [ConditionalFact] + public virtual Task Microsecond() => AssertQuery( - async, ss => ss.Set().Where(e => e.DateTimeOffset.Microsecond == 456)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nanosecond(bool async) + [ConditionalFact] + public virtual Task Nanosecond() => AssertQuery( - async, ss => ss.Set().Where(e => e.DateTimeOffset.Nanosecond == 400)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TimeOfDay(bool async) + [ConditionalFact] + public virtual Task TimeOfDay() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.TimeOfDay)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddYears(bool async) + [ConditionalFact] + public virtual Task AddYears() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddYears(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddMonths(bool async) + [ConditionalFact] + public virtual Task AddMonths() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddMonths(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddDays(bool async) + [ConditionalFact] + public virtual Task AddDays() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddDays(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddHours(bool async) + [ConditionalFact] + public virtual Task AddHours() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddHours(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddMinutes(bool async) + [ConditionalFact] + public virtual Task AddMinutes() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddMinutes(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddSeconds(bool async) + [ConditionalFact] + public virtual Task AddSeconds() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddSeconds(1))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddMilliseconds(bool async) + [ConditionalFact] + public virtual Task AddMilliseconds() => AssertQueryScalar( - async, ss => ss.Set().Select(b => b.DateTimeOffset.AddMilliseconds(300))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToUnixTimeMilliseconds(bool async) + [ConditionalFact] + public virtual Task ToUnixTimeMilliseconds() { var unixEpochMilliseconds = new DateTimeOffset(1998, 5, 4, 15, 30, 10, TimeSpan.Zero).ToUnixTimeMilliseconds(); return AssertQuery( - async, ss => ss.Set() .Where(b => b.DateTimeOffset.ToUnixTimeMilliseconds() == unixEpochMilliseconds)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task ToUnixTimeSecond(bool async) + [ConditionalFact] + public virtual Task ToUnixTimeSecond() { var unixEpochSeconds = new DateTimeOffset(1998, 5, 4, 15, 30, 10, TimeSpan.Zero).ToUnixTimeSeconds(); return AssertQuery( - async, ss => ss.Set() .Where(b => b.DateTimeOffset.ToUnixTimeSeconds() == unixEpochSeconds)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Milliseconds_parameter_and_constant(bool async) + [ConditionalFact] + public virtual Task Milliseconds_parameter_and_constant() { var dateTimeOffset = new DateTimeOffset(599898024001234567, new TimeSpan(1, 30, 0)); @@ -194,7 +147,6 @@ public virtual Task Milliseconds_parameter_and_constant(bool async) ), p); return AssertCount( - async, ss => ss.Set().Where(dynamicWhere), ss => ss.Set().Where(m => m.DateTimeOffset == dateTimeOffset)); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeTranslationsTestBase.cs index 23da35cb4c6..f355c6c8ebf 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Temporal/DateTimeTranslationsTestBase.cs @@ -8,156 +8,119 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Temporal; public abstract class DateTimeTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Now(bool async) + [ConditionalFact] + public virtual Task Now() { var myDatetime = new DateTime(2015, 4, 10); return AssertQuery( - async, ss => ss.Set().Where(c => DateTime.Now != myDatetime)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task UtcNow(bool async) + [ConditionalFact] + public virtual Task UtcNow() { var myDatetime = new DateTime(2015, 4, 10); return AssertQuery( - async, ss => ss.Set().Where(c => DateTime.UtcNow != myDatetime)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Today(bool async) + [ConditionalFact] + public virtual Task Today() => AssertQuery( - async, ss => ss.Set().Where(e => e.DateTime == DateTime.Today), assertEmpty: true); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Date(bool async) + [ConditionalFact] + public virtual Task Date() { var myDatetime = new DateTime(1998, 5, 4); return AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Date == myDatetime)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddYear(bool async) + [ConditionalFact] + public virtual Task AddYear() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.AddYears(1).Year == 1999)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Year(bool async) + [ConditionalFact] + public virtual Task Year() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Year == 1998)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Month(bool async) + [ConditionalFact] + public virtual Task Month() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Month == 5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task DayOfYear(bool async) + [ConditionalFact] + public virtual Task DayOfYear() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.DayOfYear == 124)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Day(bool async) + [ConditionalFact] + public virtual Task Day() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Day == 4)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Hour(bool async) + [ConditionalFact] + public virtual Task Hour() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Hour == 15)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Minute(bool async) + [ConditionalFact] + public virtual Task Minute() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Minute == 30)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Second(bool async) + [ConditionalFact] + public virtual Task Second() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Second == 10)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Millisecond(bool async) + [ConditionalFact] + public virtual Task Millisecond() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.Millisecond == 123)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task TimeOfDay(bool async) + [ConditionalFact] + public virtual Task TimeOfDay() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime.TimeOfDay == TimeSpan.Zero)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task subtract_and_TotalDays(bool async) + [ConditionalFact] + public virtual Task subtract_and_TotalDays() { var date = new DateTime(1997, 1, 1); return AssertQuery( - async, ss => ss.Set().Where(o => (o.DateTime - date).TotalDays > 365)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Parse_with_constant(bool async) + [ConditionalFact] + public virtual Task Parse_with_constant() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime == DateTime.Parse("5/4/1998 15:30:10 PM"))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Parse_with_parameter(bool async) + [ConditionalFact] + public virtual Task Parse_with_parameter() { var date = "5/4/1998 15:30:10 PM"; return AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime == DateTime.Parse(date))); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task New_with_constant(bool async) + [ConditionalFact] + public virtual Task New_with_constant() => AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime == new DateTime(1998, 5, 4, 15, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task New_with_parameters(bool async) + [ConditionalFact] + public virtual async Task New_with_parameters() { var year = 1998; var month = 5; @@ -165,7 +128,6 @@ public virtual async Task New_with_parameters(bool async) var hour = 15; await AssertQuery( - async, ss => ss.Set().Where(o => o.DateTime == new DateTime(year, month, date, hour, 30, 10))); } } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeOnlyTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeOnlyTranslationsTestBase.cs index 4c5040d20b0..9da342f2da7 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeOnlyTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeOnlyTranslationsTestBase.cs @@ -8,131 +8,97 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Temporal; public abstract class TimeOnlyTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Hour(bool async) + [ConditionalFact] + public virtual Task Hour() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.Hour == 15)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Minute(bool async) + [ConditionalFact] + public virtual Task Minute() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.Minute == 30)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Second(bool async) + [ConditionalFact] + public virtual Task Second() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.Second == 10)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Millisecond(bool async) + [ConditionalFact] + public virtual Task Millisecond() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.Millisecond == 123)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Microsecond(bool async) + [ConditionalFact] + public virtual Task Microsecond() => AssertQuery( - async, ss => ss.Set().Where(e => e.TimeOnly.Microsecond == 456)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nanosecond(bool async) + [ConditionalFact] + public virtual Task Nanosecond() => AssertQuery( - async, ss => ss.Set().Where(e => e.TimeOnly.Nanosecond == 400)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddHours(bool async) + [ConditionalFact] + public virtual Task AddHours() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.AddHours(3) == new TimeOnly(18, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task AddMinutes(bool async) + [ConditionalFact] + public virtual Task AddMinutes() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.AddMinutes(3) == new TimeOnly(15, 33, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Add_TimeSpan(bool async) + [ConditionalFact] + public virtual Task Add_TimeSpan() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.Add(new TimeSpan(3, 0, 0)) == new TimeOnly(18, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task IsBetween(bool async) + [ConditionalFact] + public virtual Task IsBetween() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly.IsBetween(new TimeOnly(14, 0, 0), new TimeOnly(16, 0, 0)))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Subtract(bool async) + [ConditionalFact] + public virtual Task Subtract() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeOnly - new TimeOnly(3, 0, 0) == new TimeSpan(12, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime_compared_to_property(bool async) + [ConditionalFact] + public virtual Task FromDateTime_compared_to_property() => AssertQuery( - async, ss => ss.Set().Where(b => TimeOnly.FromDateTime(b.DateTime) == b.TimeOnly)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime_compared_to_parameter(bool async) + [ConditionalFact] + public virtual Task FromDateTime_compared_to_parameter() { var time = new TimeOnly(15, 30, 10); return AssertQuery( - async, ss => ss.Set().Where(b => TimeOnly.FromDateTime(b.DateTime) == time)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromDateTime_compared_to_constant(bool async) + [ConditionalFact] + public virtual Task FromDateTime_compared_to_constant() => AssertQuery( - async, ss => ss.Set().Where(b => TimeOnly.FromDateTime(b.DateTime) == new TimeOnly(15, 30, 10))); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromTimeSpan_compared_to_property(bool async) + [ConditionalFact] + public virtual Task FromTimeSpan_compared_to_property() => AssertQuery( - async, ss => ss.Set().Where(b => TimeOnly.FromTimeSpan(b.TimeSpan) < b.TimeOnly)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task FromTimeSpan_compared_to_parameter(bool async) + [ConditionalFact] + public virtual Task FromTimeSpan_compared_to_parameter() { var time = new TimeOnly(1, 2, 3); return AssertQuery( - async, ss => ss.Set().Where(x => TimeOnly.FromTimeSpan(x.TimeSpan) == time)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Order_by_FromTimeSpan(bool async) + [ConditionalFact] + public virtual Task Order_by_FromTimeSpan() => AssertQuery( - async, ss => ss.Set().OrderBy(x => TimeOnly.FromTimeSpan(x.TimeSpan)), assertOrder: true); } diff --git a/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeSpanTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeSpanTranslationsTestBase.cs index 88e9cd4b1e9..0abee2ffb2e 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeSpanTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/Temporal/TimeSpanTranslationsTestBase.cs @@ -8,45 +8,33 @@ namespace Microsoft.EntityFrameworkCore.Query.Translations.Temporal; public abstract class TimeSpanTranslationsTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : BasicTypesQueryFixtureBase, new() { - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Hours(bool async) + [ConditionalFact] + public virtual Task Hours() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Hours == 3)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Minutes(bool async) + [ConditionalFact] + public virtual Task Minutes() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Minutes == 4)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Seconds(bool async) + [ConditionalFact] + public virtual Task Seconds() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Seconds == 5)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Milliseconds(bool async) + [ConditionalFact] + public virtual Task Milliseconds() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Milliseconds == 678)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Microseconds(bool async) + [ConditionalFact] + public virtual Task Microseconds() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Microseconds == 912)); - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Nanoseconds(bool async) + [ConditionalFact] + public virtual Task Nanoseconds() => AssertQuery( - async, ss => ss.Set().Where(b => b.TimeSpan.Nanoseconds == 400)); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs index 62f18a651ed..bf2dd60ba84 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs @@ -8,9 +8,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; public class ComplexJsonCollectionSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonCollectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Count(bool async) + public override async Task Count() { - await base.Count(async); + await base.Count(); AssertSql( """ @@ -22,9 +22,9 @@ FROM OPENJSON([r].[RelatedCollection], '$') AS [r0]) = 2 """); } - public override async Task Where(bool async) + public override async Task Where() { - await base.Where(async); + await base.Where(); AssertSql( """ @@ -37,9 +37,9 @@ FROM OPENJSON([r].[RelatedCollection], '$') WITH ([Int] int '$.Int') AS [r0] """); } - public override async Task OrderBy_ElementAt(bool async) + public override async Task OrderBy_ElementAt() { - await base.OrderBy_ElementAt(async); + await base.OrderBy_ElementAt(); AssertSql( """ @@ -56,11 +56,11 @@ ORDER BY [r0].[Id] """); } - public override async Task Index_constant(bool async) + public override async Task Index_constant() { // Complex collection indexing currently fails because SubqueryMemberPushdownExpressionVisitor moves the Int member access to before the // ElementAt (making a Select()), this interferes with our translation. See #36335. - await Assert.ThrowsAsync(() => base.Index_constant(async)); + await Assert.ThrowsAsync(() => base.Index_constant()); AssertSql( """ @@ -70,11 +70,11 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[0]') AS int) = 8 """); } - public override async Task Index_parameter(bool async) + public override async Task Index_parameter() { // Complex collection indexing currently fails because SubqueryMemberPushdownExpressionVisitor moves the Int member access to before the // ElementAt (making a Select()), this interferes with our translation. See #36335. - await Assert.ThrowsAsync(() => base.Index_parameter(async)); + await Assert.ThrowsAsync(() => base.Index_parameter()); AssertSql( """ @@ -86,11 +86,11 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[' + CAST(@i AS nvarchar(max)) """); } - public override async Task Index_column(bool async) + public override async Task Index_column() { // Complex collection indexing currently fails because SubqueryMemberPushdownExpressionVisitor moves the Int member access to before the // ElementAt (making a Select()), this interferes with our translation. See #36335. - await Assert.ThrowsAsync(() => base.Index_column(async)); + await Assert.ThrowsAsync(() => base.Index_column()); AssertSql( """ @@ -100,9 +100,9 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[' + CAST([r].[Id] - 1 AS nvarc """); } - public override async Task Index_out_of_bounds(bool async) + public override async Task Index_out_of_bounds() { - await base.Index_out_of_bounds(async); + await base.Index_out_of_bounds(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs index df28539e3bd..a2cf1d47feb 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs @@ -8,9 +8,9 @@ public class ComplexJsonMiscellaneousSqlServerTest(ComplexJsonSqlServerFixture f { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -20,9 +20,9 @@ WHERE CAST(JSON_VALUE([r].[RequiredRelated], '$.Int') AS int) = 8 """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql( """ @@ -32,9 +32,9 @@ WHERE CAST(JSON_VALUE([r].[OptionalRelated], '$.Int') AS int) = 8 """); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs index ddde150dac4..bae189c2dd4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; public class ComplexJsonProjectionSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -19,9 +19,9 @@ FROM [RootEntity] AS [r] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -30,9 +30,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -41,9 +41,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -52,9 +52,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -67,9 +67,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); AssertSql( """ @@ -78,9 +78,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); AssertSql( """ @@ -89,9 +89,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -100,9 +100,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -111,9 +111,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -122,9 +122,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -137,9 +137,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); AssertSql( """ @@ -149,9 +149,9 @@ ORDER BY [r].[Id] """); } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -161,9 +161,9 @@ ORDER BY [r].[Id] """); } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -173,9 +173,9 @@ ORDER BY [r].[Id] """); } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); AssertSql( """ @@ -193,9 +193,9 @@ [RequiredNested] nvarchar(max) '$.RequiredNested' AS JSON """); } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -210,9 +210,9 @@ [String] nvarchar(max) '$.String' """); } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -231,9 +231,9 @@ [String] nvarchar(max) '$.String' #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -246,9 +246,9 @@ FROM [RootEntity] AS [r] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); AssertSql( """ @@ -262,9 +262,9 @@ ORDER BY [r0].[Id] """); } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs index 9dcde405af4..05c0b18fe59 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; public class ComplexJsonStructuralEqualitySqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -18,9 +18,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -30,9 +30,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.RequiredNested') = JSON_QUERY([r].[Op """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -42,9 +42,9 @@ WHERE [r].[RequiredRelated] <> [r].[OptionalRelated] OR [r].[OptionalRelated] IS """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -54,9 +54,9 @@ WHERE [r].[OptionalRelated] IS NULL """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -66,9 +66,9 @@ WHERE [r].[OptionalRelated] IS NULL """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -78,9 +78,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.OptionalNested') IS NULL """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -90,9 +90,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.RequiredNested') = '{"Id":1000,"Int": """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -104,9 +104,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.RequiredNested') = @entity_equality_n """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -116,9 +116,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.NestedCollection') = JSON_QUERY([r].[ """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( """ @@ -128,9 +128,9 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.NestedCollection') = '[{"Id":1002,"In """); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs index c3dd0193181..b0391f6d839 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs @@ -10,9 +10,9 @@ public class ComplexTableSplittingMiscellaneousSqlServerTest( { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -22,16 +22,16 @@ FROM [RootEntity] AS [r] """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql(); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs index cf8040630b8..cfa9adac8b6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs @@ -8,9 +8,9 @@ public class ComplexTableSplittingProjectionSqlServerTest( ITestOutputHelper testOutputHelper) : ComplexTableSplittingProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -21,9 +21,9 @@ FROM [RootEntity] AS [r] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -32,9 +32,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -43,9 +43,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -54,9 +54,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -69,9 +69,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); AssertSql( """ @@ -80,9 +80,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); AssertSql( """ @@ -91,9 +91,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -102,9 +102,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -113,9 +113,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -124,9 +124,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -139,9 +139,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); AssertSql( """ @@ -151,9 +151,9 @@ ORDER BY [r].[Id] """); } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -163,9 +163,9 @@ ORDER BY [r].[Id] """); } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -175,23 +175,23 @@ ORDER BY [r].[Id] """); } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); AssertSql(); } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); AssertSql(); } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql(); } @@ -200,9 +200,9 @@ public override async Task SelectMany_nested_collection_on_optional_related(bool #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -215,16 +215,16 @@ FROM [RootEntity] AS [r] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); AssertSql(); } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs index 2a8855afcb6..9c85421e925 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs @@ -8,51 +8,51 @@ public class ComplexTableSplittingStructuralEqualitySqlServerTest( ITestOutputHelper testOutputHelper) : ComplexTableSplittingStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql(); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql(); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql(); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql(); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql(); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql(); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -62,9 +62,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -79,23 +79,23 @@ FROM [RootEntity] AS [r] """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql(); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql(); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql(); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs index 1a837490aae..ec4b125ddb4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; public class NavigationsCollectionSqlServerTest(NavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsCollectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Count(bool async) + public override async Task Count() { - await base.Count(async); + await base.Count(); AssertSql( """ @@ -21,9 +21,9 @@ FROM [RelatedType] AS [r0] """); } - public override async Task Where(bool async) + public override async Task Where() { - await base.Where(async); + await base.Where(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [RelatedType] AS [r0] """); } - public override async Task OrderBy_ElementAt(bool async) + public override async Task OrderBy_ElementAt() { - await base.OrderBy_ElementAt(async); + await base.OrderBy_ElementAt(); AssertSql( """ @@ -53,30 +53,30 @@ ORDER BY [r0].[Id] """); } - public override async Task Index_constant(bool async) + public override async Task Index_constant() { - await base.Index_constant(async); + await base.Index_constant(); AssertSql(); } - public override async Task Index_parameter(bool async) + public override async Task Index_parameter() { - await base.Index_parameter(async); + await base.Index_parameter(); AssertSql(); } - public override async Task Index_column(bool async) + public override async Task Index_column() { - await base.Index_column(async); + await base.Index_column(); AssertSql(); } - public override async Task Index_out_of_bounds(bool async) + public override async Task Index_out_of_bounds() { - await base.Index_out_of_bounds(async); + await base.Index_out_of_bounds(); AssertSql(); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs index c7ccb817270..b3572f48897 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs @@ -10,9 +10,9 @@ public class NavigationsMiscellaneousSqlServerTest( { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -23,9 +23,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs index 48d5c00ebdc..6212b7a5b07 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; public class NavigationsProjectionSqlServerTest(NavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -19,9 +19,9 @@ FROM [RootEntity] AS [r] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -31,9 +31,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -43,9 +43,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -55,9 +55,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -71,9 +71,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); AssertSql( """ @@ -83,9 +83,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); AssertSql( """ @@ -95,9 +95,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -108,9 +108,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -121,9 +121,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -134,9 +134,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -151,9 +151,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); AssertSql( """ @@ -164,9 +164,9 @@ ORDER BY [r].[Id] """); } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -178,9 +178,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -192,9 +192,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); AssertSql( """ @@ -204,9 +204,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -217,9 +217,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -234,9 +234,9 @@ FROM [RootEntity] AS [r] #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -249,9 +249,9 @@ FROM [RootEntity] AS [r] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); AssertSql( """ @@ -267,9 +267,9 @@ ORDER BY [r0].[Id] """); } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs index 0407d0514ad..9ddabcd754a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs @@ -8,9 +8,9 @@ public class NavigationsStructuralEqualitySqlServerTest( ITestOutputHelper testOutputHelper) : NavigationsStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -22,9 +22,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -38,9 +38,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -52,9 +52,9 @@ WHERE [r0].[Id] <> [r1].[Id] OR [r1].[Id] IS NULL """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -65,9 +65,9 @@ WHERE [r0].[Id] IS NULL """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -78,9 +78,9 @@ WHERE [r0].[Id] IS NULL """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -92,9 +92,9 @@ WHERE [n].[Id] IS NULL """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -106,9 +106,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -122,9 +122,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -136,16 +136,16 @@ FROM [RootEntity] AS [r] """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql(); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql(); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs index 885fbf0ce99..29a6ee12525 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; public class OwnedJsonCollectionSqlServerTest(OwnedJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonCollectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Count(bool async) + public override async Task Count() { - await base.Count(async); + await base.Count(); AssertSql( """ @@ -20,9 +20,9 @@ FROM OPENJSON([r].[RelatedCollection], '$') AS [r0]) = 2 """); } - public override async Task Where(bool async) + public override async Task Where() { - await base.Where(async); + await base.Where(); AssertSql( """ @@ -40,9 +40,9 @@ [String] nvarchar(max) '$.String' """); } - public override async Task Index_constant(bool async) + public override async Task Index_constant() { - await base.Index_constant(async); + await base.Index_constant(); AssertSql( """ @@ -52,9 +52,9 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[0].Int') AS int) = 8 """); } - public override async Task OrderBy_ElementAt(bool async) + public override async Task OrderBy_ElementAt() { - await base.OrderBy_ElementAt(async); + await base.OrderBy_ElementAt(); AssertSql( """ @@ -73,9 +73,9 @@ ORDER BY [r0].[Id] """); } - public override async Task Index_parameter(bool async) + public override async Task Index_parameter() { - await base.Index_parameter(async); + await base.Index_parameter(); AssertSql( """ @@ -87,9 +87,9 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[' + CAST(@i AS nvarchar(max)) """); } - public override async Task Index_column(bool async) + public override async Task Index_column() { - await base.Index_column(async); + await base.Index_column(); AssertSql( """ @@ -99,9 +99,9 @@ WHERE CAST(JSON_VALUE([r].[RelatedCollection], '$[' + CAST([r].[Id] - 1 AS nvarc """); } - public override async Task Index_out_of_bounds(bool async) + public override async Task Index_out_of_bounds() { - await base.Index_out_of_bounds(async); + await base.Index_out_of_bounds(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs index 18e22b47897..9d588dc8b6d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs @@ -10,9 +10,9 @@ public class OwnedJsonMiscellaneousSqlServerTest( { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -22,9 +22,9 @@ WHERE CAST(JSON_VALUE([r].[RequiredRelated], '$.Int') AS int) = 8 """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql( """ @@ -34,9 +34,9 @@ WHERE CAST(JSON_VALUE([r].[OptionalRelated], '$.Int') AS int) = 8 """); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs index d6168ab3090..a1a8ccccd75 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; public class OwnedJsonProjectionSqlServerTest(OwnedJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -19,9 +19,9 @@ FROM [RootEntity] AS [r] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -30,9 +30,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -41,9 +41,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -52,9 +52,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -67,9 +67,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -81,9 +81,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -95,9 +95,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -109,9 +109,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -123,9 +123,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -137,9 +137,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -155,9 +155,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -170,9 +170,9 @@ ORDER BY [r].[Id] } } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -185,9 +185,9 @@ ORDER BY [r].[Id] } } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -200,9 +200,9 @@ ORDER BY [r].[Id] } } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -223,9 +223,9 @@ [RequiredNested] nvarchar(max) '$.RequiredNested' AS JSON } } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -243,9 +243,9 @@ [String] nvarchar(max) '$.String' } } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -267,9 +267,9 @@ [String] nvarchar(max) '$.String' #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -282,9 +282,9 @@ FROM [RootEntity] AS [r] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -301,9 +301,9 @@ ORDER BY [r0].[Id] } } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs index ee5f03dfdc1..50dba0aab2b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs @@ -8,9 +8,9 @@ public class OwnedJsonStructuralEqualitySqlServerTest( ITestOutputHelper testOutputHelper) : OwnedJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -20,9 +20,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -32,9 +32,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -44,9 +44,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -56,9 +56,9 @@ WHERE [r].[OptionalRelated] IS NULL """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -68,9 +68,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -80,25 +80,25 @@ WHERE JSON_QUERY([r].[RequiredRelated], '$.OptionalNested') IS NULL """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -108,17 +108,17 @@ FROM [RootEntity] AS [r] """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs index eaea700c1b2..7cb09c63edc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; public class OwnedNavigationsCollectionSqlServerTest(OwnedNavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsCollectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Count(bool async) + public override async Task Count() { - await base.Count(async); + await base.Count(); AssertSql( """ @@ -37,9 +37,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Where(bool async) + public override async Task Where() { - await base.Where(async); + await base.Where(); AssertSql( """ @@ -68,9 +68,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task OrderBy_ElementAt(bool async) + public override async Task OrderBy_ElementAt() { - await base.OrderBy_ElementAt(async); + await base.OrderBy_ElementAt(); AssertSql( """ @@ -101,9 +101,9 @@ ORDER BY [r0].[Id] """); } - public override async Task Index_constant(bool async) + public override async Task Index_constant() { - await base.Index_constant(async); + await base.Index_constant(); AssertSql( """ @@ -134,9 +134,9 @@ ORDER BY (SELECT 1) """); } - public override async Task Index_parameter(bool async) + public override async Task Index_parameter() { - await base.Index_parameter(async); + await base.Index_parameter(); AssertSql( """ @@ -169,9 +169,9 @@ ORDER BY (SELECT 1) """); } - public override async Task Index_column(bool async) + public override async Task Index_column() { - await base.Index_column(async); + await base.Index_column(); AssertSql( """ @@ -202,9 +202,9 @@ ORDER BY (SELECT 1) """); } - public override async Task Index_out_of_bounds(bool async) + public override async Task Index_out_of_bounds() { - await base.Index_out_of_bounds(async); + await base.Index_out_of_bounds(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs index 4b2a53dd335..06ccce33ac3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs @@ -12,9 +12,9 @@ public class OwnedNavigationsMiscellaneousSqlServerTest( { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -40,9 +40,9 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql( """ @@ -68,9 +68,9 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs index 4030d755f1b..13875b1d887 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; public class OwnedNavigationsProjectionSqlServerTest(OwnedNavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -35,9 +35,9 @@ FROM [RelatedCollection] AS [r3] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -47,9 +47,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -59,9 +59,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -71,9 +71,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -87,9 +87,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -106,9 +106,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -125,9 +125,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -141,9 +141,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -157,9 +157,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -173,9 +173,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -193,9 +193,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -215,9 +215,9 @@ FROM [RelatedCollection] AS [r0] } } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -232,9 +232,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -249,9 +249,9 @@ FROM [RootEntity] AS [r] } } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -268,9 +268,9 @@ FROM [RootEntity] AS [r] } } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -284,9 +284,9 @@ FROM [RootEntity] AS [r] } } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -304,9 +304,9 @@ FROM [RootEntity] AS [r] #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -344,9 +344,9 @@ FROM [RelatedCollection] AS [r8] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -365,9 +365,9 @@ ORDER BY [r0].[Id] } } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs index dca4c85fe6c..d674720afcd 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs @@ -8,9 +8,9 @@ public class OwnedNavigationsStructuralEqualitySqlServerTest( ITestOutputHelper testOutputHelper) : OwnedNavigationsStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -64,9 +64,9 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -92,9 +92,9 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -120,9 +120,9 @@ WHERE [o].[RootEntityId] IS NULL """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -148,9 +148,9 @@ WHERE [o].[RootEntityId] IS NULL """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -176,25 +176,25 @@ WHERE [r1].[RelatedTypeRootEntityId] IS NULL """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -220,17 +220,17 @@ FROM [RelatedCollection] AS [r3] """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs index bf07d54db61..0f82c4be8e8 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs @@ -12,9 +12,9 @@ public class OwnedTableSplittingMiscellaneousSqlServerTest( { #region Simple filters - public override async Task Where_related_property(bool async) + public override async Task Where_related_property() { - await base.Where_related_property(async); + await base.Where_related_property(); AssertSql( """ @@ -34,9 +34,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Where_optional_related_property(bool async) + public override async Task Where_optional_related_property() { - await base.Where_optional_related_property(async); + await base.Where_optional_related_property(); AssertSql( """ @@ -56,9 +56,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Where_nested_related_property(bool async) + public override async Task Where_nested_related_property() { - await base.Where_nested_related_property(async); + await base.Where_nested_related_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs index 466f0c7df3f..fe8d7fcd789 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; public class OwnedTableSplittingProjectionSqlServerTest(OwnedTableSplittingSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedTableSplittingProjectionRelationalTestBase(fixture, testOutputHelper) { - public override async Task Select_root(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root(async, queryTrackingBehavior); + await base.Select_root(queryTrackingBehavior); AssertSql( """ @@ -29,9 +29,9 @@ FROM [RelatedCollection] AS [r0] #region Simple properties - public override async Task Select_property_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_required_related(async, queryTrackingBehavior); + await base.Select_property_on_required_related(queryTrackingBehavior); AssertSql( """ @@ -40,9 +40,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_property_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_property_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_property_on_optional_related(async, queryTrackingBehavior); + await base.Select_property_on_optional_related(queryTrackingBehavior); AssertSql( """ @@ -51,9 +51,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_value_type_property_on_null_related_throws(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_value_type_property_on_null_related_throws(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_value_type_property_on_null_related_throws(async, queryTrackingBehavior); + await base.Select_value_type_property_on_null_related_throws(queryTrackingBehavior); AssertSql( """ @@ -62,9 +62,9 @@ FROM [RootEntity] AS [r] """); } - public override async Task Select_nullable_value_type_property_on_null_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nullable_value_type_property_on_null_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nullable_value_type_property_on_null_related(async, queryTrackingBehavior); + await base.Select_nullable_value_type_property_on_null_related(queryTrackingBehavior); AssertSql( """ @@ -77,9 +77,9 @@ FROM [RootEntity] AS [r] #region Non-collection - public override async Task Select_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related(async, queryTrackingBehavior); + await base.Select_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -93,9 +93,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_related(async, queryTrackingBehavior); + await base.Select_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -111,9 +111,9 @@ WHEN [r].[OptionalRelated_Id] IS NOT NULL AND [r].[OptionalRelated_Int] IS NOT N } } - public override async Task Select_required_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -125,9 +125,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_required_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -139,9 +139,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_required_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_required_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_required_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_required_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -153,9 +153,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_optional_nested_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_optional_nested_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_optional_nested_on_optional_related(async, queryTrackingBehavior); + await base.Select_optional_nested_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -171,9 +171,9 @@ FROM [RootEntity] AS [r] #region Collection - public override async Task Select_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_related_collection(async, queryTrackingBehavior); + await base.Select_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -191,9 +191,9 @@ FROM [RelatedCollection] AS [r0] } } - public override async Task Select_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -207,9 +207,9 @@ FROM [RootEntity] AS [r] } } - public override async Task Select_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.Select_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -225,9 +225,9 @@ WHEN [r].[OptionalRelated_Id] IS NOT NULL AND [r].[OptionalRelated_Int] IS NOT N } } - public override async Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_related_collection(async, queryTrackingBehavior); + await base.SelectMany_related_collection(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -242,9 +242,9 @@ FROM [RootEntity] AS [r] } } - public override async Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -257,9 +257,9 @@ FROM [RootEntity] AS [r] } } - public override async Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) { - await base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior); + await base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -278,9 +278,9 @@ WHEN [r].[OptionalRelated_Id] IS NOT NULL AND [r].[OptionalRelated_Int] IS NOT N #region Multiple - public override async Task Select_root_duplicated(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_root_duplicated(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_root_duplicated(async, queryTrackingBehavior); + await base.Select_root_duplicated(queryTrackingBehavior); AssertSql( """ @@ -312,9 +312,9 @@ FROM [RelatedCollection] AS [r3] #region Subquery - public override async Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { @@ -331,9 +331,9 @@ ORDER BY [r0].[Id] } } - public override async Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override async Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) { - await base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior); + await base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior); if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs index 6ab6772d03b..624c1105f18 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs @@ -8,9 +8,9 @@ public class OwnedTableSplittingStructuralEqualitySqlServerTest( ITestOutputHelper testOutputHelper) : OwnedTableSplittingStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -30,9 +30,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -52,9 +52,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -74,9 +74,9 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -96,9 +96,9 @@ WHERE [r].[OptionalRelated_Id] IS NULL OR [r].[OptionalRelated_Int] IS NULL OR [ """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -120,9 +120,9 @@ END IS NULL """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -142,25 +142,25 @@ WHERE [r].[RequiredRelated_OptionalNested_Id] IS NULL OR [r].[RequiredRelated_Op """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -180,17 +180,17 @@ FROM [RelatedCollection] AS [r0] """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/ByteArrayTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/ByteArrayTranslationsSqlServerTest.cs index a5c0dcab347..948e66df0b9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/ByteArrayTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/ByteArrayTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public ByteArrayTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Length(bool async) + public override async Task Length() { - await base.Length(async); + await base.Length(); AssertSql( """ @@ -24,9 +24,9 @@ WHERE CAST(DATALENGTH([b].[ByteArray]) AS int) = 4 """); } - public override async Task Index(bool async) + public override async Task Index() { - await base.Index(async); + await base.Index(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE CAST(DATALENGTH([b].[ByteArray]) AS int) >= 3 AND CAST(SUBSTRING([b].[Byte """); } - public override async Task First(bool async) + public override async Task First() { - await base.First(async); + await base.First(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE CAST(DATALENGTH([b].[ByteArray]) AS int) >= 1 AND CAST(SUBSTRING([b].[Byte """); } - public override async Task Contains_with_constant(bool async) + public override async Task Contains_with_constant() { - await base.Contains_with_constant(async); + await base.Contains_with_constant(); AssertSql( """ @@ -60,9 +60,9 @@ WHERE CHARINDEX(0x01, [b].[ByteArray]) > 0 """); } - public override async Task Contains_with_parameter(bool async) + public override async Task Contains_with_parameter() { - await base.Contains_with_parameter(async); + await base.Contains_with_parameter(); AssertSql( """ @@ -74,9 +74,9 @@ WHERE CHARINDEX(CAST(@someByte AS varbinary(max)), [b].[ByteArray]) > 0 """); } - public override async Task Contains_with_column(bool async) + public override async Task Contains_with_column() { - await base.Contains_with_column(async); + await base.Contains_with_column(); AssertSql( """ @@ -86,9 +86,9 @@ WHERE CHARINDEX(CAST([b].[Byte] AS varbinary(max)), [b].[ByteArray]) > 0 """); } - public override async Task SequenceEqual(bool async) + public override async Task SequenceEqual() { - await base.SequenceEqual(async); + await base.SequenceEqual(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/EnumTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/EnumTranslationsSqlServerTest.cs index 2f79fb04805..0661d4d6a40 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/EnumTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/EnumTranslationsSqlServerTest.cs @@ -14,9 +14,9 @@ public EnumTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture, IT #region Equality - public override async Task Equality_to_constant(bool async) + public override async Task Equality_to_constant() { - await base.Equality_to_constant(async); + await base.Equality_to_constant(); AssertSql( """ @@ -26,9 +26,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Equality_to_parameter(bool async) + public override async Task Equality_to_parameter() { - await base.Equality_to_parameter(async); + await base.Equality_to_parameter(); AssertSql( """ @@ -40,9 +40,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Equality_nullable_enum_to_constant(bool async) + public override async Task Equality_nullable_enum_to_constant() { - await base.Equality_nullable_enum_to_constant(async); + await base.Equality_nullable_enum_to_constant(); AssertSql( """ @@ -52,9 +52,9 @@ FROM [NullableBasicTypesEntities] AS [n] """); } - public override async Task Equality_nullable_enum_to_parameter(bool async) + public override async Task Equality_nullable_enum_to_parameter() { - await base.Equality_nullable_enum_to_parameter(async); + await base.Equality_nullable_enum_to_parameter(); AssertSql( """ @@ -66,9 +66,9 @@ FROM [NullableBasicTypesEntities] AS [n] """); } - public override async Task Equality_nullable_enum_to_null_constant(bool async) + public override async Task Equality_nullable_enum_to_null_constant() { - await base.Equality_nullable_enum_to_null_constant(async); + await base.Equality_nullable_enum_to_null_constant(); AssertSql( """ @@ -78,9 +78,9 @@ WHERE [n].[Enum] IS NULL """); } - public override async Task Equality_nullable_enum_to_null_parameter(bool async) + public override async Task Equality_nullable_enum_to_null_parameter() { - await base.Equality_nullable_enum_to_null_parameter(async); + await base.Equality_nullable_enum_to_null_parameter(); AssertSql( """ @@ -90,9 +90,9 @@ WHERE [n].[Enum] IS NULL """); } - public override async Task Equality_nullable_enum_to_nullable_parameter(bool async) + public override async Task Equality_nullable_enum_to_nullable_parameter() { - await base.Equality_nullable_enum_to_nullable_parameter(async); + await base.Equality_nullable_enum_to_nullable_parameter(); AssertSql( """ @@ -106,9 +106,9 @@ FROM [NullableBasicTypesEntities] AS [n] #endregion Equality - public override async Task Bitwise_and_enum_constant(bool async) + public override async Task Bitwise_and_enum_constant() { - await base.Bitwise_and_enum_constant(async); + await base.Bitwise_and_enum_constant(); AssertSql( """ @@ -124,9 +124,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Bitwise_and_integral_constant(bool async) + public override async Task Bitwise_and_integral_constant() { - await base.Bitwise_and_integral_constant(async); + await base.Bitwise_and_integral_constant(); AssertSql( """ @@ -148,9 +148,9 @@ WHERE CAST([b].[FlagsEnum] AS smallint) & CAST(8 AS smallint) = CAST(8 AS smalli """); } - public override async Task Bitwise_and_nullable_enum_with_constant(bool async) + public override async Task Bitwise_and_nullable_enum_with_constant() { - await base.Bitwise_and_nullable_enum_with_constant(async); + await base.Bitwise_and_nullable_enum_with_constant(); AssertSql( """ @@ -160,9 +160,9 @@ WHERE [n].[FlagsEnum] & 8 > 0 """); } - public override async Task Where_bitwise_and_nullable_enum_with_null_constant(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_null_constant() { - await base.Where_bitwise_and_nullable_enum_with_null_constant(async); + await base.Where_bitwise_and_nullable_enum_with_null_constant(); AssertSql( """ @@ -172,9 +172,9 @@ WHERE [n].[FlagsEnum] & NULL > 0 """); } - public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter() { - await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(async); + await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(); AssertSql( """ @@ -186,9 +186,9 @@ WHERE [n].[FlagsEnum] & @flagsEnum > 0 """); } - public override async Task Where_bitwise_and_nullable_enum_with_nullable_parameter(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_nullable_parameter() { - await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(async); + await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(); AssertSql( """ @@ -206,9 +206,9 @@ WHERE [n].[FlagsEnum] & NULL > 0 """); } - public override async Task Bitwise_or(bool async) + public override async Task Bitwise_or() { - await base.Bitwise_or(async); + await base.Bitwise_or(); AssertSql( """ @@ -218,9 +218,9 @@ WHERE [b].[FlagsEnum] | 8 > 0 """); } - public override async Task Bitwise_projects_values_in_select(bool async) + public override async Task Bitwise_projects_values_in_select() { - await base.Bitwise_projects_values_in_select(async); + await base.Bitwise_projects_values_in_select(); AssertSql( """ @@ -230,9 +230,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task HasFlag(bool async) + public override async Task HasFlag() { - await base.HasFlag(async); + await base.HasFlag(); AssertSql( """ @@ -272,9 +272,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task HasFlag_with_non_nullable_parameter(bool async) + public override async Task HasFlag_with_non_nullable_parameter() { - await base.HasFlag_with_non_nullable_parameter(async); + await base.HasFlag_with_non_nullable_parameter(); AssertSql( """ @@ -286,9 +286,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task HasFlag_with_nullable_parameter(bool async) + public override async Task HasFlag_with_nullable_parameter() { - await base.HasFlag_with_nullable_parameter(async); + await base.HasFlag_with_nullable_parameter(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/GuidTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/GuidTranslationsSqlServerTest.cs index 065bebf70b3..d06da363f66 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/GuidTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/GuidTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public GuidTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture, IT Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task New_with_constant(bool async) + public override async Task New_with_constant() { - await base.New_with_constant(async); + await base.New_with_constant(); AssertSql( """ @@ -24,9 +24,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task New_with_parameter(bool async) + public override async Task New_with_parameter() { - await base.New_with_parameter(async); + await base.New_with_parameter(); AssertSql( """ @@ -38,9 +38,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task ToString_projection(bool async) + public override async Task ToString_projection() { - await base.ToString_projection(async); + await base.ToString_projection(); AssertSql( """ @@ -49,9 +49,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task NewGuid(bool async) + public override async Task NewGuid() { - await base.NewGuid(async); + await base.NewGuid(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServer160Test.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServer160Test.cs index 734578820f2..46206ba1f03 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServer160Test.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServer160Test.cs @@ -13,9 +13,9 @@ public MathTranslationsSqlServer160Test(BasicTypesQuerySqlServer160Fixture fixtu Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Max(bool async) + public override async Task Max() { - await base.Max(async); + await base.Max(); AssertSql( """ @@ -25,9 +25,9 @@ WHERE GREATEST([b].[Int], [b].[Short] - CAST(3 AS smallint)) = [b].[Int] """); } - public override async Task Max_nested(bool async) + public override async Task Max_nested() { - await base.Max_nested(async); + await base.Max_nested(); AssertSql( """ @@ -37,9 +37,9 @@ WHERE GREATEST([b].[Short] - CAST(3 AS smallint), [b].[Int], 1) = [b].[Int] """); } - public override async Task Max_nested_twice(bool async) + public override async Task Max_nested_twice() { - await base.Max_nested_twice(async); + await base.Max_nested_twice(); AssertSql( """ @@ -49,9 +49,9 @@ WHERE GREATEST(1, [b].[Int], 2, [b].[Short] - CAST(3 AS smallint)) = [b].[Int] """); } - public override async Task Min(bool async) + public override async Task Min() { - await base.Min(async); + await base.Min(); AssertSql( """ @@ -61,9 +61,9 @@ WHERE LEAST([b].[Int], [b].[Short] + CAST(3 AS smallint)) = [b].[Int] """); } - public override async Task Min_nested(bool async) + public override async Task Min_nested() { - await base.Min_nested(async); + await base.Min_nested(); AssertSql( """ @@ -73,9 +73,9 @@ WHERE LEAST([b].[Short] + CAST(3 AS smallint), [b].[Int], 99999) = [b].[Int] """); } - public override async Task Min_nested_twice(bool async) + public override async Task Min_nested_twice() { - await base.Min_nested_twice(async); + await base.Min_nested_twice(); AssertSql( """ @@ -85,27 +85,27 @@ WHERE LEAST(99999, [b].[Int], 99998, [b].[Short] + CAST(3 AS smallint)) = [b].[I """); } - public override async Task Log2(bool async) - => await AssertTranslationFailed(() => base.Log2(async)); + public override async Task Log2() + => await AssertTranslationFailed(() => base.Log2()); - public override async Task Acosh(bool async) - => await AssertTranslationFailed(() => base.Acosh(async)); + public override async Task Acosh() + => await AssertTranslationFailed(() => base.Acosh()); - public override async Task Asinh(bool async) - => await AssertTranslationFailed(() => base.Asinh(async)); + public override async Task Asinh() + => await AssertTranslationFailed(() => base.Asinh()); - public override async Task Atanh(bool async) - => await AssertTranslationFailed(() => base.Atanh(async)); + public override async Task Atanh() + => await AssertTranslationFailed(() => base.Atanh()); - public override async Task Cosh(bool async) - => await AssertTranslationFailed(() => base.Cosh(async)); + public override async Task Cosh() + => await AssertTranslationFailed(() => base.Cosh()); - public override async Task Sinh(bool async) - => await AssertTranslationFailed(() => base.Sinh(async)); + public override async Task Sinh() + => await AssertTranslationFailed(() => base.Sinh()); - public override async Task Tan(bool async) + public override async Task Tan() { - await base.Tan(async); + await base.Tan(); AssertSql( """ @@ -115,9 +115,9 @@ WHERE TAN([b].[Double]) > 0.0E0 """); } - public override async Task Tan_float(bool async) + public override async Task Tan_float() { - await base.Tan_float(async); + await base.Tan_float(); AssertSql( """ @@ -127,8 +127,8 @@ WHERE TAN([b].[Float]) > CAST(0 AS real) """); } - public override async Task Tanh(bool async) - => await AssertTranslationFailed(() => base.Tanh(async)); + public override async Task Tanh() + => await AssertTranslationFailed(() => base.Tanh()); private void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServerTest.cs index 706ad7dfea2..fa6d9c95a1c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MathTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public MathTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture, IT Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Abs_decimal(bool async) + public override async Task Abs_decimal() { - await base.Abs_decimal(async); + await base.Abs_decimal(); AssertSql( """ @@ -24,9 +24,9 @@ WHERE ABS([b].[Decimal]) = 9.5 """); } - public override async Task Abs_int(bool async) + public override async Task Abs_int() { - await base.Abs_int(async); + await base.Abs_int(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE ABS([b].[Int]) = 9 """); } - public override async Task Abs_double(bool async) + public override async Task Abs_double() { - await base.Abs_double(async); + await base.Abs_double(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE ABS([b].[Double]) = 9.5E0 """); } - public override async Task Abs_float(bool async) + public override async Task Abs_float() { - await base.Abs_float(async); + await base.Abs_float(); AssertSql( """ @@ -60,9 +60,9 @@ WHERE CAST(ABS([b].[Float]) AS float) = 9.5E0 """); } - public override async Task Ceiling(bool async) + public override async Task Ceiling() { - await base.Ceiling(async); + await base.Ceiling(); AssertSql( """ @@ -72,9 +72,9 @@ WHERE CEILING([b].[Double]) = 9.0E0 """); } - public override async Task Ceiling_float(bool async) + public override async Task Ceiling_float() { - await base.Ceiling_float(async); + await base.Ceiling_float(); AssertSql( """ @@ -84,9 +84,9 @@ WHERE CEILING([b].[Float]) = CAST(9 AS real) """); } - public override async Task Floor_decimal(bool async) + public override async Task Floor_decimal() { - await base.Floor_decimal(async); + await base.Floor_decimal(); AssertSql( """ @@ -96,9 +96,9 @@ WHERE FLOOR([b].[Decimal]) = 8.0 """); } - public override async Task Floor_double(bool async) + public override async Task Floor_double() { - await base.Floor_double(async); + await base.Floor_double(); AssertSql( """ @@ -108,9 +108,9 @@ WHERE FLOOR([b].[Double]) = 8.0E0 """); } - public override async Task Floor_float(bool async) + public override async Task Floor_float() { - await base.Floor_float(async); + await base.Floor_float(); AssertSql( """ @@ -120,9 +120,9 @@ WHERE FLOOR([b].[Float]) = CAST(8 AS real) """); } - public override async Task Power(bool async) + public override async Task Power() { - await base.Power(async); + await base.Power(); AssertSql( """ @@ -132,9 +132,9 @@ WHERE POWER(CAST([b].[Int] AS float), 2.0E0) = 64.0E0 """); } - public override async Task Power_float(bool async) + public override async Task Power_float() { - await base.Power_float(async); + await base.Power_float(); AssertSql( """ @@ -144,9 +144,9 @@ WHERE POWER([b].[Float], CAST(2 AS real)) > CAST(73 AS real) AND POWER([b].[Floa """); } - public override async Task Round_decimal(bool async) + public override async Task Round_decimal() { - await base.Round_decimal(async); + await base.Round_decimal(); AssertSql( """ @@ -161,9 +161,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Round_double(bool async) + public override async Task Round_double() { - await base.Round_double(async); + await base.Round_double(); AssertSql( """ @@ -178,9 +178,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Round_float(bool async) + public override async Task Round_float() { - await base.Round_float(async); + await base.Round_float(); AssertSql( """ @@ -195,9 +195,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Round_with_digits_decimal(bool async) + public override async Task Round_with_digits_decimal() { - await base.Round_with_digits_decimal(async); + await base.Round_with_digits_decimal(); AssertSql( """ @@ -207,9 +207,9 @@ WHERE ROUND([b].[Decimal], 1) = 255.1 """); } - public override async Task Round_with_digits_double(bool async) + public override async Task Round_with_digits_double() { - await base.Round_with_digits_double(async); + await base.Round_with_digits_double(); AssertSql( """ @@ -219,9 +219,9 @@ WHERE ROUND([b].[Double], 1) = 255.09999999999999E0 """); } - public override async Task Round_with_digits_float(bool async) + public override async Task Round_with_digits_float() { - await base.Round_with_digits_float(async); + await base.Round_with_digits_float(); AssertSql( """ @@ -231,9 +231,9 @@ WHERE ROUND(CAST([b].[Float] AS float), 1) = 255.09999999999999E0 """); } - public override async Task Truncate_decimal(bool async) + public override async Task Truncate_decimal() { - await base.Truncate_decimal(async); + await base.Truncate_decimal(); AssertSql( """ @@ -248,9 +248,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Truncate_double(bool async) + public override async Task Truncate_double() { - await base.Truncate_double(async); + await base.Truncate_double(); AssertSql( """ @@ -265,9 +265,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Truncate_float(bool async) + public override async Task Truncate_float() { - await base.Truncate_float(async); + await base.Truncate_float(); AssertSql( """ @@ -282,9 +282,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Truncate_project_and_order_by_it_twice(bool async) + public override async Task Truncate_project_and_order_by_it_twice() { - await base.Truncate_project_and_order_by_it_twice(async); + await base.Truncate_project_and_order_by_it_twice(); AssertSql( """ @@ -300,9 +300,9 @@ ORDER BY ROUND([b].[Double], 0, 1) //FROM [Orders] AS [o] //WHERE [o].[OrderID] < 10250 //ORDER BY [A]"); - public override async Task Truncate_project_and_order_by_it_twice2(bool async) + public override async Task Truncate_project_and_order_by_it_twice2() { - await base.Truncate_project_and_order_by_it_twice2(async); + await base.Truncate_project_and_order_by_it_twice2(); AssertSql( """ @@ -318,9 +318,9 @@ ORDER BY ROUND([b].[Double], 0, 1) DESC //FROM [Orders] AS [o] //WHERE [o].[OrderID] < 10250 //ORDER BY [A] DESC"); - public override async Task Truncate_project_and_order_by_it_twice3(bool async) + public override async Task Truncate_project_and_order_by_it_twice3() { - await base.Truncate_project_and_order_by_it_twice3(async); + await base.Truncate_project_and_order_by_it_twice3(); AssertSql( """ @@ -330,9 +330,9 @@ ORDER BY ROUND([b].[Double], 0, 1) DESC """); } - public override async Task Exp(bool async) + public override async Task Exp() { - await base.Exp(async); + await base.Exp(); AssertSql( """ @@ -342,9 +342,9 @@ WHERE EXP([b].[Double]) > 1.0E0 """); } - public override async Task Exp_float(bool async) + public override async Task Exp_float() { - await base.Exp_float(async); + await base.Exp_float(); AssertSql( """ @@ -354,9 +354,9 @@ WHERE EXP([b].[Float]) > CAST(1 AS real) """); } - public override async Task Log(bool async) + public override async Task Log() { - await base.Log(async); + await base.Log(); AssertSql( """ @@ -366,9 +366,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log_float(bool async) + public override async Task Log_float() { - await base.Log_float(async); + await base.Log_float(); AssertSql( """ @@ -378,9 +378,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log_with_newBase(bool async) + public override async Task Log_with_newBase() { - await base.Log_with_newBase(async); + await base.Log_with_newBase(); AssertSql( """ @@ -390,9 +390,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log_with_newBase_float(bool async) + public override async Task Log_with_newBase_float() { - await base.Log_with_newBase_float(async); + await base.Log_with_newBase_float(); AssertSql( """ @@ -402,9 +402,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log10(bool async) + public override async Task Log10() { - await base.Log10(async); + await base.Log10(); AssertSql( """ @@ -414,9 +414,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log10_float(bool async) + public override async Task Log10_float() { - await base.Log10_float(async); + await base.Log10_float(); AssertSql( """ @@ -426,12 +426,12 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Log2(bool async) - => await AssertTranslationFailed(() => base.Log2(async)); + public override async Task Log2() + => await AssertTranslationFailed(() => base.Log2()); - public override async Task Sqrt(bool async) + public override async Task Sqrt() { - await base.Sqrt(async); + await base.Sqrt(); AssertSql( """ @@ -441,9 +441,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Sqrt_float(bool async) + public override async Task Sqrt_float() { - await base.Sqrt_float(async); + await base.Sqrt_float(); AssertSql( """ @@ -453,9 +453,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Sign(bool async) + public override async Task Sign() { - await base.Sign(async); + await base.Sign(); AssertSql( """ @@ -465,9 +465,9 @@ WHERE SIGN([b].[Double]) > 0 """); } - public override async Task Sign_float(bool async) + public override async Task Sign_float() { - await base.Sign_float(async); + await base.Sign_float(); AssertSql( """ @@ -477,27 +477,27 @@ WHERE SIGN([b].[Float]) > 0 """); } - public override Task Max(bool async) - => AssertTranslationFailed(() => base.Max(async)); + public override Task Max() + => AssertTranslationFailed(() => base.Max()); - public override Task Max_nested(bool async) - => AssertTranslationFailed(() => base.Max_nested(async)); + public override Task Max_nested() + => AssertTranslationFailed(() => base.Max_nested()); - public override Task Max_nested_twice(bool async) - => AssertTranslationFailed(() => base.Max_nested_twice(async)); + public override Task Max_nested_twice() + => AssertTranslationFailed(() => base.Max_nested_twice()); - public override Task Min(bool async) - => AssertTranslationFailed(() => base.Min(async)); + public override Task Min() + => AssertTranslationFailed(() => base.Min()); - public override Task Min_nested(bool async) - => AssertTranslationFailed(() => base.Min_nested(async)); + public override Task Min_nested() + => AssertTranslationFailed(() => base.Min_nested()); - public override Task Min_nested_twice(bool async) - => AssertTranslationFailed(() => base.Min_nested_twice(async)); + public override Task Min_nested_twice() + => AssertTranslationFailed(() => base.Min_nested_twice()); - public override async Task Degrees(bool async) + public override async Task Degrees() { - await base.Degrees(async); + await base.Degrees(); AssertSql( """ @@ -507,9 +507,9 @@ WHERE DEGREES([b].[Double]) > 0.0E0 """); } - public override async Task Degrees_float(bool async) + public override async Task Degrees_float() { - await base.Degrees_float(async); + await base.Degrees_float(); AssertSql( """ @@ -519,9 +519,9 @@ WHERE DEGREES([b].[Float]) > CAST(0 AS real) """); } - public override async Task Radians(bool async) + public override async Task Radians() { - await base.Radians(async); + await base.Radians(); AssertSql( """ @@ -531,9 +531,9 @@ WHERE RADIANS([b].[Double]) > 0.0E0 """); } - public override async Task Radians_float(bool async) + public override async Task Radians_float() { - await base.Radians_float(async); + await base.Radians_float(); AssertSql( """ @@ -545,9 +545,9 @@ WHERE RADIANS([b].[Float]) > CAST(0 AS real) #region Trigonometry - public override async Task Acos(bool async) + public override async Task Acos() { - await base.Acos(async); + await base.Acos(); AssertSql( """ @@ -557,9 +557,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Acos_float(bool async) + public override async Task Acos_float() { - await base.Acos_float(async); + await base.Acos_float(); AssertSql( """ @@ -569,12 +569,12 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Acosh(bool async) - => await AssertTranslationFailed(() => base.Acosh(async)); + public override async Task Acosh() + => await AssertTranslationFailed(() => base.Acosh()); - public override async Task Asin(bool async) + public override async Task Asin() { - await base.Asin(async); + await base.Asin(); AssertSql( """ @@ -584,9 +584,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Asin_float(bool async) + public override async Task Asin_float() { - await base.Asin_float(async); + await base.Asin_float(); AssertSql( """ @@ -596,12 +596,12 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Asinh(bool async) - => await AssertTranslationFailed(() => base.Asinh(async)); + public override async Task Asinh() + => await AssertTranslationFailed(() => base.Asinh()); - public override async Task Atan(bool async) + public override async Task Atan() { - await base.Atan(async); + await base.Atan(); AssertSql( """ @@ -611,9 +611,9 @@ WHERE ATAN([b].[Double]) > 0.0E0 """); } - public override async Task Atan_float(bool async) + public override async Task Atan_float() { - await base.Atan_float(async); + await base.Atan_float(); AssertSql( """ @@ -623,12 +623,12 @@ WHERE ATAN([b].[Float]) > CAST(0 AS real) """); } - public override async Task Atanh(bool async) - => await AssertTranslationFailed(() => base.Atanh(async)); + public override async Task Atanh() + => await AssertTranslationFailed(() => base.Atanh()); - public override async Task Atan2(bool async) + public override async Task Atan2() { - await base.Atan2(async); + await base.Atan2(); AssertSql( """ @@ -638,9 +638,9 @@ WHERE ATN2([b].[Double], 1.0E0) > 0.0E0 """); } - public override async Task Atan2_float(bool async) + public override async Task Atan2_float() { - await base.Atan2_float(async); + await base.Atan2_float(); AssertSql( """ @@ -650,9 +650,9 @@ WHERE ATN2([b].[Float], CAST(1 AS real)) > CAST(0 AS real) """); } - public override async Task Cos(bool async) + public override async Task Cos() { - await base.Cos(async); + await base.Cos(); AssertSql( """ @@ -662,9 +662,9 @@ WHERE COS([b].[Double]) > 0.0E0 """); } - public override async Task Cos_float(bool async) + public override async Task Cos_float() { - await base.Cos_float(async); + await base.Cos_float(); AssertSql( """ @@ -674,12 +674,12 @@ WHERE COS([b].[Float]) > CAST(0 AS real) """); } - public override async Task Cosh(bool async) - => await AssertTranslationFailed(() => base.Cosh(async)); + public override async Task Cosh() + => await AssertTranslationFailed(() => base.Cosh()); - public override async Task Sin(bool async) + public override async Task Sin() { - await base.Sin(async); + await base.Sin(); AssertSql( """ @@ -689,9 +689,9 @@ WHERE SIN([b].[Double]) > 0.0E0 """); } - public override async Task Sin_float(bool async) + public override async Task Sin_float() { - await base.Sin_float(async); + await base.Sin_float(); AssertSql( """ @@ -701,12 +701,12 @@ WHERE SIN([b].[Float]) > CAST(0 AS real) """); } - public override async Task Sinh(bool async) - => await AssertTranslationFailed(() => base.Sinh(async)); + public override async Task Sinh() + => await AssertTranslationFailed(() => base.Sinh()); - public override async Task Tan(bool async) + public override async Task Tan() { - await base.Tan(async); + await base.Tan(); AssertSql( """ @@ -716,9 +716,9 @@ WHERE TAN([b].[Double]) > 0.0E0 """); } - public override async Task Tan_float(bool async) + public override async Task Tan_float() { - await base.Tan_float(async); + await base.Tan_float(); AssertSql( """ @@ -728,8 +728,8 @@ WHERE TAN([b].[Float]) > CAST(0 AS real) """); } - public override async Task Tanh(bool async) - => await AssertTranslationFailed(() => base.Tanh(async)); + public override async Task Tanh() + => await AssertTranslationFailed(() => base.Tanh()); #endregion Trigonometry diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqlServerTest.cs index 893a2bdc36c..e756f06cd50 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqlServerTest.cs @@ -14,9 +14,9 @@ public MiscellaneousTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fi #region Random - public override async Task Random_on_EF_Functions(bool async) + public override async Task Random_on_EF_Functions() { - await base.Random_on_EF_Functions(async); + await base.Random_on_EF_Functions(); AssertSql( """ @@ -26,44 +26,44 @@ WHERE RAND() >= 0.0E0 AND RAND() < 1.0E0 """); } - public override async Task Random_Shared_Next_with_no_args(bool async) + public override async Task Random_Shared_Next_with_no_args() { - await base.Random_Shared_Next_with_no_args(async); + await base.Random_Shared_Next_with_no_args(); AssertSql(); } - public override async Task Random_Shared_Next_with_one_arg(bool async) + public override async Task Random_Shared_Next_with_one_arg() { - await base.Random_Shared_Next_with_one_arg(async); + await base.Random_Shared_Next_with_one_arg(); AssertSql(); } - public override async Task Random_Shared_Next_with_two_args(bool async) + public override async Task Random_Shared_Next_with_two_args() { - await base.Random_Shared_Next_with_two_args(async); + await base.Random_Shared_Next_with_two_args(); AssertSql(); } - public override async Task Random_new_Next_with_no_args(bool async) + public override async Task Random_new_Next_with_no_args() { - await base.Random_new_Next_with_no_args(async); + await base.Random_new_Next_with_no_args(); AssertSql(); } - public override async Task Random_new_Next_with_one_arg(bool async) + public override async Task Random_new_Next_with_one_arg() { - await base.Random_new_Next_with_one_arg(async); + await base.Random_new_Next_with_one_arg(); AssertSql(); } - public override async Task Random_new_Next_with_two_args(bool async) + public override async Task Random_new_Next_with_two_args() { - await base.Random_new_Next_with_two_args(async); + await base.Random_new_Next_with_two_args(); AssertSql(); } @@ -72,9 +72,9 @@ public override async Task Random_new_Next_with_two_args(bool async) #region Convert - public override async Task Convert_ToBoolean(bool async) + public override async Task Convert_ToBoolean() { - await base.Convert_ToBoolean(async); + await base.Convert_ToBoolean(); AssertSql( """ @@ -132,9 +132,9 @@ WHERE CONVERT(bit, [b].[Int]) = CAST(1 AS bit) """); } - public override async Task Convert_ToByte(bool async) + public override async Task Convert_ToByte() { - await base.Convert_ToByte(async); + await base.Convert_ToByte(); AssertSql( """ @@ -198,9 +198,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Convert_ToDecimal(bool async) + public override async Task Convert_ToDecimal() { - await base.Convert_ToDecimal(async); + await base.Convert_ToDecimal(); AssertSql( """ @@ -264,9 +264,9 @@ WHERE CONVERT(decimal(18, 2), [b].[Int]) = 8.0 """); } - public override async Task Convert_ToDouble(bool async) + public override async Task Convert_ToDouble() { - await base.Convert_ToDouble(async); + await base.Convert_ToDouble(); AssertSql( """ @@ -330,9 +330,9 @@ WHERE CONVERT(float, [b].[Int]) = 8.0E0 """); } - public override async Task Convert_ToInt16(bool async) + public override async Task Convert_ToInt16() { - await base.Convert_ToInt16(async); + await base.Convert_ToInt16(); AssertSql( """ @@ -396,9 +396,9 @@ WHERE CONVERT(smallint, [b].[Int]) = CAST(12 AS smallint) """); } - public override async Task Convert_ToInt32(bool async) + public override async Task Convert_ToInt32() { - await base.Convert_ToInt32(async); + await base.Convert_ToInt32(); AssertSql( """ @@ -462,9 +462,9 @@ WHERE CONVERT(int, [b].[Int]) = 12 """); } - public override async Task Convert_ToInt64(bool async) + public override async Task Convert_ToInt64() { - await base.Convert_ToInt64(async); + await base.Convert_ToInt64(); AssertSql( """ @@ -528,9 +528,9 @@ WHERE CONVERT(bigint, [b].[Int]) = CAST(12 AS bigint) """); } - public override async Task Convert_ToString(bool async) + public override async Task Convert_ToString() { - await base.Convert_ToString(async); + await base.Convert_ToString(); AssertSql( """ @@ -604,9 +604,9 @@ WHERE CONVERT(nvarchar(max), [b].[DateTime]) LIKE N'%1998%' #region Compare - public override async Task Int_Compare_to_simple_zero(bool async) + public override async Task Int_Compare_to_simple_zero() { - await base.Int_Compare_to_simple_zero(async); + await base.Int_Compare_to_simple_zero(); AssertSql( """ @@ -658,9 +658,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task DateTime_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task DateTime_Compare_to_simple_zero(bool compareTo) { - await base.DateTime_Compare_to_simple_zero(async, compareTo); + await base.DateTime_Compare_to_simple_zero(compareTo); AssertSql( """ @@ -712,9 +712,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task TimeSpan_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task TimeSpan_Compare_to_simple_zero(bool compareTo) { - await base.TimeSpan_Compare_to_simple_zero(async, compareTo); + await base.TimeSpan_Compare_to_simple_zero(compareTo); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqlServerTest.cs index 0d576385dec..e833e0b9c3c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public ArithmeticOperatorTranslationsSqlServerTest(BasicTypesQuerySqlServerFixtu Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Add(bool async) + public override async Task Add() { - await base.Add(async); + await base.Add(); AssertSql( """ @@ -24,9 +24,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Subtract(bool async) + public override async Task Subtract() { - await base.Subtract(async); + await base.Subtract(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Multiply(bool async) + public override async Task Multiply() { - await base.Multiply(async); + await base.Multiply(); AssertSql( """ @@ -48,9 +48,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Modulo(bool async) + public override async Task Modulo() { - await base.Modulo(async); + await base.Modulo(); AssertSql( """ @@ -60,9 +60,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Minus(bool async) + public override async Task Minus() { - await base.Minus(async); + await base.Minus(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqlServerTest.cs index b079161dcc2..5ccc529caf9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public BitwiseOperatorTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Or(bool async) + public override async Task Or() { - await base.Or(async); + await base.Or(); AssertSql( """ @@ -29,9 +29,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or_over_boolean(bool async) + public override async Task Or_over_boolean() { - await base.Or_over_boolean(async); + await base.Or_over_boolean(); AssertSql( """ @@ -49,9 +49,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or_multiple(bool async) + public override async Task Or_multiple() { - await base.Or_multiple(async); + await base.Or_multiple(); AssertSql( """ @@ -61,9 +61,9 @@ WHERE CAST([b].[Int] | [b].[Short] AS bigint) | [b].[Long] = CAST(7 AS bigint) """); } - public override async Task And(bool async) + public override async Task And() { - await base.And(async); + await base.And(); AssertSql( """ @@ -78,9 +78,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task And_over_boolean(bool async) + public override async Task And_over_boolean() { - await base.And_over_boolean(async); + await base.And_over_boolean(); AssertSql( """ @@ -98,9 +98,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Xor(bool async) + public override async Task Xor() { - await base.Xor(async); + await base.Xor(); AssertSql( """ @@ -115,9 +115,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Xor_over_boolean(bool async) + public override async Task Xor_over_boolean() { - await base.Xor_over_boolean(async); + await base.Xor_over_boolean(); AssertSql( """ @@ -130,9 +130,9 @@ ELSE CAST(0 AS bit) """); } - public override async Task Complement(bool async) + public override async Task Complement() { - await base.Complement(async); + await base.Complement(); AssertSql( """ @@ -142,9 +142,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task And_or_over_boolean(bool async) + public override async Task And_or_over_boolean() { - await base.And_or_over_boolean(async); + await base.And_or_over_boolean(); AssertSql( """ @@ -154,9 +154,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or_with_logical_or(bool async) + public override async Task Or_with_logical_or() { - await base.Or_with_logical_or(async); + await base.Or_with_logical_or(); AssertSql( """ @@ -166,9 +166,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task And_with_logical_and(bool async) + public override async Task And_with_logical_and() { - await base.And_with_logical_and(async); + await base.And_with_logical_and(); AssertSql( """ @@ -178,9 +178,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or_with_logical_and(bool async) + public override async Task Or_with_logical_and() { - await base.Or_with_logical_and(async); + await base.Or_with_logical_and(); AssertSql( """ @@ -190,9 +190,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task And_with_logical_or(bool async) + public override async Task And_with_logical_or() { - await base.And_with_logical_or(async); + await base.And_with_logical_or(); AssertSql( """ @@ -202,11 +202,11 @@ FROM [BasicTypesEntities] AS [b] """); } - public override Task Left_shift(bool async) - => AssertTranslationFailed(() => base.Left_shift(async)); + public override Task Left_shift() + => AssertTranslationFailed(() => base.Left_shift()); - public override Task Right_shift(bool async) - => AssertTranslationFailed(() => base.Right_shift(async)); + public override Task Right_shift() + => AssertTranslationFailed(() => base.Right_shift()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqlServerTest.cs index 56bf746c9f2..0cb5f2efdec 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public ComparisonOperatorTranslationsSqlServerTest(BasicTypesQuerySqlServerFixtu Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Equal(bool async) + public override async Task Equal() { - await base.Equal(async); + await base.Equal(); AssertSql( """ @@ -24,9 +24,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task NotEqual(bool async) + public override async Task NotEqual() { - await base.NotEqual(async); + await base.NotEqual(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE [b].[Int] <> 8 """); } - public override async Task GreaterThan(bool async) + public override async Task GreaterThan() { - await base.GreaterThan(async); + await base.GreaterThan(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE [b].[Int] > 8 """); } - public override async Task GreaterThanOrEqual(bool async) + public override async Task GreaterThanOrEqual() { - await base.GreaterThanOrEqual(async); + await base.GreaterThanOrEqual(); AssertSql( """ @@ -60,9 +60,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task LessThan(bool async) + public override async Task LessThan() { - await base.LessThan(async); + await base.LessThan(); AssertSql( """ @@ -72,9 +72,9 @@ WHERE [b].[Int] < 8 """); } - public override async Task LessThanOrEqual(bool async) + public override async Task LessThanOrEqual() { - await base.LessThanOrEqual(async); + await base.LessThanOrEqual(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsSqlServerTest.cs index eddc09fc89f..a890749f1e4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public LogicalOperatorTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task And(bool async) + public override async Task And() { - await base.And(async); + await base.And(); AssertSql( """ @@ -24,9 +24,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task And_with_bool_property(bool async) + public override async Task And_with_bool_property() { - await base.And_with_bool_property(async); + await base.And_with_bool_property(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or(bool async) + public override async Task Or() { - await base.Or(async); + await base.Or(); AssertSql( """ @@ -48,9 +48,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Or_with_bool_property(bool async) + public override async Task Or_with_bool_property() { - await base.Or_with_bool_property(async); + await base.Or_with_bool_property(); AssertSql( """ @@ -60,9 +60,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Not(bool async) + public override async Task Not() { - await base.Not(async); + await base.Not(); AssertSql( """ @@ -72,9 +72,9 @@ WHERE [b].[Int] <> 999 """); } - public override async Task Not_with_bool_property(bool async) + public override async Task Not_with_bool_property() { - await base.Not_with_bool_property(async); + await base.Not_with_bool_property(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqlServerTest.cs index 4418fc857b8..f54135b2b4d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public MiscellaneousOperatorTranslationsSqlServerTest(BasicTypesQuerySqlServerFi Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Conditional(bool async) + public override async Task Conditional() { - await base.Conditional(async); + await base.Conditional(); AssertSql( """ @@ -27,9 +27,9 @@ ELSE N'Foo' """); } - public override async Task Coalesce(bool async) + public override async Task Coalesce() { - await base.Coalesce(async); + await base.Coalesce(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServer160Test.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServer160Test.cs index 12e165a9be4..2a1b30d5ad3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServer160Test.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServer160Test.cs @@ -19,9 +19,9 @@ public StringTranslationsSqlServer160Test(BasicTypesQuerySqlServer160Fixture fix protected override bool IsCaseSensitive => false; - public override async Task TrimStart_with_char_argument(bool async) + public override async Task TrimStart_with_char_argument() { - await base.TrimStart_with_char_argument(async); + await base.TrimStart_with_char_argument(); AssertSql( """ @@ -31,9 +31,9 @@ WHERE LTRIM([b].[String], N'S') = N'eattle' """); } - public override async Task TrimStart_with_char_array_argument(bool async) + public override async Task TrimStart_with_char_array_argument() { - await base.TrimStart_with_char_array_argument(async); + await base.TrimStart_with_char_array_argument(); AssertSql( """ @@ -43,9 +43,9 @@ WHERE LTRIM([b].[String], N'Se') = N'attle' """); } - public override async Task TrimEnd_with_char_argument(bool async) + public override async Task TrimEnd_with_char_argument() { - await base.TrimEnd_with_char_argument(async); + await base.TrimEnd_with_char_argument(); AssertSql( """ @@ -55,9 +55,9 @@ WHERE RTRIM([b].[String], N'e') = N'Seattl' """); } - public override async Task TrimEnd_with_char_array_argument(bool async) + public override async Task TrimEnd_with_char_array_argument() { - await base.TrimEnd_with_char_array_argument(async); + await base.TrimEnd_with_char_array_argument(); AssertSql( """ @@ -67,12 +67,11 @@ WHERE RTRIM([b].[String], N'le') = N'Seatt' """); } - public override async Task EndsWith_Column(bool async) + public override async Task EndsWith_Column() { // SQL Server trims trailing whitespace for length calculations, making our EndsWith() column translation not work reliably in that // case await AssertQuery( - async, ss => ss.Set().Where(b => b.String == "Seattle" && b.String.EndsWith(b.String))); AssertSql( @@ -83,27 +82,27 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Trim_with_char_argument_in_predicate(bool async) + public override async Task Trim_with_char_argument_in_predicate() { // String.Trim with parameters. Issue #22927. - await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate()); AssertSql(); } - public override async Task Trim_with_char_array_argument_in_predicate(bool async) + public override async Task Trim_with_char_array_argument_in_predicate() { // String.Trim with parameters. Issue #22927. - await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate()); AssertSql(); } - public override Task Regex_IsMatch(bool async) - => AssertTranslationFailed(() => base.Regex_IsMatch(async)); + public override Task Regex_IsMatch() + => AssertTranslationFailed(() => base.Regex_IsMatch()); - public override Task Regex_IsMatch_constant_input(bool async) - => AssertTranslationFailed(() => base.Regex_IsMatch_constant_input(async)); + public override Task Regex_IsMatch_constant_input() + => AssertTranslationFailed(() => base.Regex_IsMatch_constant_input()); private void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs index 3681a4e4f55..b0ef62dab70 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs @@ -19,9 +19,9 @@ protected override bool IsCaseSensitive #region Equals - public override async Task Equals(bool async) + public override async Task Equals() { - await base.Equals(async); + await base.Equals(); AssertSql( """ @@ -31,23 +31,23 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Equals_with_OrdinalIgnoreCase(bool async) + public override async Task Equals_with_OrdinalIgnoreCase() { - await base.Equals_with_OrdinalIgnoreCase(async); + await base.Equals_with_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Equals_with_Ordinal(bool async) + public override async Task Equals_with_Ordinal() { - await base.Equals_with_Ordinal(async); + await base.Equals_with_Ordinal(); AssertSql(); } - public override async Task Static_Equals(bool async) + public override async Task Static_Equals() { - await base.Static_Equals(async); + await base.Static_Equals(); AssertSql( """ @@ -57,16 +57,16 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Static_Equals_with_OrdinalIgnoreCase(bool async) + public override async Task Static_Equals_with_OrdinalIgnoreCase() { - await base.Static_Equals_with_OrdinalIgnoreCase(async); + await base.Static_Equals_with_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Static_Equals_with_Ordinal(bool async) + public override async Task Static_Equals_with_Ordinal() { - await base.Static_Equals_with_Ordinal(async); + await base.Static_Equals_with_Ordinal(); AssertSql(); } @@ -75,9 +75,9 @@ public override async Task Static_Equals_with_Ordinal(bool async) #region Miscellaneous - public override async Task Length(bool async) + public override async Task Length() { - await base.Length(async); + await base.Length(); AssertSql( """ @@ -87,9 +87,9 @@ WHERE CAST(LEN([b].[String]) AS int) = 7 """); } - public override async Task ToUpper(bool async) + public override async Task ToUpper() { - await base.ToUpper(async); + await base.ToUpper(); AssertSql( """ @@ -104,9 +104,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task ToLower(bool async) + public override async Task ToLower() { - await base.ToLower(async); + await base.ToLower(); AssertSql( """ @@ -125,9 +125,9 @@ FROM [BasicTypesEntities] AS [b] #region IndexOf - public override async Task IndexOf(bool async) + public override async Task IndexOf() { - await base.IndexOf(async); + await base.IndexOf(); AssertSql( """ @@ -137,9 +137,9 @@ WHERE CAST(CHARINDEX(N'Eattl', [b].[String]) AS int) - 1 <> -1 """); } - public override async Task IndexOf_Char(bool async) + public override async Task IndexOf_Char() { - await base.IndexOf_Char(async); + await base.IndexOf_Char(); AssertSql( """ @@ -149,9 +149,9 @@ WHERE CAST(CHARINDEX('e', [b].[String]) AS int) - 1 <> -1 """); } - public override async Task IndexOf_with_empty_string(bool async) + public override async Task IndexOf_with_empty_string() { - await base.IndexOf_with_empty_string(async); + await base.IndexOf_with_empty_string(); AssertSql( """ @@ -160,9 +160,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task IndexOf_with_one_parameter_arg(bool async) + public override async Task IndexOf_with_one_parameter_arg() { - await base.IndexOf_with_one_parameter_arg(async); + await base.IndexOf_with_one_parameter_arg(); AssertSql( """ @@ -178,9 +178,9 @@ ELSE 1 } - public override async Task IndexOf_with_one_parameter_arg_char(bool async) + public override async Task IndexOf_with_one_parameter_arg_char() { - await base.IndexOf_with_one_parameter_arg_char(async); + await base.IndexOf_with_one_parameter_arg_char(); AssertSql( """ @@ -196,9 +196,9 @@ ELSE 1 } - public override async Task IndexOf_with_constant_starting_position(bool async) + public override async Task IndexOf_with_constant_starting_position() { - await base.IndexOf_with_constant_starting_position(async); + await base.IndexOf_with_constant_starting_position(); AssertSql( """ @@ -208,9 +208,9 @@ WHERE CAST(LEN([b].[String]) AS int) > 2 AND CAST(CHARINDEX(N'e', [b].[String], """); } - public override async Task IndexOf_with_constant_starting_position_char(bool async) + public override async Task IndexOf_with_constant_starting_position_char() { - await base.IndexOf_with_constant_starting_position_char(async); + await base.IndexOf_with_constant_starting_position_char(); AssertSql( """ @@ -220,9 +220,9 @@ WHERE CAST(LEN([b].[String]) AS int) > 2 AND CAST(CHARINDEX('e', [b].[String], 3 """); } - public override async Task IndexOf_with_parameter_starting_position(bool async) + public override async Task IndexOf_with_parameter_starting_position() { - await base.IndexOf_with_parameter_starting_position(async); + await base.IndexOf_with_parameter_starting_position(); AssertSql( """ @@ -234,9 +234,9 @@ WHERE CAST(LEN([b].[String]) AS int) > 2 AND CAST(CHARINDEX(N'E', [b].[String], """); } - public override async Task IndexOf_with_parameter_starting_position_char(bool async) + public override async Task IndexOf_with_parameter_starting_position_char() { - await base.IndexOf_with_parameter_starting_position_char(async); + await base.IndexOf_with_parameter_starting_position_char(); AssertSql( """ @@ -248,9 +248,9 @@ WHERE CAST(LEN([b].[String]) AS int) > 2 AND CAST(CHARINDEX('e', [b].[String], @ """); } - public override async Task IndexOf_after_ToString(bool async) + public override async Task IndexOf_after_ToString() { - await base.IndexOf_after_ToString(async); + await base.IndexOf_after_ToString(); AssertSql( """ @@ -260,9 +260,9 @@ WHERE CHARINDEX('55', CONVERT(varchar(11), [b].[Int])) - 1 = 1 """); } - public override async Task IndexOf_over_ToString(bool async) + public override async Task IndexOf_over_ToString() { - await base.IndexOf_over_ToString(async); + await base.IndexOf_over_ToString(); AssertSql( """ @@ -279,9 +279,9 @@ ELSE 1 #region Replace - public override async Task Replace(bool async) + public override async Task Replace() { - await base.Replace(async); + await base.Replace(); AssertSql( """ @@ -291,9 +291,9 @@ WHERE REPLACE([b].[String], N'sea', N'rea') = N'reattle' """); } - public override async Task Replace_Char(bool async) + public override async Task Replace_Char() { - await base.Replace_Char(async); + await base.Replace_Char(); AssertSql( """ @@ -303,9 +303,9 @@ WHERE REPLACE([b].[String], 'S', 'R') = N'Reattle' """); } - public override async Task Replace_with_empty_string(bool async) + public override async Task Replace_with_empty_string() { - await base.Replace_with_empty_string(async); + await base.Replace_with_empty_string(); AssertSql( """ @@ -315,9 +315,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Replace_using_property_arguments(bool async) + public override async Task Replace_using_property_arguments() { - await base.Replace_using_property_arguments(async); + await base.Replace_using_property_arguments(); AssertSql( """ @@ -331,9 +331,9 @@ FROM [BasicTypesEntities] AS [b] #region Substring - public override async Task Substring(bool async) + public override async Task Substring() { - await base.Substring(async); + await base.Substring(); AssertSql( """ @@ -343,9 +343,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 3 AND SUBSTRING([b].[String], 1 + 1, 2) """); } - public override async Task Substring_with_one_arg_with_zero_startIndex(bool async) + public override async Task Substring_with_one_arg_with_zero_startIndex() { - await base.Substring_with_one_arg_with_zero_startIndex(async); + await base.Substring_with_one_arg_with_zero_startIndex(); AssertSql( """ @@ -355,9 +355,9 @@ WHERE SUBSTRING([b].[String], 0 + 1, LEN([b].[String])) = N'Seattle' """); } - public override async Task Substring_with_one_arg_with_constant(bool async) + public override async Task Substring_with_one_arg_with_constant() { - await base.Substring_with_one_arg_with_constant(async); + await base.Substring_with_one_arg_with_constant(); AssertSql( """ @@ -367,9 +367,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 1 AND SUBSTRING([b].[String], 1 + 1, LEN """); } - public override async Task Substring_with_one_arg_with_parameter(bool async) + public override async Task Substring_with_one_arg_with_parameter() { - await base.Substring_with_one_arg_with_parameter(async); + await base.Substring_with_one_arg_with_parameter(); AssertSql( """ @@ -381,9 +381,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 2 AND SUBSTRING([b].[String], @start + 1 """); } - public override async Task Substring_with_two_args_with_zero_startIndex(bool async) + public override async Task Substring_with_two_args_with_zero_startIndex() { - await base.Substring_with_two_args_with_zero_startIndex(async); + await base.Substring_with_two_args_with_zero_startIndex(); AssertSql( """ @@ -393,9 +393,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 3 AND SUBSTRING([b].[String], 0 + 1, 3) """); } - public override async Task Substring_with_two_args_with_zero_length(bool async) + public override async Task Substring_with_two_args_with_zero_length() { - await base.Substring_with_two_args_with_zero_length(async); + await base.Substring_with_two_args_with_zero_length(); AssertSql( """ @@ -405,9 +405,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 2 AND SUBSTRING([b].[String], 2 + 1, 0) """); } - public override async Task Substring_with_two_args_with_parameter(bool async) + public override async Task Substring_with_two_args_with_parameter() { - await base.Substring_with_two_args_with_parameter(async); + await base.Substring_with_two_args_with_parameter(); AssertSql( """ @@ -419,9 +419,9 @@ WHERE CAST(LEN([b].[String]) AS int) >= 5 AND SUBSTRING([b].[String], @start + 1 """); } - public override async Task Substring_with_two_args_with_IndexOf(bool async) + public override async Task Substring_with_two_args_with_IndexOf() { - await base.Substring_with_two_args_with_IndexOf(async); + await base.Substring_with_two_args_with_IndexOf(); AssertSql( """ @@ -435,9 +435,9 @@ FROM [BasicTypesEntities] AS [b] #region IsNullOrEmpty/Whitespace - public override async Task IsNullOrEmpty(bool async) + public override async Task IsNullOrEmpty() { - await base.IsNullOrEmpty(async); + await base.IsNullOrEmpty(); AssertSql( """ @@ -455,9 +455,9 @@ FROM [NullableBasicTypesEntities] AS [n] """); } - public override async Task IsNullOrEmpty_negated(bool async) + public override async Task IsNullOrEmpty_negated() { - await base.IsNullOrEmpty_negated(async); + await base.IsNullOrEmpty_negated(); AssertSql( """ @@ -475,9 +475,9 @@ FROM [NullableBasicTypesEntities] AS [n] """); } - public override async Task IsNullOrWhiteSpace(bool async) + public override async Task IsNullOrWhiteSpace() { - await base.IsNullOrWhiteSpace(async); + await base.IsNullOrWhiteSpace(); AssertSql( """ @@ -491,9 +491,9 @@ FROM [BasicTypesEntities] AS [b] #region StartsWith - public override async Task StartsWith_Literal(bool async) + public override async Task StartsWith_Literal() { - await base.StartsWith_Literal(async); + await base.StartsWith_Literal(); AssertSql( """ @@ -503,9 +503,9 @@ WHERE [b].[String] LIKE N'se%' """); } - public override async Task StartsWith_Literal_Char(bool async) + public override async Task StartsWith_Literal_Char() { - await base.StartsWith_Literal_Char(async); + await base.StartsWith_Literal_Char(); AssertSql( """ @@ -515,9 +515,9 @@ WHERE [b].[String] LIKE N'S%' """); } - public override async Task StartsWith_Parameter(bool async) + public override async Task StartsWith_Parameter() { - await base.StartsWith_Parameter(async); + await base.StartsWith_Parameter(); AssertSql( """ @@ -529,9 +529,9 @@ WHERE [b].[String] LIKE @pattern_startswith ESCAPE N'\' """); } - public override async Task StartsWith_Parameter_Char(bool async) + public override async Task StartsWith_Parameter_Char() { - await base.StartsWith_Parameter_Char(async); + await base.StartsWith_Parameter_Char(); AssertSql( """ @@ -543,9 +543,9 @@ WHERE [b].[String] LIKE @pattern_startswith ESCAPE N'\' """); } - public override async Task StartsWith_Column(bool async) + public override async Task StartsWith_Column() { - await base.StartsWith_Column(async); + await base.StartsWith_Column(); AssertSql( """ @@ -555,23 +555,23 @@ WHERE LEFT([b].[String], LEN([b].[String])) = [b].[String] """); } - public override async Task StartsWith_with_StringComparison_Ordinal(bool async) + public override async Task StartsWith_with_StringComparison_Ordinal() { - await base.StartsWith_with_StringComparison_Ordinal(async); + await base.StartsWith_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task StartsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task StartsWith_with_StringComparison_OrdinalIgnoreCase() { - await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(async); + await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task StartsWith_with_StringComparison_unsupported(bool async) + public override async Task StartsWith_with_StringComparison_unsupported() { - await base.StartsWith_with_StringComparison_unsupported(async); + await base.StartsWith_with_StringComparison_unsupported(); AssertSql(); } @@ -580,9 +580,9 @@ public override async Task StartsWith_with_StringComparison_unsupported(bool asy #region EndsWith - public override async Task EndsWith_Literal(bool async) + public override async Task EndsWith_Literal() { - await base.EndsWith_Literal(async); + await base.EndsWith_Literal(); AssertSql( """ @@ -592,9 +592,9 @@ WHERE [b].[String] LIKE N'%Le' """); } - public override async Task EndsWith_Literal_Char(bool async) + public override async Task EndsWith_Literal_Char() { - await base.EndsWith_Literal_Char(async); + await base.EndsWith_Literal_Char(); AssertSql( """ @@ -604,9 +604,9 @@ WHERE [b].[String] LIKE N'%e' """); } - public override async Task EndsWith_Parameter(bool async) + public override async Task EndsWith_Parameter() { - await base.EndsWith_Parameter(async); + await base.EndsWith_Parameter(); AssertSql( """ @@ -618,9 +618,9 @@ WHERE [b].[String] LIKE @pattern_endswith ESCAPE N'\' """); } - public override async Task EndsWith_Parameter_Char(bool async) + public override async Task EndsWith_Parameter_Char() { - await base.EndsWith_Parameter_Char(async); + await base.EndsWith_Parameter_Char(); AssertSql( """ @@ -632,12 +632,11 @@ WHERE [b].[String] LIKE @pattern_endswith ESCAPE N'\' """); } - public override async Task EndsWith_Column(bool async) + public override async Task EndsWith_Column() { // SQL Server trims trailing whitespace for length calculations, making our EndsWith() column translation not work reliably in that // case await AssertQuery( - async, ss => ss.Set().Where(b => b.String == "Seattle" && b.String.EndsWith(b.String))); AssertSql( @@ -648,23 +647,23 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task EndsWith_with_StringComparison_Ordinal(bool async) + public override async Task EndsWith_with_StringComparison_Ordinal() { - await base.EndsWith_with_StringComparison_Ordinal(async); + await base.EndsWith_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task EndsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task EndsWith_with_StringComparison_OrdinalIgnoreCase() { - await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(async); + await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task EndsWith_with_StringComparison_unsupported(bool async) + public override async Task EndsWith_with_StringComparison_unsupported() { - await base.EndsWith_with_StringComparison_unsupported(async); + await base.EndsWith_with_StringComparison_unsupported(); AssertSql(); } @@ -673,10 +672,9 @@ public override async Task EndsWith_with_StringComparison_unsupported(bool async #region Contains - public override async Task Contains_Literal(bool async) + public override async Task Contains_Literal() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains("eattl")), // SQL Server is case-insensitive by default ss => ss.Set().Where(c => c.String.Contains("eattl", StringComparison.OrdinalIgnoreCase))); @@ -688,10 +686,9 @@ WHERE [b].[String] LIKE N'%eattl%' """); } - public override async Task Contains_Literal_Char(bool async) + public override async Task Contains_Literal_Char() { await AssertQuery( - async, ss => ss.Set().Where(c => c.String.Contains('e'))); AssertSql( @@ -702,9 +699,9 @@ WHERE [b].[String] LIKE N'%e%' """); } - public override async Task Contains_Column(bool async) + public override async Task Contains_Column() { - await base.Contains_Column(async); + await base.Contains_Column(); AssertSql( """ @@ -722,9 +719,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Contains_negated(bool async) + public override async Task Contains_negated() { - await base.Contains_negated(async); + await base.Contains_negated(); AssertSql( """ @@ -742,30 +739,30 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Contains_with_StringComparison_Ordinal(bool async) + public override async Task Contains_with_StringComparison_Ordinal() { - await base.Contains_with_StringComparison_Ordinal(async); + await base.Contains_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task Contains_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task Contains_with_StringComparison_OrdinalIgnoreCase() { - await base.Contains_with_StringComparison_OrdinalIgnoreCase(async); + await base.Contains_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Contains_with_StringComparison_unsupported(bool async) + public override async Task Contains_with_StringComparison_unsupported() { - await base.Contains_with_StringComparison_unsupported(async); + await base.Contains_with_StringComparison_unsupported(); AssertSql(); } - public override async Task Contains_constant_with_whitespace(bool async) + public override async Task Contains_constant_with_whitespace() { - await base.Contains_constant_with_whitespace(async); + await base.Contains_constant_with_whitespace(); AssertSql( """ @@ -775,9 +772,9 @@ WHERE [b].[String] LIKE N'% %' """); } - public override async Task Contains_parameter_with_whitespace(bool async) + public override async Task Contains_parameter_with_whitespace() { - await base.Contains_parameter_with_whitespace(async); + await base.Contains_parameter_with_whitespace(); AssertSql( """ @@ -793,9 +790,9 @@ WHERE [b].[String] LIKE @pattern_contains ESCAPE N'\' #region TrimStart - public override async Task TrimStart_without_arguments(bool async) + public override async Task TrimStart_without_arguments() { - await base.TrimStart_without_arguments(async); + await base.TrimStart_without_arguments(); AssertSql( """ @@ -805,19 +802,19 @@ WHERE LTRIM([b].[String]) = N'Boston ' """); } - public override Task TrimStart_with_char_argument(bool async) - => AssertTranslationFailed(() => base.TrimStart_with_char_argument(async)); + public override Task TrimStart_with_char_argument() + => AssertTranslationFailed(() => base.TrimStart_with_char_argument()); - public override Task TrimStart_with_char_array_argument(bool async) - => AssertTranslationFailed(() => base.TrimStart_with_char_array_argument(async)); + public override Task TrimStart_with_char_array_argument() + => AssertTranslationFailed(() => base.TrimStart_with_char_array_argument()); #endregion TrimStart #region TrimEnd - public override async Task TrimEnd_without_arguments(bool async) + public override async Task TrimEnd_without_arguments() { - await base.TrimEnd_without_arguments(async); + await base.TrimEnd_without_arguments(); AssertSql( """ @@ -827,19 +824,19 @@ WHERE RTRIM([b].[String]) = N' Boston' """); } - public override Task TrimEnd_with_char_argument(bool async) - => AssertTranslationFailed(() => base.TrimEnd_with_char_argument(async)); + public override Task TrimEnd_with_char_argument() + => AssertTranslationFailed(() => base.TrimEnd_with_char_argument()); - public override Task TrimEnd_with_char_array_argument(bool async) - => AssertTranslationFailed(() => base.TrimEnd_with_char_array_argument(async)); + public override Task TrimEnd_with_char_array_argument() + => AssertTranslationFailed(() => base.TrimEnd_with_char_array_argument()); #endregion TrimEnd #region Trim - public override async Task Trim_without_argument_in_predicate(bool async) + public override async Task Trim_without_argument_in_predicate() { - await base.Trim_without_argument_in_predicate(async); + await base.Trim_without_argument_in_predicate(); AssertSql( """ @@ -849,18 +846,18 @@ WHERE LTRIM(RTRIM([b].[String])) = N'Boston' """); } - public override async Task Trim_with_char_argument_in_predicate(bool async) + public override async Task Trim_with_char_argument_in_predicate() { // String.Trim with parameters. Issue #22927. - await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_argument_in_predicate()); AssertSql(); } - public override async Task Trim_with_char_array_argument_in_predicate(bool async) + public override async Task Trim_with_char_array_argument_in_predicate() { // String.Trim with parameters. Issue #22927. - await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate(async)); + await AssertTranslationFailed(() => base.Trim_with_char_array_argument_in_predicate()); AssertSql(); } @@ -869,9 +866,9 @@ public override async Task Trim_with_char_array_argument_in_predicate(bool async #region Compare - public override async Task Compare_simple_zero(bool async) + public override async Task Compare_simple_zero() { - await base.Compare_simple_zero(async); + await base.Compare_simple_zero(); AssertSql( """ @@ -911,9 +908,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Compare_simple_one(bool async) + public override async Task Compare_simple_one() { - await base.Compare_simple_one(async); + await base.Compare_simple_one(); AssertSql( """ @@ -953,9 +950,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Compare_with_parameter(bool async) + public override async Task Compare_with_parameter() { - await base.Compare_with_parameter(async); + await base.Compare_with_parameter(); AssertSql( """ @@ -1007,9 +1004,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Compare_simple_more_than_one(bool async) + public override async Task Compare_simple_more_than_one() { - await base.Compare_simple_more_than_one(async); + await base.Compare_simple_more_than_one(); AssertSql( """ @@ -1043,9 +1040,9 @@ WHEN [b].[String] < N'Seattle' THEN -1 """); } - public override async Task Compare_nested(bool async) + public override async Task Compare_nested() { - await base.Compare_nested(async); + await base.Compare_nested(); AssertSql( """ @@ -1085,9 +1082,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Compare_multi_predicate(bool async) + public override async Task Compare_multi_predicate() { - await base.Compare_multi_predicate(async); + await base.Compare_multi_predicate(); AssertSql( """ @@ -1097,9 +1094,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task CompareTo_simple_zero(bool async) + public override async Task CompareTo_simple_zero() { - await base.CompareTo_simple_zero(async); + await base.CompareTo_simple_zero(); AssertSql( """ @@ -1139,9 +1136,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task CompareTo_simple_one(bool async) + public override async Task CompareTo_simple_one() { - await base.CompareTo_simple_one(async); + await base.CompareTo_simple_one(); AssertSql( """ @@ -1181,9 +1178,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task CompareTo_with_parameter(bool async) + public override async Task CompareTo_with_parameter() { - await base.CompareTo_with_parameter(async); + await base.CompareTo_with_parameter(); AssertSql( """ @@ -1235,9 +1232,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task CompareTo_simple_more_than_one(bool async) + public override async Task CompareTo_simple_more_than_one() { - await base.CompareTo_simple_more_than_one(async); + await base.CompareTo_simple_more_than_one(); AssertSql( """ @@ -1271,9 +1268,9 @@ WHEN [b].[String] < N'Seattle' THEN -1 """); } - public override async Task CompareTo_nested(bool async) + public override async Task CompareTo_nested() { - await base.CompareTo_nested(async); + await base.CompareTo_nested(); AssertSql( """ @@ -1313,9 +1310,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Compare_to_multi_predicate(bool async) + public override async Task Compare_to_multi_predicate() { - await base.Compare_to_multi_predicate(async); + await base.Compare_to_multi_predicate(); AssertSql( """ @@ -1330,9 +1327,9 @@ FROM [BasicTypesEntities] AS [b] #region Join [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Join_over_non_nullable_column(bool async) + public override async Task Join_over_non_nullable_column() { - await base.Join_over_non_nullable_column(async); + await base.Join_over_non_nullable_column(); AssertSql( """ @@ -1343,9 +1340,9 @@ GROUP BY [b].[Int] } [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Join_over_nullable_column(bool async) + public override async Task Join_over_nullable_column() { - await base.Join_over_nullable_column(async); + await base.Join_over_nullable_column(); AssertSql( """ @@ -1359,9 +1356,9 @@ GROUP BY [n0].[Key] } [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Join_with_predicate(bool async) + public override async Task Join_with_predicate() { - await base.Join_with_predicate(async); + await base.Join_with_predicate(); AssertSql( """ @@ -1374,9 +1371,9 @@ GROUP BY [b].[Int] } [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Join_with_ordering(bool async) + public override async Task Join_with_ordering() { - await base.Join_with_ordering(async); + await base.Join_with_ordering(); AssertSql( """ @@ -1387,9 +1384,9 @@ GROUP BY [b].[Int] } [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Join_non_aggregate(bool async) + public override async Task Join_non_aggregate() { - await base.Join_non_aggregate(async); + await base.Join_non_aggregate(); AssertSql( """ @@ -1405,9 +1402,9 @@ WHERE CONCAT_WS(N'|', [b].[String], @foo, N'', N'bar') = N'Seattle|foo||bar' #region Concatenation - public override async Task Concat_operator(bool async) + public override async Task Concat_operator() { - await base.Concat_operator(async); + await base.Concat_operator(); AssertSql( """ @@ -1418,9 +1415,9 @@ FROM [BasicTypesEntities] AS [b] } [SqlServerCondition(SqlServerCondition.SupportsFunctions2017)] - public override async Task Concat_aggregate(bool async) + public override async Task Concat_aggregate() { - await base.Concat_aggregate(async); + await base.Concat_aggregate(); AssertSql( """ @@ -1430,9 +1427,9 @@ GROUP BY [b].[Int] """); } - public override async Task Concat_string_int_comparison1(bool async) + public override async Task Concat_string_int_comparison1() { - await base.Concat_string_int_comparison1(async); + await base.Concat_string_int_comparison1(); AssertSql( """ @@ -1444,9 +1441,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Concat_string_int_comparison2(bool async) + public override async Task Concat_string_int_comparison2() { - await base.Concat_string_int_comparison2(async); + await base.Concat_string_int_comparison2(); AssertSql( """ @@ -1458,9 +1455,9 @@ WHERE CAST(@i AS nvarchar(max)) + [b].[String] = N'10Seattle' """); } - public override async Task Concat_string_int_comparison3(bool async) + public override async Task Concat_string_int_comparison3() { - await base.Concat_string_int_comparison3(async); + await base.Concat_string_int_comparison3(); AssertSql( """ @@ -1473,9 +1470,9 @@ WHERE CAST(@p AS nvarchar(max)) + [b].[String] + CAST(@j AS nvarchar(max)) + CAS """); } - public override async Task Concat_string_int_comparison4(bool async) + public override async Task Concat_string_int_comparison4() { - await base.Concat_string_int_comparison4(async); + await base.Concat_string_int_comparison4(); AssertSql( """ @@ -1485,9 +1482,9 @@ WHERE CAST([b].[Int] AS nvarchar(max)) + [b].[String] = N'8Seattle' """); } - public override async Task Concat_string_string_comparison(bool async) + public override async Task Concat_string_string_comparison() { - await base.Concat_string_string_comparison(async); + await base.Concat_string_string_comparison(); AssertSql( """ @@ -1499,9 +1496,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Concat_method_comparison(bool async) + public override async Task Concat_method_comparison() { - await base.Concat_method_comparison(async); + await base.Concat_method_comparison(); AssertSql( """ @@ -1513,9 +1510,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Concat_method_comparison_2(bool async) + public override async Task Concat_method_comparison_2() { - await base.Concat_method_comparison_2(async); + await base.Concat_method_comparison_2(); AssertSql( """ @@ -1528,9 +1525,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Concat_method_comparison_3(bool async) + public override async Task Concat_method_comparison_3() { - await base.Concat_method_comparison_3(async); + await base.Concat_method_comparison_3(); AssertSql( """ @@ -1548,9 +1545,9 @@ FROM [BasicTypesEntities] AS [b] #region LINQ Operators - public override async Task FirstOrDefault(bool async) + public override async Task FirstOrDefault() { - await base.FirstOrDefault(async); + await base.FirstOrDefault(); AssertSql( """ 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] @@ -1559,9 +1556,9 @@ WHERE SUBSTRING([b].[String], 1, 1) = N'S' """); } - public override async Task LastOrDefault(bool async) + public override async Task LastOrDefault() { - await base.LastOrDefault(async); + await base.LastOrDefault(); AssertSql( """ 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] @@ -1574,9 +1571,9 @@ WHERE SUBSTRING([b].[String], LEN([b].[String]), 1) = N'e' #region Like - public override async Task Where_Like_and_comparison(bool async) + public override async Task Where_Like_and_comparison() { - await base.Where_Like_and_comparison(async); + await base.Where_Like_and_comparison(); AssertSql( """ @@ -1586,9 +1583,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Where_Like_or_comparison(bool async) + public override async Task Where_Like_or_comparison() { - await base.Where_Like_or_comparison(async); + await base.Where_Like_or_comparison(); AssertSql( """ @@ -1598,9 +1595,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Like_with_non_string_column_using_ToString(bool async) + public override async Task Like_with_non_string_column_using_ToString() { - await base.Like_with_non_string_column_using_ToString(async); + await base.Like_with_non_string_column_using_ToString(); AssertSql( """ @@ -1610,9 +1607,9 @@ WHERE CONVERT(varchar(11), [b].[Int]) LIKE '%5%' """); } - public override async Task Like_with_non_string_column_using_double_cast(bool async) + public override async Task Like_with_non_string_column_using_double_cast() { - await base.Like_with_non_string_column_using_double_cast(async); + await base.Like_with_non_string_column_using_double_cast(); AssertSql( """ @@ -1626,11 +1623,11 @@ WHERE CAST([b].[Int] AS nvarchar(max)) LIKE N'%5%' #region Regex - public override Task Regex_IsMatch(bool async) - => AssertTranslationFailed(() => base.Regex_IsMatch(async)); + public override Task Regex_IsMatch() + => AssertTranslationFailed(() => base.Regex_IsMatch()); - public override Task Regex_IsMatch_constant_input(bool async) - => AssertTranslationFailed(() => base.Regex_IsMatch_constant_input(async)); + public override Task Regex_IsMatch_constant_input() + => AssertTranslationFailed(() => base.Regex_IsMatch_constant_input()); #endregion Regex diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqlServerTest.cs index 6c95e27d3c6..ea0dbd133f5 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public DateOnlyTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Year(bool async) + public override async Task Year() { - await base.Year(async); + await base.Year(); AssertSql( """ @@ -24,9 +24,9 @@ WHERE DATEPART(year, [b].[DateOnly]) = 1990 """); } - public override async Task Month(bool async) + public override async Task Month() { - await base.Month(async); + await base.Month(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE DATEPART(month, [b].[DateOnly]) = 11 """); } - public override async Task Day(bool async) + public override async Task Day() { - await base.Day(async); + await base.Day(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE DATEPART(day, [b].[DateOnly]) = 10 """); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await base.DayOfYear(async); + await base.DayOfYear(); AssertSql( """ @@ -60,16 +60,16 @@ WHERE DATEPART(dayofyear, [b].[DateOnly]) = 314 """); } - public override async Task DayOfWeek(bool async) + public override async Task DayOfWeek() { - await AssertTranslationFailed(() => base.DayOfWeek(async)); + await AssertTranslationFailed(() => base.DayOfWeek()); AssertSql(); } - public override async Task DayNumber(bool async) + public override async Task DayNumber() { - await base.DayNumber(async); + await base.DayNumber(); AssertSql( """ @@ -79,9 +79,9 @@ WHERE DATEDIFF(day, '0001-01-01', [b].[DateOnly]) = 726780 """); } - public override async Task AddYears(bool async) + public override async Task AddYears() { - await base.AddYears(async); + await base.AddYears(); AssertSql( """ @@ -91,9 +91,9 @@ WHERE DATEADD(year, CAST(3 AS int), [b].[DateOnly]) = '1993-11-10' """); } - public override async Task AddMonths(bool async) + public override async Task AddMonths() { - await base.AddMonths(async); + await base.AddMonths(); AssertSql( """ @@ -103,9 +103,9 @@ WHERE DATEADD(month, CAST(3 AS int), [b].[DateOnly]) = '1991-02-10' """); } - public override async Task AddDays(bool async) + public override async Task AddDays() { - await base.AddDays(async); + await base.AddDays(); AssertSql( """ @@ -115,9 +115,9 @@ WHERE DATEADD(day, CAST(3 AS int), [b].[DateOnly]) = '1990-11-13' """); } - public override async Task DayNumber_subtraction(bool async) + public override async Task DayNumber_subtraction() { - await base.DayNumber_subtraction(async); + await base.DayNumber_subtraction(); AssertSql( """ @@ -129,9 +129,9 @@ WHERE DATEDIFF(day, '0001-01-01', [b].[DateOnly]) - @DayNumber = 5 """); } - public override async Task FromDateTime(bool async) + public override async Task FromDateTime() { - await base.FromDateTime(async); + await base.FromDateTime(); AssertSql( """ @@ -141,9 +141,9 @@ WHERE CAST([b].[DateTime] AS date) = '1998-05-04' """); } - public override async Task FromDateTime_compared_to_property(bool async) + public override async Task FromDateTime_compared_to_property() { - await base.FromDateTime_compared_to_property(async); + await base.FromDateTime_compared_to_property(); AssertSql( """ @@ -153,9 +153,9 @@ WHERE CAST([b].[DateTime] AS date) = [b].[DateOnly] """); } - public override async Task FromDateTime_compared_to_constant_and_parameter(bool async) + public override async Task FromDateTime_compared_to_constant_and_parameter() { - await base.FromDateTime_compared_to_constant_and_parameter(async); + await base.FromDateTime_compared_to_constant_and_parameter(); AssertSql( """ @@ -167,9 +167,9 @@ WHERE CAST([b].[DateTime] AS date) IN (@dateOnly, '1998-05-04') """); } - public override async Task ToDateTime_property_with_constant_TimeOnly(bool async) + public override async Task ToDateTime_property_with_constant_TimeOnly() { - await base.ToDateTime_property_with_constant_TimeOnly(async); + await base.ToDateTime_property_with_constant_TimeOnly(); AssertSql( """ @@ -179,9 +179,9 @@ WHERE DATETIME2FROMPARTS(DATEPART(year, [b].[DateOnly]), DATEPART(month, [b].[Da """); } - public override async Task ToDateTime_property_with_property_TimeOnly(bool async) + public override async Task ToDateTime_property_with_property_TimeOnly() { - await base.ToDateTime_property_with_property_TimeOnly(async); + await base.ToDateTime_property_with_property_TimeOnly(); AssertSql( """ @@ -191,9 +191,9 @@ WHERE DATETIME2FROMPARTS(DATEPART(year, [b].[DateOnly]), DATEPART(month, [b].[Da """); } - public override async Task ToDateTime_constant_DateTime_with_property_TimeOnly(bool async) + public override async Task ToDateTime_constant_DateTime_with_property_TimeOnly() { - await base.ToDateTime_constant_DateTime_with_property_TimeOnly(async); + await base.ToDateTime_constant_DateTime_with_property_TimeOnly(); AssertSql( """ @@ -203,16 +203,16 @@ WHERE DATETIME2FROMPARTS(1990, 11, 10, DATEPART(hour, [b].[TimeOnly]), DATEPART( """); } - public override async Task ToDateTime_with_complex_DateTime(bool async) + public override async Task ToDateTime_with_complex_DateTime() { - await AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime(async)); + await AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime()); AssertSql(); } - public override async Task ToDateTime_with_complex_TimeOnly(bool async) + public override async Task ToDateTime_with_complex_TimeOnly() { - await AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly(async)); + await AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly()); AssertSql(); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqlServerTest.cs index 1e46e195150..844781bbffe 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public DateTimeOffsetTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture f Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { - await base.Now(async); + await base.Now(); AssertSql( """ @@ -24,9 +24,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task UtcNow(bool async) + public override async Task UtcNow() { - await base.UtcNow(async); + await base.UtcNow(); AssertSql( """ @@ -36,9 +36,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Date(bool async) + public override async Task Date() { - await base.Date(async); + await base.Date(); AssertSql( """ @@ -50,9 +50,9 @@ WHERE CONVERT(date, [b].[DateTimeOffset]) > @Date """); } - public override async Task Year(bool async) + public override async Task Year() { - await base.Year(async); + await base.Year(); AssertSql( """ @@ -62,9 +62,9 @@ WHERE DATEPART(year, [b].[DateTimeOffset]) = 1998 """); } - public override async Task Month(bool async) + public override async Task Month() { - await base.Month(async); + await base.Month(); AssertSql( """ @@ -74,9 +74,9 @@ WHERE DATEPART(month, [b].[DateTimeOffset]) = 5 """); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await base.DayOfYear(async); + await base.DayOfYear(); AssertSql( """ @@ -86,9 +86,9 @@ WHERE DATEPART(dayofyear, [b].[DateTimeOffset]) = 124 """); } - public override async Task Day(bool async) + public override async Task Day() { - await base.Day(async); + await base.Day(); AssertSql( """ @@ -98,9 +98,9 @@ WHERE DATEPART(day, [b].[DateTimeOffset]) = 4 """); } - public override async Task Hour(bool async) + public override async Task Hour() { - await base.Hour(async); + await base.Hour(); AssertSql( """ @@ -110,9 +110,9 @@ WHERE DATEPART(hour, [b].[DateTimeOffset]) = 15 """); } - public override async Task Minute(bool async) + public override async Task Minute() { - await base.Minute(async); + await base.Minute(); AssertSql( """ @@ -122,9 +122,9 @@ WHERE DATEPART(minute, [b].[DateTimeOffset]) = 30 """); } - public override async Task Second(bool async) + public override async Task Second() { - await base.Second(async); + await base.Second(); AssertSql( """ @@ -134,9 +134,9 @@ WHERE DATEPART(second, [b].[DateTimeOffset]) = 10 """); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - await base.Millisecond(async); + await base.Millisecond(); AssertSql( """ @@ -146,9 +146,9 @@ WHERE DATEPART(millisecond, [b].[DateTimeOffset]) = 123 """); } - public override async Task Microsecond(bool async) + public override async Task Microsecond() { - await base.Microsecond(async); + await base.Microsecond(); AssertSql( """ @@ -158,9 +158,9 @@ WHERE DATEPART(microsecond, [b].[DateTimeOffset]) % 1000 = 456 """); } - public override async Task Nanosecond(bool async) + public override async Task Nanosecond() { - await base.Nanosecond(async); + await base.Nanosecond(); AssertSql( """ @@ -170,9 +170,9 @@ WHERE DATEPART(nanosecond, [b].[DateTimeOffset]) % 1000 = 400 """); } - public override async Task TimeOfDay(bool async) + public override async Task TimeOfDay() { - await base.TimeOfDay(async); + await base.TimeOfDay(); AssertSql( """ @@ -181,9 +181,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddYears(bool async) + public override async Task AddYears() { - await base.AddYears(async); + await base.AddYears(); AssertSql( """ @@ -192,9 +192,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddMonths(bool async) + public override async Task AddMonths() { - await base.AddMonths(async); + await base.AddMonths(); AssertSql( """ @@ -203,9 +203,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddDays(bool async) + public override async Task AddDays() { - await base.AddDays(async); + await base.AddDays(); AssertSql( """ @@ -214,9 +214,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddHours(bool async) + public override async Task AddHours() { - await base.AddHours(async); + await base.AddHours(); AssertSql( """ @@ -225,9 +225,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddMinutes(bool async) + public override async Task AddMinutes() { - await base.AddMinutes(async); + await base.AddMinutes(); AssertSql( """ @@ -236,9 +236,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddSeconds(bool async) + public override async Task AddSeconds() { - await base.AddSeconds(async); + await base.AddSeconds(); AssertSql( """ @@ -247,9 +247,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task AddMilliseconds(bool async) + public override async Task AddMilliseconds() { - await base.AddMilliseconds(async); + await base.AddMilliseconds(); AssertSql( """ @@ -258,9 +258,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task ToUnixTimeMilliseconds(bool async) + public override async Task ToUnixTimeMilliseconds() { - await base.ToUnixTimeMilliseconds(async); + await base.ToUnixTimeMilliseconds(); AssertSql( """ @@ -272,9 +272,9 @@ WHERE DATEDIFF_BIG(millisecond, '1970-01-01T00:00:00.0000000+00:00', [b].[DateTi """); } - public override async Task ToUnixTimeSecond(bool async) + public override async Task ToUnixTimeSecond() { - await base.ToUnixTimeSecond(async); + await base.ToUnixTimeSecond(); AssertSql( """ @@ -286,9 +286,9 @@ WHERE DATEDIFF_BIG(second, '1970-01-01T00:00:00.0000000+00:00', [b].[DateTimeOff """); } - public override async Task Milliseconds_parameter_and_constant(bool async) + public override async Task Milliseconds_parameter_and_constant() { - await base.Milliseconds_parameter_and_constant(async); + await base.Milliseconds_parameter_and_constant(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqlServerTest.cs index 24900ee72f4..78ba68656a4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public DateTimeTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { - await base.Now(async); + await base.Now(); AssertSql( """ @@ -26,9 +26,9 @@ WHERE GETDATE() <> @myDatetime """); } - public override async Task UtcNow(bool async) + public override async Task UtcNow() { - await base.UtcNow(async); + await base.UtcNow(); AssertSql( """ @@ -40,9 +40,9 @@ WHERE GETUTCDATE() <> @myDatetime """); } - public override async Task Today(bool async) + public override async Task Today() { - await base.Today(async); + await base.Today(); AssertSql( """ @@ -52,9 +52,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Date(bool async) + public override async Task Date() { - await base.Date(async); + await base.Date(); AssertSql( """ @@ -66,9 +66,9 @@ WHERE CONVERT(date, [b].[DateTime]) = @myDatetime """); } - public override async Task AddYear(bool async) + public override async Task AddYear() { - await base.AddYear(async); + await base.AddYear(); AssertSql( """ @@ -78,9 +78,9 @@ WHERE DATEPART(year, DATEADD(year, CAST(1 AS int), [b].[DateTime])) = 1999 """); } - public override async Task Year(bool async) + public override async Task Year() { - await base.Year(async); + await base.Year(); AssertSql( """ @@ -90,9 +90,9 @@ WHERE DATEPART(year, [b].[DateTime]) = 1998 """); } - public override async Task Month(bool async) + public override async Task Month() { - await base.Month(async); + await base.Month(); AssertSql( """ @@ -102,9 +102,9 @@ WHERE DATEPART(month, [b].[DateTime]) = 5 """); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await base.DayOfYear(async); + await base.DayOfYear(); AssertSql( """ @@ -114,9 +114,9 @@ WHERE DATEPART(dayofyear, [b].[DateTime]) = 124 """); } - public override async Task Day(bool async) + public override async Task Day() { - await base.Day(async); + await base.Day(); AssertSql( """ @@ -126,9 +126,9 @@ WHERE DATEPART(day, [b].[DateTime]) = 4 """); } - public override async Task Hour(bool async) + public override async Task Hour() { - await base.Hour(async); + await base.Hour(); AssertSql( """ @@ -138,9 +138,9 @@ WHERE DATEPART(hour, [b].[DateTime]) = 15 """); } - public override async Task Minute(bool async) + public override async Task Minute() { - await base.Minute(async); + await base.Minute(); AssertSql( """ @@ -150,9 +150,9 @@ WHERE DATEPART(minute, [b].[DateTime]) = 30 """); } - public override async Task Second(bool async) + public override async Task Second() { - await base.Second(async); + await base.Second(); AssertSql( """ @@ -162,9 +162,9 @@ WHERE DATEPART(second, [b].[DateTime]) = 10 """); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - await base.Millisecond(async); + await base.Millisecond(); AssertSql( """ @@ -174,9 +174,9 @@ WHERE DATEPART(millisecond, [b].[DateTime]) = 123 """); } - public override async Task TimeOfDay(bool async) + public override async Task TimeOfDay() { - await base.TimeOfDay(async); + await base.TimeOfDay(); AssertSql( """ @@ -186,12 +186,12 @@ WHERE CONVERT(time, [b].[DateTime]) = '00:00:00' """); } - public override Task subtract_and_TotalDays(bool async) - => AssertTranslationFailed(() => base.subtract_and_TotalDays(async)); + public override Task subtract_and_TotalDays() + => AssertTranslationFailed(() => base.subtract_and_TotalDays()); - public override async Task Parse_with_constant(bool async) + public override async Task Parse_with_constant() { - await base.Parse_with_constant(async); + await base.Parse_with_constant(); AssertSql( """ @@ -201,9 +201,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task Parse_with_parameter(bool async) + public override async Task Parse_with_parameter() { - await base.Parse_with_parameter(async); + await base.Parse_with_parameter(); AssertSql( """ @@ -215,9 +215,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task New_with_constant(bool async) + public override async Task New_with_constant() { - await base.New_with_constant(async); + await base.New_with_constant(); AssertSql( """ @@ -227,9 +227,9 @@ FROM [BasicTypesEntities] AS [b] """); } - public override async Task New_with_parameters(bool async) + public override async Task New_with_parameters() { - await base.New_with_parameters(async); + await base.New_with_parameters(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqlServerTest.cs index ed7e9fa94a4..a3b76ef442e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public TimeOnlyTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Hour(bool async) + public override async Task Hour() { - await base.Hour(async); + await base.Hour(); AssertSql( """ @@ -24,9 +24,9 @@ WHERE DATEPART(hour, [b].[TimeOnly]) = 15 """); } - public override async Task Minute(bool async) + public override async Task Minute() { - await base.Minute(async); + await base.Minute(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE DATEPART(minute, [b].[TimeOnly]) = 30 """); } - public override async Task Second(bool async) + public override async Task Second() { - await base.Second(async); + await base.Second(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE DATEPART(second, [b].[TimeOnly]) = 10 """); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - await base.Millisecond(async); + await base.Millisecond(); AssertSql( """ @@ -60,9 +60,9 @@ WHERE DATEPART(millisecond, [b].[TimeOnly]) = 123 """); } - public override async Task Microsecond(bool async) + public override async Task Microsecond() { - await base.Microsecond(async); + await base.Microsecond(); AssertSql( """ @@ -72,9 +72,9 @@ WHERE DATEPART(microsecond, [b].[TimeOnly]) % 1000 = 456 """); } - public override async Task Nanosecond(bool async) + public override async Task Nanosecond() { - await base.Nanosecond(async); + await base.Nanosecond(); AssertSql( """ @@ -84,9 +84,9 @@ WHERE DATEPART(nanosecond, [b].[TimeOnly]) % 1000 = 400 """); } - public override async Task AddHours(bool async) + public override async Task AddHours() { - await base.AddHours(async); + await base.AddHours(); AssertSql( """ @@ -96,9 +96,9 @@ WHERE DATEADD(hour, CAST(3.0E0 AS int), [b].[TimeOnly]) = '18:30:10' """); } - public override async Task AddMinutes(bool async) + public override async Task AddMinutes() { - await base.AddMinutes(async); + await base.AddMinutes(); AssertSql( """ @@ -108,16 +108,16 @@ WHERE DATEADD(minute, CAST(3.0E0 AS int), [b].[TimeOnly]) = '15:33:10' """); } - public override async Task Add_TimeSpan(bool async) + public override async Task Add_TimeSpan() { - await AssertTranslationFailed(() => base.Add_TimeSpan(async)); + await AssertTranslationFailed(() => base.Add_TimeSpan()); AssertSql(); } - public override async Task IsBetween(bool async) + public override async Task IsBetween() { - await base.IsBetween(async); + await base.IsBetween(); AssertSql( """ @@ -133,16 +133,16 @@ ELSE CAST(0 AS bit) """); } - public override async Task Subtract(bool async) + public override async Task Subtract() { - await AssertTranslationFailed(() => base.Subtract(async)); + await AssertTranslationFailed(() => base.Subtract()); AssertSql(); } - public override async Task FromDateTime_compared_to_property(bool async) + public override async Task FromDateTime_compared_to_property() { - await base.FromDateTime_compared_to_property(async); + await base.FromDateTime_compared_to_property(); AssertSql( """ @@ -152,9 +152,9 @@ WHERE CAST([b].[DateTime] AS time) = [b].[TimeOnly] """); } - public override async Task FromDateTime_compared_to_parameter(bool async) + public override async Task FromDateTime_compared_to_parameter() { - await base.FromDateTime_compared_to_parameter(async); + await base.FromDateTime_compared_to_parameter(); AssertSql( """ @@ -166,9 +166,9 @@ WHERE CAST([b].[DateTime] AS time) = @time """); } - public override async Task FromDateTime_compared_to_constant(bool async) + public override async Task FromDateTime_compared_to_constant() { - await base.FromDateTime_compared_to_constant(async); + await base.FromDateTime_compared_to_constant(); AssertSql( """ @@ -178,9 +178,9 @@ WHERE CAST([b].[DateTime] AS time) = '15:30:10' """); } - public override async Task FromTimeSpan_compared_to_property(bool async) + public override async Task FromTimeSpan_compared_to_property() { - await base.FromTimeSpan_compared_to_property(async); + await base.FromTimeSpan_compared_to_property(); AssertSql( """ @@ -190,9 +190,9 @@ WHERE CAST([b].[TimeSpan] AS time) < [b].[TimeOnly] """); } - public override async Task FromTimeSpan_compared_to_parameter(bool async) + public override async Task FromTimeSpan_compared_to_parameter() { - await base.FromTimeSpan_compared_to_parameter(async); + await base.FromTimeSpan_compared_to_parameter(); AssertSql( """ @@ -204,9 +204,9 @@ WHERE CAST([b].[TimeSpan] AS time) = @time """); } - public override async Task Order_by_FromTimeSpan(bool async) + public override async Task Order_by_FromTimeSpan() { - await base.Order_by_FromTimeSpan(async); + await base.Order_by_FromTimeSpan(); AssertSql( """ diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqlServerTest.cs index 1152d2cd0d4..a7b5f42f7b6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqlServerTest.cs @@ -12,9 +12,9 @@ public TimeSpanTranslationsSqlServerTest(BasicTypesQuerySqlServerFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Hours(bool async) + public override async Task Hours() { - await base.Hours(async); + await base.Hours(); AssertSql( """ @@ -24,9 +24,9 @@ WHERE DATEPART(hour, [b].[TimeSpan]) = 3 """); } - public override async Task Minutes(bool async) + public override async Task Minutes() { - await base.Minutes(async); + await base.Minutes(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE DATEPART(minute, [b].[TimeSpan]) = 4 """); } - public override async Task Seconds(bool async) + public override async Task Seconds() { - await base.Seconds(async); + await base.Seconds(); AssertSql( """ @@ -48,9 +48,9 @@ WHERE DATEPART(second, [b].[TimeSpan]) = 5 """); } - public override async Task Milliseconds(bool async) + public override async Task Milliseconds() { - await base.Milliseconds(async); + await base.Milliseconds(); AssertSql( """ @@ -60,9 +60,9 @@ WHERE DATEPART(millisecond, [b].[TimeSpan]) = 678 """); } - public override async Task Microseconds(bool async) + public override async Task Microseconds() { - await base.Microseconds(async); + await base.Microseconds(); AssertSql( """ @@ -72,9 +72,9 @@ WHERE DATEPART(microsecond, [b].[TimeSpan]) % 1000 = 912 """); } - public override async Task Nanoseconds(bool async) + public override async Task Nanoseconds() { - await base.Nanoseconds(async); + await base.Nanoseconds(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs index d5e4bdf3180..778ed53f343 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs @@ -9,6 +9,6 @@ public class ComplexJsonCollectionSqliteTest(ComplexJsonSqliteFixture fixture, I : ComplexJsonCollectionRelationalTestBase(fixture, testOutputHelper) { // TODO: #36296 - public override Task Index_column(bool async) - => Assert.ThrowsAsync(() => base.Index_column(async)); + public override Task Index_column() + => Assert.ThrowsAsync(() => base.Index_column()); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs index ef86a835bfd..4db7b605d2c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs @@ -8,20 +8,20 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; public class ComplexJsonProjectionSqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonProjectionRelationalTestBase(fixture, testOutputHelper) { - public override Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.SelectMany_related_collection(async, queryTrackingBehavior)); + public override Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.SelectMany_related_collection(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior)); + public override Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior)); - public override Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); - public override Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior)); private static async Task AssertApplyNotSupported(Func query) => Assert.Equal( diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs index 3af30bcc3a4..78ce7f94413 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs @@ -6,9 +6,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; public class ComplexJsonStructuralEqualitySqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -18,9 +18,9 @@ public override async Task Two_related(bool async) """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -30,9 +30,9 @@ public override async Task Two_nested(bool async) """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -42,9 +42,9 @@ public override async Task Not_equals(bool async) """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -54,9 +54,9 @@ public override async Task Related_with_inline_null(bool async) """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -66,9 +66,9 @@ public override async Task Related_with_parameter_null(bool async) """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -78,9 +78,9 @@ public override async Task Nested_with_inline_null(bool async) """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -90,9 +90,9 @@ public override async Task Nested_with_inline(bool async) """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -104,9 +104,9 @@ public override async Task Nested_with_parameter(bool async) """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -116,9 +116,9 @@ public override async Task Two_nested_collections(bool async) """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( """ @@ -128,9 +128,9 @@ public override async Task Nested_collection_with_inline(bool async) """); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs index ab895ffa62a..177104f5a77 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs @@ -8,8 +8,8 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplittin public class ComplexTableSplittingProjectionSqliteTest(ComplexTableSplittingSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexTableSplittingProjectionRelationalTestBase(fixture, testOutputHelper) { - public override Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior)); private static async Task AssertApplyNotSupported(Func query) => Assert.Equal( diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs index fd1b5c357e5..ac1b0875b43 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs @@ -8,51 +8,51 @@ public class ComplexTableSplittingStructuralEqualitySqliteTest( ITestOutputHelper testOutputHelper) : ComplexTableSplittingStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql(); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql(); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql(); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql(); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql(); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql(); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -62,9 +62,9 @@ public override async Task Nested_with_inline(bool async) """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -79,23 +79,23 @@ public override async Task Nested_with_parameter(bool async) """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql(); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql(); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql(); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs index ff26604c200..8087c0ec619 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs @@ -8,11 +8,11 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; public class NavigationsProjectionSqliteTest(NavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsProjectionRelationalTestBase(fixture, testOutputHelper) { - public override Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); - public override Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) - => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior)); + public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) + => AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior)); private static async Task AssertApplyNotSupported(Func query) => Assert.Equal( diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs index 9f25b195ce4..ff1298e192c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs @@ -8,9 +8,9 @@ public class NavigationsStructuralEqualitySqliteTest( ITestOutputHelper testOutputHelper) : NavigationsStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -22,9 +22,9 @@ public override async Task Two_related(bool async) """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -38,9 +38,9 @@ public override async Task Two_nested(bool async) """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -52,9 +52,9 @@ public override async Task Not_equals(bool async) """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -65,9 +65,9 @@ public override async Task Related_with_inline_null(bool async) """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -78,9 +78,9 @@ public override async Task Related_with_parameter_null(bool async) """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -92,9 +92,9 @@ public override async Task Nested_with_inline_null(bool async) """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( """ @@ -106,9 +106,9 @@ public override async Task Nested_with_inline(bool async) """); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( """ @@ -122,9 +122,9 @@ public override async Task Nested_with_parameter(bool async) """); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -136,16 +136,16 @@ public override async Task Two_nested_collections(bool async) """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql(); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql(); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs index 0f430bf1f08..632bad4a157 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs @@ -8,30 +8,30 @@ namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; public class OwnedJsonProjectionSqliteTest(OwnedJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonProjectionRelationalTestBase(fixture, testOutputHelper) { - public override Task SelectMany_related_collection(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task SelectMany_related_collection(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll ? Task.CompletedTask // Base test expects "can't track owned entities" exception, but with SQLite we get "no CROSS APPLY" - : AssertApplyNotSupported(() => base.SelectMany_related_collection(async, queryTrackingBehavior)); + : AssertApplyNotSupported(() => base.SelectMany_related_collection(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_required_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task SelectMany_nested_collection_on_required_related(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll ? Task.CompletedTask // Base test expects "can't track owned entities" exception, but with SQLite we get "no CROSS APPLY" - : AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_required_related(async, queryTrackingBehavior)); + : AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_required_related(queryTrackingBehavior)); - public override Task SelectMany_nested_collection_on_optional_related(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task SelectMany_nested_collection_on_optional_related(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll ? Task.CompletedTask // Base test expects "can't track owned entities" exception, but with SQLite we get "no CROSS APPLY" - : AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_optional_related(async, queryTrackingBehavior)); + : AssertApplyNotSupported(() => base.SelectMany_nested_collection_on_optional_related(queryTrackingBehavior)); - public override Task Select_subquery_required_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task Select_subquery_required_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll ? Task.CompletedTask // Base test expects "can't track owned entities" exception, but with SQLite we get "no CROSS APPLY" - : AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(async, queryTrackingBehavior)); + : AssertApplyNotSupported(() => base.Select_subquery_required_related_FirstOrDefault(queryTrackingBehavior)); - public override Task Select_subquery_optional_related_FirstOrDefault(bool async, QueryTrackingBehavior queryTrackingBehavior) + public override Task Select_subquery_optional_related_FirstOrDefault(QueryTrackingBehavior queryTrackingBehavior) => queryTrackingBehavior is QueryTrackingBehavior.TrackAll ? Task.CompletedTask // Base test expects "can't track owned entities" exception, but with SQLite we get "no CROSS APPLY" - : AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(async, queryTrackingBehavior)); + : AssertApplyNotSupported(() => base.Select_subquery_optional_related_FirstOrDefault(queryTrackingBehavior)); private static async Task AssertApplyNotSupported(Func query) => Assert.Equal( diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs index fd4f7ee01ff..bc48deddace 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs @@ -8,9 +8,9 @@ public class OwnedJsonStructuralEqualitySqliteTest( ITestOutputHelper testOutputHelper) : OwnedJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -20,9 +20,9 @@ WHERE 0 """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -32,9 +32,9 @@ WHERE 0 """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -44,9 +44,9 @@ WHERE 0 """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -56,9 +56,9 @@ public override async Task Related_with_inline_null(bool async) """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -68,9 +68,9 @@ WHERE 0 """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -80,25 +80,25 @@ public override async Task Nested_with_inline_null(bool async) """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -108,17 +108,17 @@ WHERE 0 """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs index a3fcaa0a452..ce31ad93493 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs @@ -9,6 +9,6 @@ public class OwnedNavigationsCollectionSqliteTest(OwnedNavigationsSqliteFixture : OwnedNavigationsCollectionRelationalTestBase(fixture, testOutputHelper) { // TODO: #36296 - public override Task Index_column(bool async) - => Assert.ThrowsAsync(() => base.Index_column(async)); + public override Task Index_column() + => Assert.ThrowsAsync(() => base.Index_column()); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs index a3d51b8099f..1cc2500e26f 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs @@ -8,9 +8,9 @@ public class OwnedNavigationsStructuralEqualitySqliteTest( ITestOutputHelper testOutputHelper) : OwnedNavigationsStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -36,9 +36,9 @@ WHERE 0 """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -64,9 +64,9 @@ WHERE 0 """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -92,9 +92,9 @@ WHERE 0 """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -120,9 +120,9 @@ LEFT JOIN ( """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -148,9 +148,9 @@ LEFT JOIN ( """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -176,25 +176,25 @@ LEFT JOIN ( """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -220,17 +220,17 @@ WHERE 0 """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs index 0675d3a3097..c8361d652b7 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs @@ -8,9 +8,9 @@ public class OwnedTableSplittingStructuralEqualitySqliteTest( ITestOutputHelper testOutputHelper) : OwnedTableSplittingStructuralEqualityRelationalTestBase(fixture, testOutputHelper) { - public override async Task Two_related(bool async) + public override async Task Two_related() { - await base.Two_related(async); + await base.Two_related(); AssertSql( """ @@ -30,9 +30,9 @@ WHERE 0 """); } - public override async Task Two_nested(bool async) + public override async Task Two_nested() { - await base.Two_nested(async); + await base.Two_nested(); AssertSql( """ @@ -52,9 +52,9 @@ WHERE 0 """); } - public override async Task Not_equals(bool async) + public override async Task Not_equals() { - await base.Not_equals(async); + await base.Not_equals(); AssertSql( """ @@ -74,9 +74,9 @@ WHERE 0 """); } - public override async Task Related_with_inline_null(bool async) + public override async Task Related_with_inline_null() { - await base.Related_with_inline_null(async); + await base.Related_with_inline_null(); AssertSql( """ @@ -96,9 +96,9 @@ LEFT JOIN ( """); } - public override async Task Related_with_parameter_null(bool async) + public override async Task Related_with_parameter_null() { - await base.Related_with_parameter_null(async); + await base.Related_with_parameter_null(); AssertSql( """ @@ -120,9 +120,9 @@ END IS NULL """); } - public override async Task Nested_with_inline_null(bool async) + public override async Task Nested_with_inline_null() { - await base.Nested_with_inline_null(async); + await base.Nested_with_inline_null(); AssertSql( """ @@ -142,25 +142,25 @@ LEFT JOIN ( """); } - public override async Task Nested_with_inline(bool async) + public override async Task Nested_with_inline() { - await base.Nested_with_inline(async); + await base.Nested_with_inline(); AssertSql( ); } - public override async Task Nested_with_parameter(bool async) + public override async Task Nested_with_parameter() { - await base.Nested_with_parameter(async); + await base.Nested_with_parameter(); AssertSql( ); } - public override async Task Two_nested_collections(bool async) + public override async Task Two_nested_collections() { - await base.Two_nested_collections(async); + await base.Two_nested_collections(); AssertSql( """ @@ -180,17 +180,17 @@ WHERE 0 """); } - public override async Task Nested_collection_with_inline(bool async) + public override async Task Nested_collection_with_inline() { - await base.Nested_collection_with_inline(async); + await base.Nested_collection_with_inline(); AssertSql( ); } - public override async Task Nested_collection_with_parameter(bool async) + public override async Task Nested_collection_with_parameter() { - await base.Nested_collection_with_parameter(async); + await base.Nested_collection_with_parameter(); AssertSql( ); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/ByteArrayTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/ByteArrayTranslationsSqliteTest.cs index c4663d51d6f..adc1c3fcf86 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/ByteArrayTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/ByteArrayTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public ByteArrayTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITe Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Length(bool async) + public override async Task Length() { - await base.Length(async); + await base.Length(); AssertSql( """ @@ -25,16 +25,16 @@ WHERE length("b"."ByteArray") = 4 } // Array access. Issue #16428. - public override Task Index(bool async) - => AssertTranslationFailed(() => base.Index(async)); + public override Task Index() + => AssertTranslationFailed(() => base.Index()); // Array access. Issue #16428. - public override Task First(bool async) - => AssertTranslationFailed(() => base.First(async)); + public override Task First() + => AssertTranslationFailed(() => base.First()); - public override async Task Contains_with_constant(bool async) + public override async Task Contains_with_constant() { - await base.Contains_with_constant(async); + await base.Contains_with_constant(); AssertSql( """ @@ -44,9 +44,9 @@ WHERE instr("b"."ByteArray", X'01') > 0 """); } - public override async Task Contains_with_parameter(bool async) + public override async Task Contains_with_parameter() { - await base.Contains_with_parameter(async); + await base.Contains_with_parameter(); AssertSql( """ @@ -58,9 +58,9 @@ WHERE instr("b"."ByteArray", char(@someByte)) > 0 """); } - public override async Task Contains_with_column(bool async) + public override async Task Contains_with_column() { - await base.Contains_with_column(async); + await base.Contains_with_column(); AssertSql( """ @@ -70,9 +70,9 @@ WHERE instr("b"."ByteArray", char("b"."Byte")) > 0 """); } - public override async Task SequenceEqual(bool async) + public override async Task SequenceEqual() { - await base.SequenceEqual(async); + await base.SequenceEqual(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/EnumTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/EnumTranslationsSqliteTest.cs index 54abbded98d..a51977b1965 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/EnumTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/EnumTranslationsSqliteTest.cs @@ -14,9 +14,9 @@ public EnumTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITestOut #region Equality - public override async Task Equality_to_constant(bool async) + public override async Task Equality_to_constant() { - await base.Equality_to_constant(async); + await base.Equality_to_constant(); AssertSql( """ @@ -26,9 +26,9 @@ public override async Task Equality_to_constant(bool async) """); } - public override async Task Equality_to_parameter(bool async) + public override async Task Equality_to_parameter() { - await base.Equality_to_parameter(async); + await base.Equality_to_parameter(); AssertSql( """ @@ -40,9 +40,9 @@ public override async Task Equality_to_parameter(bool async) """); } - public override async Task Equality_nullable_enum_to_constant(bool async) + public override async Task Equality_nullable_enum_to_constant() { - await base.Equality_nullable_enum_to_constant(async); + await base.Equality_nullable_enum_to_constant(); AssertSql( """ @@ -52,9 +52,9 @@ public override async Task Equality_nullable_enum_to_constant(bool async) """); } - public override async Task Equality_nullable_enum_to_parameter(bool async) + public override async Task Equality_nullable_enum_to_parameter() { - await base.Equality_nullable_enum_to_parameter(async); + await base.Equality_nullable_enum_to_parameter(); AssertSql( """ @@ -66,9 +66,9 @@ public override async Task Equality_nullable_enum_to_parameter(bool async) """); } - public override async Task Equality_nullable_enum_to_null_constant(bool async) + public override async Task Equality_nullable_enum_to_null_constant() { - await base.Equality_nullable_enum_to_null_constant(async); + await base.Equality_nullable_enum_to_null_constant(); AssertSql( """ @@ -78,9 +78,9 @@ public override async Task Equality_nullable_enum_to_null_constant(bool async) """); } - public override async Task Equality_nullable_enum_to_null_parameter(bool async) + public override async Task Equality_nullable_enum_to_null_parameter() { - await base.Equality_nullable_enum_to_null_parameter(async); + await base.Equality_nullable_enum_to_null_parameter(); AssertSql( """ @@ -90,9 +90,9 @@ public override async Task Equality_nullable_enum_to_null_parameter(bool async) """); } - public override async Task Equality_nullable_enum_to_nullable_parameter(bool async) + public override async Task Equality_nullable_enum_to_nullable_parameter() { - await base.Equality_nullable_enum_to_nullable_parameter(async); + await base.Equality_nullable_enum_to_nullable_parameter(); AssertSql( """ @@ -106,9 +106,9 @@ public override async Task Equality_nullable_enum_to_nullable_parameter(bool asy #endregion Equality - public override async Task Bitwise_and_enum_constant(bool async) + public override async Task Bitwise_and_enum_constant() { - await base.Bitwise_and_enum_constant(async); + await base.Bitwise_and_enum_constant(); AssertSql( """ @@ -124,9 +124,9 @@ public override async Task Bitwise_and_enum_constant(bool async) """); } - public override async Task Bitwise_and_integral_constant(bool async) + public override async Task Bitwise_and_integral_constant() { - await base.Bitwise_and_integral_constant(async); + await base.Bitwise_and_integral_constant(); AssertSql( """ @@ -148,9 +148,9 @@ WHERE CAST("b"."FlagsEnum" AS INTEGER) & 8 = 8 """); } - public override async Task Bitwise_and_nullable_enum_with_constant(bool async) + public override async Task Bitwise_and_nullable_enum_with_constant() { - await base.Bitwise_and_nullable_enum_with_constant(async); + await base.Bitwise_and_nullable_enum_with_constant(); AssertSql( """ @@ -160,9 +160,9 @@ public override async Task Bitwise_and_nullable_enum_with_constant(bool async) """); } - public override async Task Where_bitwise_and_nullable_enum_with_null_constant(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_null_constant() { - await base.Where_bitwise_and_nullable_enum_with_null_constant(async); + await base.Where_bitwise_and_nullable_enum_with_null_constant(); AssertSql( """ @@ -172,9 +172,9 @@ public override async Task Where_bitwise_and_nullable_enum_with_null_constant(bo """); } - public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_parameter() { - await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(async); + await base.Where_bitwise_and_nullable_enum_with_non_nullable_parameter(); AssertSql( """ @@ -186,9 +186,9 @@ public override async Task Where_bitwise_and_nullable_enum_with_non_nullable_par """); } - public override async Task Where_bitwise_and_nullable_enum_with_nullable_parameter(bool async) + public override async Task Where_bitwise_and_nullable_enum_with_nullable_parameter() { - await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(async); + await base.Where_bitwise_and_nullable_enum_with_nullable_parameter(); AssertSql( """ @@ -206,9 +206,9 @@ public override async Task Where_bitwise_and_nullable_enum_with_nullable_paramet """); } - public override async Task Bitwise_or(bool async) + public override async Task Bitwise_or() { - await base.Bitwise_or(async); + await base.Bitwise_or(); AssertSql( """ @@ -218,9 +218,9 @@ public override async Task Bitwise_or(bool async) """); } - public override async Task Bitwise_projects_values_in_select(bool async) + public override async Task Bitwise_projects_values_in_select() { - await base.Bitwise_projects_values_in_select(async); + await base.Bitwise_projects_values_in_select(); AssertSql( """ @@ -231,9 +231,9 @@ LIMIT 1 """); } - public override async Task HasFlag(bool async) + public override async Task HasFlag() { - await base.HasFlag(async); + await base.HasFlag(); AssertSql( """ @@ -274,9 +274,9 @@ LIMIT 1 """); } - public override async Task HasFlag_with_non_nullable_parameter(bool async) + public override async Task HasFlag_with_non_nullable_parameter() { - await base.HasFlag_with_non_nullable_parameter(async); + await base.HasFlag_with_non_nullable_parameter(); AssertSql( """ @@ -288,9 +288,9 @@ public override async Task HasFlag_with_non_nullable_parameter(bool async) """); } - public override async Task HasFlag_with_nullable_parameter(bool async) + public override async Task HasFlag_with_nullable_parameter() { - await base.HasFlag_with_nullable_parameter(async); + await base.HasFlag_with_nullable_parameter(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/GuidTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/GuidTranslationsSqliteTest.cs index 55f495f5e0f..b3e125deaa1 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/GuidTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/GuidTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public GuidTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITestOut Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task New_with_constant(bool async) + public override async Task New_with_constant() { - await base.New_with_constant(async); + await base.New_with_constant(); AssertSql( """ @@ -24,9 +24,9 @@ public override async Task New_with_constant(bool async) """); } - public override async Task New_with_parameter(bool async) + public override async Task New_with_parameter() { - await base.New_with_parameter(async); + await base.New_with_parameter(); AssertSql( """ @@ -38,9 +38,9 @@ public override async Task New_with_parameter(bool async) """); } - public override async Task ToString_projection(bool async) + public override async Task ToString_projection() { - await base.ToString_projection(async); + await base.ToString_projection(); AssertSql( """ @@ -49,8 +49,8 @@ SELECT CAST("b"."Guid" AS TEXT) """); } - public override Task NewGuid(bool async) - => AssertTranslationFailed(() => base.NewGuid(async)); + public override Task NewGuid() + => AssertTranslationFailed(() => base.NewGuid()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MathTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MathTranslationsSqliteTest.cs index 444ebc48507..7ff0390763c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MathTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MathTranslationsSqliteTest.cs @@ -12,12 +12,12 @@ public MathTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITestOut Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Abs_decimal(bool async) - => await AssertTranslationFailed(() => base.Abs_decimal(async)); // SQLite decimal support + public override async Task Abs_decimal() + => await AssertTranslationFailed(() => base.Abs_decimal()); // SQLite decimal support - public override async Task Abs_int(bool async) + public override async Task Abs_int() { - await base.Abs_int(async); + await base.Abs_int(); AssertSql( """ @@ -27,9 +27,9 @@ WHERE abs("b"."Int") = 9 """); } - public override async Task Abs_double(bool async) + public override async Task Abs_double() { - await base.Abs_double(async); + await base.Abs_double(); AssertSql( """ @@ -39,9 +39,9 @@ WHERE abs("b"."Double") = 9.5 """); } - public override async Task Abs_float(bool async) + public override async Task Abs_float() { - await base.Abs_float(async); + await base.Abs_float(); AssertSql( """ @@ -51,9 +51,9 @@ WHERE CAST(abs("b"."Float") AS REAL) = 9.5 """); } - public override async Task Ceiling(bool async) + public override async Task Ceiling() { - await base.Ceiling(async); + await base.Ceiling(); AssertSql( """ @@ -63,9 +63,9 @@ WHERE ceiling("b"."Double") = 9.0 """); } - public override async Task Ceiling_float(bool async) + public override async Task Ceiling_float() { - await base.Ceiling_float(async); + await base.Ceiling_float(); AssertSql( """ @@ -75,12 +75,12 @@ WHERE ceiling("b"."Float") = 9 """); } - public override async Task Floor_decimal(bool async) - => await AssertTranslationFailed(() => base.Floor_decimal(async)); // SQLite decimal support + public override async Task Floor_decimal() + => await AssertTranslationFailed(() => base.Floor_decimal()); // SQLite decimal support - public override async Task Floor_double(bool async) + public override async Task Floor_double() { - await base.Floor_double(async); + await base.Floor_double(); AssertSql( """ @@ -90,9 +90,9 @@ WHERE floor("b"."Double") = 8.0 """); } - public override async Task Floor_float(bool async) + public override async Task Floor_float() { - await base.Floor_float(async); + await base.Floor_float(); AssertSql( """ @@ -102,9 +102,9 @@ WHERE floor("b"."Float") = 8 """); } - public override async Task Power(bool async) + public override async Task Power() { - await base.Power(async); + await base.Power(); AssertSql( """ @@ -114,9 +114,9 @@ WHERE pow(CAST("b"."Int" AS REAL), 2.0) = 64.0 """); } - public override async Task Power_float(bool async) + public override async Task Power_float() { - await base.Power_float(async); + await base.Power_float(); AssertSql( """ @@ -126,12 +126,12 @@ WHERE pow("b"."Float", 2) > 73 AND pow("b"."Float", 2) < 74 """); } - public override async Task Round_decimal(bool async) - => await AssertTranslationFailed(() => base.Round_decimal(async)); // SQLite decimal support + public override async Task Round_decimal() + => await AssertTranslationFailed(() => base.Round_decimal()); // SQLite decimal support - public override async Task Round_double(bool async) + public override async Task Round_double() { - await base.Round_double(async); + await base.Round_double(); AssertSql( """ @@ -146,9 +146,9 @@ SELECT round("b"."Double") """); } - public override async Task Round_float(bool async) + public override async Task Round_float() { - await base.Round_float(async); + await base.Round_float(); AssertSql( """ @@ -163,12 +163,12 @@ SELECT round("b"."Float") """); } - public override async Task Round_with_digits_decimal(bool async) - => await AssertTranslationFailed(() => base.Round_with_digits_decimal(async)); // SQLite decimal support + public override async Task Round_with_digits_decimal() + => await AssertTranslationFailed(() => base.Round_with_digits_decimal()); // SQLite decimal support - public override async Task Round_with_digits_double(bool async) + public override async Task Round_with_digits_double() { - await base.Round_with_digits_double(async); + await base.Round_with_digits_double(); AssertSql( """ @@ -178,9 +178,9 @@ WHERE round("b"."Double", 1) = 255.09999999999999 """); } - public override async Task Round_with_digits_float(bool async) + public override async Task Round_with_digits_float() { - await base.Round_with_digits_float(async); + await base.Round_with_digits_float(); AssertSql( """ @@ -190,12 +190,12 @@ WHERE round(CAST("b"."Float" AS REAL), 1) = 255.09999999999999 """); } - public override async Task Truncate_decimal(bool async) - => await AssertTranslationFailed(() => base.Truncate_decimal(async)); // SQLite decimal support + public override async Task Truncate_decimal() + => await AssertTranslationFailed(() => base.Truncate_decimal()); // SQLite decimal support - public override async Task Truncate_double(bool async) + public override async Task Truncate_double() { - await base.Truncate_double(async); + await base.Truncate_double(); AssertSql( """ @@ -210,9 +210,9 @@ SELECT trunc("b"."Double") """); } - public override async Task Truncate_float(bool async) + public override async Task Truncate_float() { - await base.Truncate_float(async); + await base.Truncate_float(); AssertSql( """ @@ -227,9 +227,9 @@ SELECT trunc("b"."Float") """); } - public override async Task Truncate_project_and_order_by_it_twice(bool async) + public override async Task Truncate_project_and_order_by_it_twice() { - await base.Truncate_project_and_order_by_it_twice(async); + await base.Truncate_project_and_order_by_it_twice(); AssertSql( """ @@ -245,9 +245,9 @@ ORDER BY trunc("b"."Double") //FROM [Orders] AS [o] //WHERE [o].[OrderID] < 10250 //ORDER BY [A]"); - public override async Task Truncate_project_and_order_by_it_twice2(bool async) + public override async Task Truncate_project_and_order_by_it_twice2() { - await base.Truncate_project_and_order_by_it_twice2(async); + await base.Truncate_project_and_order_by_it_twice2(); AssertSql( """ @@ -263,9 +263,9 @@ ORDER BY trunc("b"."Double") DESC //FROM [Orders] AS [o] //WHERE [o].[OrderID] < 10250 //ORDER BY [A] DESC"); - public override async Task Truncate_project_and_order_by_it_twice3(bool async) + public override async Task Truncate_project_and_order_by_it_twice3() { - await base.Truncate_project_and_order_by_it_twice3(async); + await base.Truncate_project_and_order_by_it_twice3(); AssertSql( """ @@ -275,9 +275,9 @@ ORDER BY trunc("b"."Double") DESC """); } - public override async Task Exp(bool async) + public override async Task Exp() { - await base.Exp(async); + await base.Exp(); AssertSql( """ @@ -287,9 +287,9 @@ WHERE exp("b"."Double") > 1.0 """); } - public override async Task Exp_float(bool async) + public override async Task Exp_float() { - await base.Exp_float(async); + await base.Exp_float(); AssertSql( """ @@ -299,9 +299,9 @@ WHERE exp("b"."Float") > 1 """); } - public override async Task Log(bool async) + public override async Task Log() { - await base.Log(async); + await base.Log(); AssertSql( """ @@ -311,9 +311,9 @@ public override async Task Log(bool async) """); } - public override async Task Log_float(bool async) + public override async Task Log_float() { - await base.Log_float(async); + await base.Log_float(); AssertSql( """ @@ -323,9 +323,9 @@ public override async Task Log_float(bool async) """); } - public override async Task Log_with_newBase(bool async) + public override async Task Log_with_newBase() { - await base.Log_with_newBase(async); + await base.Log_with_newBase(); AssertSql( """ @@ -335,9 +335,9 @@ public override async Task Log_with_newBase(bool async) """); } - public override async Task Log_with_newBase_float(bool async) + public override async Task Log_with_newBase_float() { - await base.Log_with_newBase_float(async); + await base.Log_with_newBase_float(); AssertSql( """ @@ -347,9 +347,9 @@ public override async Task Log_with_newBase_float(bool async) """); } - public override async Task Log10(bool async) + public override async Task Log10() { - await base.Log10(async); + await base.Log10(); AssertSql( """ @@ -359,9 +359,9 @@ public override async Task Log10(bool async) """); } - public override async Task Log10_float(bool async) + public override async Task Log10_float() { - await base.Log10_float(async); + await base.Log10_float(); AssertSql( """ @@ -371,9 +371,9 @@ public override async Task Log10_float(bool async) """); } - public override async Task Log2(bool async) + public override async Task Log2() { - await base.Log2(async); + await base.Log2(); AssertSql( """ @@ -383,9 +383,9 @@ public override async Task Log2(bool async) """); } - public override async Task Sqrt(bool async) + public override async Task Sqrt() { - await base.Sqrt(async); + await base.Sqrt(); AssertSql( """ @@ -395,9 +395,9 @@ public override async Task Sqrt(bool async) """); } - public override async Task Sqrt_float(bool async) + public override async Task Sqrt_float() { - await base.Sqrt_float(async); + await base.Sqrt_float(); AssertSql( """ @@ -407,9 +407,9 @@ public override async Task Sqrt_float(bool async) """); } - public override async Task Sign(bool async) + public override async Task Sign() { - await base.Sign(async); + await base.Sign(); AssertSql( """ @@ -419,9 +419,9 @@ WHERE sign("b"."Double") > 0.0 """); } - public override async Task Sign_float(bool async) + public override async Task Sign_float() { - await base.Sign_float(async); + await base.Sign_float(); AssertSql( """ @@ -431,9 +431,9 @@ WHERE sign("b"."Float") > 0 """); } - public override async Task Max(bool async) + public override async Task Max() { - await base.Max(async); + await base.Max(); AssertSql( """ @@ -443,9 +443,9 @@ WHERE max("b"."Int", "b"."Short" - 3) = "b"."Int" """); } - public override async Task Max_nested(bool async) + public override async Task Max_nested() { - await base.Max_nested(async); + await base.Max_nested(); AssertSql( """ @@ -455,9 +455,9 @@ WHERE max("b"."Short" - 3, "b"."Int", 1) = "b"."Int" """); } - public override async Task Max_nested_twice(bool async) + public override async Task Max_nested_twice() { - await base.Max_nested_twice(async); + await base.Max_nested_twice(); AssertSql( """ @@ -467,9 +467,9 @@ WHERE max(1, "b"."Int", 2, "b"."Short" - 3) = "b"."Int" """); } - public override async Task Min(bool async) + public override async Task Min() { - await base.Min(async); + await base.Min(); AssertSql( """ @@ -479,9 +479,9 @@ WHERE min("b"."Int", "b"."Short" + 3) = "b"."Int" """); } - public override async Task Min_nested(bool async) + public override async Task Min_nested() { - await base.Min_nested(async); + await base.Min_nested(); AssertSql( """ @@ -491,9 +491,9 @@ WHERE min("b"."Short" + 3, "b"."Int", 99999) = "b"."Int" """); } - public override async Task Min_nested_twice(bool async) + public override async Task Min_nested_twice() { - await base.Min_nested_twice(async); + await base.Min_nested_twice(); AssertSql( """ @@ -503,9 +503,9 @@ WHERE min(99999, "b"."Int", 99998, "b"."Short" + 3) = "b"."Int" """); } - public override async Task Degrees(bool async) + public override async Task Degrees() { - await base.Degrees(async); + await base.Degrees(); AssertSql( """ @@ -515,9 +515,9 @@ WHERE degrees("b"."Double") > 0.0 """); } - public override async Task Degrees_float(bool async) + public override async Task Degrees_float() { - await base.Degrees_float(async); + await base.Degrees_float(); AssertSql( """ @@ -527,9 +527,9 @@ WHERE degrees("b"."Float") > 0 """); } - public override async Task Radians(bool async) + public override async Task Radians() { - await base.Radians(async); + await base.Radians(); AssertSql( """ @@ -539,9 +539,9 @@ WHERE radians("b"."Double") > 0.0 """); } - public override async Task Radians_float(bool async) + public override async Task Radians_float() { - await base.Radians_float(async); + await base.Radians_float(); AssertSql( """ @@ -553,9 +553,9 @@ WHERE radians("b"."Float") > 0 #region Trigonometry - public override async Task Acos(bool async) + public override async Task Acos() { - await base.Acos(async); + await base.Acos(); AssertSql( """ @@ -565,9 +565,9 @@ public override async Task Acos(bool async) """); } - public override async Task Acos_float(bool async) + public override async Task Acos_float() { - await base.Acos_float(async); + await base.Acos_float(); AssertSql( """ @@ -577,9 +577,9 @@ public override async Task Acos_float(bool async) """); } - public override async Task Acosh(bool async) + public override async Task Acosh() { - await base.Acosh(async); + await base.Acosh(); AssertSql( """ @@ -589,9 +589,9 @@ WHERE acosh("b"."Double" + 1.0) > 0.0 """); } - public override async Task Asin(bool async) + public override async Task Asin() { - await base.Asin(async); + await base.Asin(); AssertSql( """ @@ -601,9 +601,9 @@ public override async Task Asin(bool async) """); } - public override async Task Asin_float(bool async) + public override async Task Asin_float() { - await base.Asin_float(async); + await base.Asin_float(); AssertSql( """ @@ -613,9 +613,9 @@ public override async Task Asin_float(bool async) """); } - public override async Task Asinh(bool async) + public override async Task Asinh() { - await base.Asinh(async); + await base.Asinh(); AssertSql( """ @@ -625,9 +625,9 @@ WHERE asinh("b"."Double") > 0.0 """); } - public override async Task Atan(bool async) + public override async Task Atan() { - await base.Atan(async); + await base.Atan(); AssertSql( """ @@ -637,9 +637,9 @@ WHERE atan("b"."Double") > 0.0 """); } - public override async Task Atan_float(bool async) + public override async Task Atan_float() { - await base.Atan_float(async); + await base.Atan_float(); AssertSql( """ @@ -649,9 +649,9 @@ WHERE atan("b"."Float") > 0 """); } - public override async Task Atanh(bool async) + public override async Task Atanh() { - await base.Atanh(async); + await base.Atanh(); AssertSql( """ @@ -661,9 +661,9 @@ WHERE atanh("b"."Double") > -1.7976931348623157E+308 """); } - public override async Task Atan2(bool async) + public override async Task Atan2() { - await base.Atan2(async); + await base.Atan2(); AssertSql( """ @@ -673,9 +673,9 @@ WHERE atan2("b"."Double", 1.0) > 0.0 """); } - public override async Task Atan2_float(bool async) + public override async Task Atan2_float() { - await base.Atan2_float(async); + await base.Atan2_float(); AssertSql( """ @@ -685,9 +685,9 @@ WHERE atan2("b"."Float", 1) > 0 """); } - public override async Task Cos(bool async) + public override async Task Cos() { - await base.Cos(async); + await base.Cos(); AssertSql( """ @@ -697,9 +697,9 @@ WHERE cos("b"."Double") > 0.0 """); } - public override async Task Cos_float(bool async) + public override async Task Cos_float() { - await base.Cos_float(async); + await base.Cos_float(); AssertSql( """ @@ -709,9 +709,9 @@ WHERE cos("b"."Float") > 0 """); } - public override async Task Cosh(bool async) + public override async Task Cosh() { - await base.Cosh(async); + await base.Cosh(); AssertSql( """ @@ -721,9 +721,9 @@ WHERE cosh("b"."Double") > 0.0 """); } - public override async Task Sin(bool async) + public override async Task Sin() { - await base.Sin(async); + await base.Sin(); AssertSql( """ @@ -733,9 +733,9 @@ WHERE sin("b"."Double") > 0.0 """); } - public override async Task Sin_float(bool async) + public override async Task Sin_float() { - await base.Sin_float(async); + await base.Sin_float(); AssertSql( """ @@ -745,9 +745,9 @@ WHERE sin("b"."Float") > 0 """); } - public override async Task Sinh(bool async) + public override async Task Sinh() { - await base.Sinh(async); + await base.Sinh(); AssertSql( """ @@ -757,9 +757,9 @@ WHERE sinh("b"."Double") > 0.0 """); } - public override async Task Tan(bool async) + public override async Task Tan() { - await base.Tan(async); + await base.Tan(); AssertSql( """ @@ -769,9 +769,9 @@ WHERE tan("b"."Double") > 0.0 """); } - public override async Task Tan_float(bool async) + public override async Task Tan_float() { - await base.Tan_float(async); + await base.Tan_float(); AssertSql( """ @@ -781,9 +781,9 @@ WHERE tan("b"."Float") > 0 """); } - public override async Task Tanh(bool async) + public override async Task Tanh() { - await base.Tanh(async); + await base.Tanh(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqliteTest.cs index f4498a47c80..7346d05aeec 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/MiscellaneousTranslationsSqliteTest.cs @@ -14,9 +14,9 @@ public MiscellaneousTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, #region Random - public override async Task Random_on_EF_Functions(bool async) + public override async Task Random_on_EF_Functions() { - await base.Random_on_EF_Functions(async); + await base.Random_on_EF_Functions(); AssertSql( """ @@ -26,44 +26,44 @@ WHERE abs(random() / 9.2233720368547799E+18) >= 0.0 AND abs(random() / 9.2233720 """); } - public override async Task Random_Shared_Next_with_no_args(bool async) + public override async Task Random_Shared_Next_with_no_args() { - await base.Random_Shared_Next_with_no_args(async); + await base.Random_Shared_Next_with_no_args(); AssertSql(); } - public override async Task Random_Shared_Next_with_one_arg(bool async) + public override async Task Random_Shared_Next_with_one_arg() { - await base.Random_Shared_Next_with_one_arg(async); + await base.Random_Shared_Next_with_one_arg(); AssertSql(); } - public override async Task Random_Shared_Next_with_two_args(bool async) + public override async Task Random_Shared_Next_with_two_args() { - await base.Random_Shared_Next_with_two_args(async); + await base.Random_Shared_Next_with_two_args(); AssertSql(); } - public override async Task Random_new_Next_with_no_args(bool async) + public override async Task Random_new_Next_with_no_args() { - await base.Random_new_Next_with_no_args(async); + await base.Random_new_Next_with_no_args(); AssertSql(); } - public override async Task Random_new_Next_with_one_arg(bool async) + public override async Task Random_new_Next_with_one_arg() { - await base.Random_new_Next_with_one_arg(async); + await base.Random_new_Next_with_one_arg(); AssertSql(); } - public override async Task Random_new_Next_with_two_args(bool async) + public override async Task Random_new_Next_with_two_args() { - await base.Random_new_Next_with_two_args(async); + await base.Random_new_Next_with_two_args(); AssertSql(); } @@ -72,37 +72,37 @@ public override async Task Random_new_Next_with_two_args(bool async) #region Convert - public override Task Convert_ToBoolean(bool async) - => AssertTranslationFailed(() => base.Convert_ToBoolean(async)); + public override Task Convert_ToBoolean() + => AssertTranslationFailed(() => base.Convert_ToBoolean()); - public override Task Convert_ToByte(bool async) - => AssertTranslationFailed(() => base.Convert_ToByte(async)); + public override Task Convert_ToByte() + => AssertTranslationFailed(() => base.Convert_ToByte()); - public override Task Convert_ToDecimal(bool async) - => AssertTranslationFailed(() => base.Convert_ToDecimal(async)); + public override Task Convert_ToDecimal() + => AssertTranslationFailed(() => base.Convert_ToDecimal()); - public override Task Convert_ToDouble(bool async) - => AssertTranslationFailed(() => base.Convert_ToDouble(async)); + public override Task Convert_ToDouble() + => AssertTranslationFailed(() => base.Convert_ToDouble()); - public override Task Convert_ToInt16(bool async) - => AssertTranslationFailed(() => base.Convert_ToInt16(async)); + public override Task Convert_ToInt16() + => AssertTranslationFailed(() => base.Convert_ToInt16()); - public override Task Convert_ToInt32(bool async) - => AssertTranslationFailed(() => base.Convert_ToInt32(async)); + public override Task Convert_ToInt32() + => AssertTranslationFailed(() => base.Convert_ToInt32()); - public override Task Convert_ToInt64(bool async) - => AssertTranslationFailed(() => base.Convert_ToInt64(async)); + public override Task Convert_ToInt64() + => AssertTranslationFailed(() => base.Convert_ToInt64()); - public override Task Convert_ToString(bool async) - => AssertTranslationFailed(() => base.Convert_ToString(async)); + public override Task Convert_ToString() + => AssertTranslationFailed(() => base.Convert_ToString()); #endregion Convert #region Compare - public override async Task Int_Compare_to_simple_zero(bool async) + public override async Task Int_Compare_to_simple_zero() { - await base.Int_Compare_to_simple_zero(async); + await base.Int_Compare_to_simple_zero(); AssertSql( """ @@ -154,9 +154,9 @@ public override async Task Int_Compare_to_simple_zero(bool async) """); } - public override async Task DateTime_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task DateTime_Compare_to_simple_zero(bool compareTo) { - await base.DateTime_Compare_to_simple_zero(async, compareTo); + await base.DateTime_Compare_to_simple_zero(compareTo); AssertSql( """ @@ -208,9 +208,9 @@ public override async Task DateTime_Compare_to_simple_zero(bool async, bool comp """); } - public override async Task TimeSpan_Compare_to_simple_zero(bool async, bool compareTo) + public override async Task TimeSpan_Compare_to_simple_zero(bool compareTo) { - await base.TimeSpan_Compare_to_simple_zero(async, compareTo); + await base.TimeSpan_Compare_to_simple_zero(compareTo); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqliteTest.cs index 6707a6ddf6c..0fc2cc25716 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ArithmeticOperatorTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public ArithmeticOperatorTranslationsSqliteTest(BasicTypesQuerySqliteFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Add(bool async) + public override async Task Add() { - await base.Add(async); + await base.Add(); AssertSql( """ @@ -24,9 +24,9 @@ public override async Task Add(bool async) """); } - public override async Task Subtract(bool async) + public override async Task Subtract() { - await base.Subtract(async); + await base.Subtract(); AssertSql( """ @@ -36,9 +36,9 @@ public override async Task Subtract(bool async) """); } - public override async Task Multiply(bool async) + public override async Task Multiply() { - await base.Multiply(async); + await base.Multiply(); AssertSql( """ @@ -48,9 +48,9 @@ public override async Task Multiply(bool async) """); } - public override async Task Modulo(bool async) + public override async Task Modulo() { - await base.Modulo(async); + await base.Modulo(); AssertSql( """ @@ -60,9 +60,9 @@ public override async Task Modulo(bool async) """); } - public override async Task Minus(bool async) + public override async Task Minus() { - await base.Minus(async); + await base.Minus(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqliteTest.cs index 40dc45d8a27..cac94d3f8e6 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/BitwiseOperatorTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public BitwiseOperatorTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixtur Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Or(bool async) + public override async Task Or() { - await base.Or(async); + await base.Or(); AssertSql( """ @@ -29,9 +29,9 @@ SELECT CAST("b"."Int" AS INTEGER) | "b"."Long" """); } - public override async Task Or_over_boolean(bool async) + public override async Task Or_over_boolean() { - await base.Or_over_boolean(async); + await base.Or_over_boolean(); AssertSql( """ @@ -46,9 +46,9 @@ public override async Task Or_over_boolean(bool async) """); } - public override async Task Or_multiple(bool async) + public override async Task Or_multiple() { - await base.Or_multiple(async); + await base.Or_multiple(); AssertSql( """ @@ -58,9 +58,9 @@ WHERE CAST("b"."Int" | "b"."Short" AS INTEGER) | "b"."Long" = 7 """); } - public override async Task And(bool async) + public override async Task And() { - await base.And(async); + await base.And(); AssertSql( """ @@ -75,9 +75,9 @@ public override async Task And(bool async) """); } - public override async Task And_over_boolean(bool async) + public override async Task And_over_boolean() { - await base.And_over_boolean(async); + await base.And_over_boolean(); AssertSql( """ @@ -92,19 +92,17 @@ public override async Task And_over_boolean(bool async) """); } - [ConditionalTheory(Skip = "Issue #16645 bitwise xor support")] - [MemberData(nameof(IsAsyncData))] - public override Task Xor(bool async) - => AssertTranslationFailed(() => base.Xor(async)); + [ConditionalFact(Skip = "Issue #16645 bitwise xor support")] + public override Task Xor() + => AssertTranslationFailed(() => base.Xor()); - [ConditionalTheory(Skip = "Issue #16645 bitwise xor support")] - [MemberData(nameof(IsAsyncData))] - public override Task Xor_over_boolean(bool async) - => AssertTranslationFailed(() => base.Xor_over_boolean(async)); + [ConditionalFact(Skip = "Issue #16645 bitwise xor support")] + public override Task Xor_over_boolean() + => AssertTranslationFailed(() => base.Xor_over_boolean()); - public override async Task Complement(bool async) + public override async Task Complement() { - await base.Complement(async); + await base.Complement(); AssertSql( """ @@ -114,9 +112,9 @@ public override async Task Complement(bool async) """); } - public override async Task And_or_over_boolean(bool async) + public override async Task And_or_over_boolean() { - await base.And_or_over_boolean(async); + await base.And_or_over_boolean(); AssertSql( """ @@ -126,9 +124,9 @@ public override async Task And_or_over_boolean(bool async) """); } - public override async Task Or_with_logical_or(bool async) + public override async Task Or_with_logical_or() { - await base.Or_with_logical_or(async); + await base.Or_with_logical_or(); AssertSql( """ @@ -138,9 +136,9 @@ public override async Task Or_with_logical_or(bool async) """); } - public override async Task And_with_logical_and(bool async) + public override async Task And_with_logical_and() { - await base.And_with_logical_and(async); + await base.And_with_logical_and(); AssertSql( """ @@ -150,9 +148,9 @@ public override async Task And_with_logical_and(bool async) """); } - public override async Task Or_with_logical_and(bool async) + public override async Task Or_with_logical_and() { - await base.Or_with_logical_and(async); + await base.Or_with_logical_and(); AssertSql( """ @@ -162,9 +160,9 @@ public override async Task Or_with_logical_and(bool async) """); } - public override async Task And_with_logical_or(bool async) + public override async Task And_with_logical_or() { - await base.And_with_logical_or(async); + await base.And_with_logical_or(); AssertSql( """ @@ -174,11 +172,11 @@ public override async Task And_with_logical_or(bool async) """); } - public override Task Left_shift(bool async) - => AssertTranslationFailed(() => base.Left_shift(async)); + public override Task Left_shift() + => AssertTranslationFailed(() => base.Left_shift()); - public override Task Right_shift(bool async) - => AssertTranslationFailed(() => base.Right_shift(async)); + public override Task Right_shift() + => AssertTranslationFailed(() => base.Right_shift()); [ConditionalFact] public virtual void Check_all_tests_overridden() diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqliteTest.cs index 0671643f7aa..b6d2f31a5f6 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/ComparisonOperatorTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public ComparisonOperatorTranslationsSqliteTest(BasicTypesQuerySqliteFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Equal(bool async) + public override async Task Equal() { - await base.Equal(async); + await base.Equal(); AssertSql( """ @@ -24,9 +24,9 @@ public override async Task Equal(bool async) """); } - public override async Task NotEqual(bool async) + public override async Task NotEqual() { - await base.NotEqual(async); + await base.NotEqual(); AssertSql( """ @@ -36,9 +36,9 @@ public override async Task NotEqual(bool async) """); } - public override async Task GreaterThan(bool async) + public override async Task GreaterThan() { - await base.GreaterThan(async); + await base.GreaterThan(); AssertSql( """ @@ -48,9 +48,9 @@ public override async Task GreaterThan(bool async) """); } - public override async Task GreaterThanOrEqual(bool async) + public override async Task GreaterThanOrEqual() { - await base.GreaterThanOrEqual(async); + await base.GreaterThanOrEqual(); AssertSql( """ @@ -60,9 +60,9 @@ public override async Task GreaterThanOrEqual(bool async) """); } - public override async Task LessThan(bool async) + public override async Task LessThan() { - await base.LessThan(async); + await base.LessThan(); AssertSql( """ @@ -72,9 +72,9 @@ public override async Task LessThan(bool async) """); } - public override async Task LessThanOrEqual(bool async) + public override async Task LessThanOrEqual() { - await base.LessThanOrEqual(async); + await base.LessThanOrEqual(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsTest.cs index 03ed19f2767..402908c4de0 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/LogicalOperatorTranslationsTest.cs @@ -12,9 +12,9 @@ public LogicalOperatorTranslationsSqlServerTest(BasicTypesQuerySqliteFixture fix Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task And(bool async) + public override async Task And() { - await base.And(async); + await base.And(); AssertSql( """ @@ -24,9 +24,9 @@ public override async Task And(bool async) """); } - public override async Task And_with_bool_property(bool async) + public override async Task And_with_bool_property() { - await base.And_with_bool_property(async); + await base.And_with_bool_property(); AssertSql( """ @@ -36,9 +36,9 @@ public override async Task And_with_bool_property(bool async) """); } - public override async Task Or(bool async) + public override async Task Or() { - await base.Or(async); + await base.Or(); AssertSql( """ @@ -48,9 +48,9 @@ public override async Task Or(bool async) """); } - public override async Task Or_with_bool_property(bool async) + public override async Task Or_with_bool_property() { - await base.Or_with_bool_property(async); + await base.Or_with_bool_property(); AssertSql( """ @@ -60,9 +60,9 @@ public override async Task Or_with_bool_property(bool async) """); } - public override async Task Not(bool async) + public override async Task Not() { - await base.Not(async); + await base.Not(); AssertSql( """ @@ -72,9 +72,9 @@ public override async Task Not(bool async) """); } - public override async Task Not_with_bool_property(bool async) + public override async Task Not_with_bool_property() { - await base.Not_with_bool_property(async); + await base.Not_with_bool_property(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqliteTest.cs index 74bb2b78fae..cfbc3131f3d 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Operators/MiscellaneousOperatorTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public MiscellaneousOperatorTranslationsSqlServerTest(BasicTypesQuerySqliteFixtu Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Conditional(bool async) + public override async Task Conditional() { - await base.Conditional(async); + await base.Conditional(); AssertSql( """ @@ -27,9 +27,9 @@ WHERE CASE """); } - public override async Task Coalesce(bool async) + public override async Task Coalesce() { - await base.Coalesce(async); + await base.Coalesce(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs index d5b76fa9426..761da61afeb 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs @@ -16,9 +16,9 @@ public StringTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITestO #region Equals - public override async Task Equals(bool async) + public override async Task Equals() { - await base.Equals(async); + await base.Equals(); AssertSql( """ @@ -28,23 +28,23 @@ public override async Task Equals(bool async) """); } - public override async Task Equals_with_OrdinalIgnoreCase(bool async) + public override async Task Equals_with_OrdinalIgnoreCase() { - await base.Equals_with_OrdinalIgnoreCase(async); + await base.Equals_with_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Equals_with_Ordinal(bool async) + public override async Task Equals_with_Ordinal() { - await base.Equals_with_Ordinal(async); + await base.Equals_with_Ordinal(); AssertSql(); } - public override async Task Static_Equals(bool async) + public override async Task Static_Equals() { - await base.Static_Equals(async); + await base.Static_Equals(); AssertSql( """ @@ -54,16 +54,16 @@ public override async Task Static_Equals(bool async) """); } - public override async Task Static_Equals_with_OrdinalIgnoreCase(bool async) + public override async Task Static_Equals_with_OrdinalIgnoreCase() { - await base.Static_Equals_with_OrdinalIgnoreCase(async); + await base.Static_Equals_with_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Static_Equals_with_Ordinal(bool async) + public override async Task Static_Equals_with_Ordinal() { - await base.Static_Equals_with_Ordinal(async); + await base.Static_Equals_with_Ordinal(); AssertSql(); } @@ -72,9 +72,9 @@ public override async Task Static_Equals_with_Ordinal(bool async) #region Miscellaneous - public override async Task Length(bool async) + public override async Task Length() { - await base.Length(async); + await base.Length(); AssertSql( """ @@ -84,9 +84,9 @@ WHERE length("b"."String") = 7 """); } - public override async Task ToLower(bool async) + public override async Task ToLower() { - await base.ToLower(async); + await base.ToLower(); AssertSql( """ @@ -101,9 +101,9 @@ SELECT lower("b"."String") """); } - public override async Task ToUpper(bool async) + public override async Task ToUpper() { - await base.ToUpper(async); + await base.ToUpper(); AssertSql( """ @@ -122,9 +122,9 @@ SELECT upper("b"."String") #region IndexOf - public override async Task IndexOf(bool async) + public override async Task IndexOf() { - await base.IndexOf(async); + await base.IndexOf(); AssertSql( """ @@ -134,9 +134,9 @@ WHERE instr("b"."String", 'eattl') - 1 <> -1 """); } - public override async Task IndexOf_Char(bool async) + public override async Task IndexOf_Char() { - await base.IndexOf_Char(async); + await base.IndexOf_Char(); AssertSql( """ @@ -146,9 +146,9 @@ WHERE instr("b"."String", 'e') - 1 <> -1 """); } - public override async Task IndexOf_with_empty_string(bool async) + public override async Task IndexOf_with_empty_string() { - await base.IndexOf_with_empty_string(async); + await base.IndexOf_with_empty_string(); AssertSql( """ @@ -158,9 +158,9 @@ WHERE instr("b"."String", '') - 1 = 0 """); } - public override async Task IndexOf_with_one_parameter_arg(bool async) + public override async Task IndexOf_with_one_parameter_arg() { - await base.IndexOf_with_one_parameter_arg(async); + await base.IndexOf_with_one_parameter_arg(); AssertSql( """ @@ -172,9 +172,9 @@ WHERE instr("b"."String", @pattern) - 1 = 1 """); } - public override async Task IndexOf_with_one_parameter_arg_char(bool async) + public override async Task IndexOf_with_one_parameter_arg_char() { - await base.IndexOf_with_one_parameter_arg_char(async); + await base.IndexOf_with_one_parameter_arg_char(); AssertSql( """ @@ -186,9 +186,9 @@ WHERE instr("b"."String", @pattern) - 1 = 1 """); } - public override async Task IndexOf_with_constant_starting_position(bool async) + public override async Task IndexOf_with_constant_starting_position() { - await base.IndexOf_with_constant_starting_position(async); + await base.IndexOf_with_constant_starting_position(); AssertSql( """ @@ -198,9 +198,9 @@ WHERE length("b"."String") > 2 AND (instr(substr("b"."String", 2 + 1), 'e') - 1) """); } - public override async Task IndexOf_with_constant_starting_position_char(bool async) + public override async Task IndexOf_with_constant_starting_position_char() { - await base.IndexOf_with_constant_starting_position_char(async); + await base.IndexOf_with_constant_starting_position_char(); AssertSql( """ @@ -210,9 +210,9 @@ WHERE length("b"."String") > 2 AND (instr(substr("b"."String", 2 + 1), 'e') - 1) """); } - public override async Task IndexOf_with_parameter_starting_position(bool async) + public override async Task IndexOf_with_parameter_starting_position() { - await base.IndexOf_with_parameter_starting_position(async); + await base.IndexOf_with_parameter_starting_position(); AssertSql( """ @@ -224,9 +224,9 @@ WHERE length("b"."String") > 2 AND (instr(substr("b"."String", @start + 1), 'e') """); } - public override async Task IndexOf_with_parameter_starting_position_char(bool async) + public override async Task IndexOf_with_parameter_starting_position_char() { - await base.IndexOf_with_parameter_starting_position_char(async); + await base.IndexOf_with_parameter_starting_position_char(); AssertSql( """ @@ -238,9 +238,9 @@ WHERE length("b"."String") > 2 AND (instr(substr("b"."String", @start + 1), 'e') """); } - public override async Task IndexOf_after_ToString(bool async) + public override async Task IndexOf_after_ToString() { - await base.IndexOf_after_ToString(async); + await base.IndexOf_after_ToString(); AssertSql( """ @@ -250,9 +250,9 @@ WHERE instr(CAST("b"."Int" AS TEXT), '55') - 1 = 1 """); } - public override async Task IndexOf_over_ToString(bool async) + public override async Task IndexOf_over_ToString() { - await base.IndexOf_over_ToString(async); + await base.IndexOf_over_ToString(); AssertSql( """ @@ -266,9 +266,9 @@ WHERE instr('12559', CAST("b"."Int" AS TEXT)) - 1 = 1 #region Replace - public override async Task Replace(bool async) + public override async Task Replace() { - await base.Replace(async); + await base.Replace(); AssertSql( """ @@ -278,9 +278,9 @@ WHERE replace("b"."String", 'Sea', 'Rea') = 'Reattle' """); } - public override async Task Replace_Char(bool async) + public override async Task Replace_Char() { - await base.Replace_Char(async); + await base.Replace_Char(); AssertSql( """ @@ -290,9 +290,9 @@ WHERE replace("b"."String", 'S', 'R') = 'Reattle' """); } - public override async Task Replace_with_empty_string(bool async) + public override async Task Replace_with_empty_string() { - await base.Replace_with_empty_string(async); + await base.Replace_with_empty_string(); AssertSql( """ @@ -302,9 +302,9 @@ public override async Task Replace_with_empty_string(bool async) """); } - public override async Task Replace_using_property_arguments(bool async) + public override async Task Replace_using_property_arguments() { - await base.Replace_using_property_arguments(async); + await base.Replace_using_property_arguments(); AssertSql( """ @@ -318,9 +318,9 @@ public override async Task Replace_using_property_arguments(bool async) #region Substring - public override async Task Substring(bool async) + public override async Task Substring() { - await base.Substring(async); + await base.Substring(); AssertSql( """ @@ -330,9 +330,9 @@ WHERE length("b"."String") >= 3 AND substr("b"."String", 1 + 1, 2) = 'ea' """); } - public override async Task Substring_with_one_arg_with_zero_startIndex(bool async) + public override async Task Substring_with_one_arg_with_zero_startIndex() { - await base.Substring_with_one_arg_with_zero_startIndex(async); + await base.Substring_with_one_arg_with_zero_startIndex(); AssertSql( """ @@ -342,9 +342,9 @@ WHERE substr("b"."String", 0 + 1) = 'Seattle' """); } - public override async Task Substring_with_one_arg_with_constant(bool async) + public override async Task Substring_with_one_arg_with_constant() { - await base.Substring_with_one_arg_with_constant(async); + await base.Substring_with_one_arg_with_constant(); AssertSql( """ @@ -354,9 +354,9 @@ WHERE length("b"."String") >= 1 AND substr("b"."String", 1 + 1) = 'eattle' """); } - public override async Task Substring_with_one_arg_with_parameter(bool async) + public override async Task Substring_with_one_arg_with_parameter() { - await base.Substring_with_one_arg_with_parameter(async); + await base.Substring_with_one_arg_with_parameter(); AssertSql( """ @@ -368,9 +368,9 @@ WHERE length("b"."String") >= 2 AND substr("b"."String", @start + 1) = 'attle' """); } - public override async Task Substring_with_two_args_with_zero_startIndex(bool async) + public override async Task Substring_with_two_args_with_zero_startIndex() { - await base.Substring_with_two_args_with_zero_startIndex(async); + await base.Substring_with_two_args_with_zero_startIndex(); AssertSql( """ @@ -380,9 +380,9 @@ WHERE length("b"."String") >= 3 AND substr("b"."String", 0 + 1, 3) = 'Sea' """); } - public override async Task Substring_with_two_args_with_parameter(bool async) + public override async Task Substring_with_two_args_with_parameter() { - await base.Substring_with_two_args_with_parameter(async); + await base.Substring_with_two_args_with_parameter(); AssertSql( """ @@ -394,9 +394,9 @@ WHERE length("b"."String") >= 5 AND substr("b"."String", @start + 1, 3) = 'att' """); } - public override async Task Substring_with_two_args_with_IndexOf(bool async) + public override async Task Substring_with_two_args_with_IndexOf() { - await base.Substring_with_two_args_with_IndexOf(async); + await base.Substring_with_two_args_with_IndexOf(); AssertSql( """ @@ -406,9 +406,9 @@ WHERE instr("b"."String", 'a') > 0 AND substr("b"."String", (instr("b"."String", """); } - public override async Task Substring_with_two_args_with_zero_length(bool async) + public override async Task Substring_with_two_args_with_zero_length() { - await base.Substring_with_two_args_with_zero_length(async); + await base.Substring_with_two_args_with_zero_length(); AssertSql( """ @@ -422,9 +422,9 @@ WHERE length("b"."String") >= 2 AND substr("b"."String", 2 + 1, 0) = '' #region IsNullOrEmpty/Whitespace - public override async Task IsNullOrEmpty(bool async) + public override async Task IsNullOrEmpty() { - await base.IsNullOrWhiteSpace(async); + await base.IsNullOrWhiteSpace(); AssertSql( """ @@ -434,9 +434,9 @@ WHERE trim("b"."String") = '' """); } - public override async Task IsNullOrEmpty_negated(bool async) + public override async Task IsNullOrEmpty_negated() { - await base.IsNullOrEmpty_negated(async); + await base.IsNullOrEmpty_negated(); AssertSql( """ @@ -451,9 +451,9 @@ public override async Task IsNullOrEmpty_negated(bool async) """); } - public override async Task IsNullOrWhiteSpace(bool async) + public override async Task IsNullOrWhiteSpace() { - await base.IsNullOrWhiteSpace(async); + await base.IsNullOrWhiteSpace(); AssertSql( """ @@ -467,9 +467,9 @@ WHERE trim("b"."String") = '' #region StartsWith - public override async Task StartsWith_Literal(bool async) + public override async Task StartsWith_Literal() { - await base.StartsWith_Literal(async); + await base.StartsWith_Literal(); AssertSql( """ @@ -479,9 +479,9 @@ public override async Task StartsWith_Literal(bool async) """); } - public override async Task StartsWith_Literal_Char(bool async) + public override async Task StartsWith_Literal_Char() { - await base.StartsWith_Literal_Char(async); + await base.StartsWith_Literal_Char(); AssertSql( """ @@ -491,9 +491,9 @@ public override async Task StartsWith_Literal_Char(bool async) """); } - public override async Task StartsWith_Parameter(bool async) + public override async Task StartsWith_Parameter() { - await base.StartsWith_Parameter(async); + await base.StartsWith_Parameter(); AssertSql( """ @@ -505,9 +505,9 @@ public override async Task StartsWith_Parameter(bool async) """); } - public override async Task StartsWith_Parameter_Char(bool async) + public override async Task StartsWith_Parameter_Char() { - await base.StartsWith_Parameter_Char(async); + await base.StartsWith_Parameter_Char(); AssertSql( """ @@ -519,9 +519,9 @@ public override async Task StartsWith_Parameter_Char(bool async) """); } - public override async Task StartsWith_Column(bool async) + public override async Task StartsWith_Column() { - await base.StartsWith_Column(async); + await base.StartsWith_Column(); AssertSql( """ @@ -531,23 +531,23 @@ WHERE substr("b"."String", 1, length("b"."String")) = "b"."String" OR "b"."Strin """); } - public override async Task StartsWith_with_StringComparison_Ordinal(bool async) + public override async Task StartsWith_with_StringComparison_Ordinal() { - await base.StartsWith_with_StringComparison_Ordinal(async); + await base.StartsWith_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task StartsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task StartsWith_with_StringComparison_OrdinalIgnoreCase() { - await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(async); + await base.StartsWith_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task StartsWith_with_StringComparison_unsupported(bool async) + public override async Task StartsWith_with_StringComparison_unsupported() { - await base.StartsWith_with_StringComparison_unsupported(async); + await base.StartsWith_with_StringComparison_unsupported(); AssertSql(); } @@ -556,9 +556,9 @@ public override async Task StartsWith_with_StringComparison_unsupported(bool asy #region EndsWith - public override async Task EndsWith_Literal(bool async) + public override async Task EndsWith_Literal() { - await base.EndsWith_Literal(async); + await base.EndsWith_Literal(); AssertSql( """ @@ -568,9 +568,9 @@ public override async Task EndsWith_Literal(bool async) """); } - public override async Task EndsWith_Literal_Char(bool async) + public override async Task EndsWith_Literal_Char() { - await base.EndsWith_Literal_Char(async); + await base.EndsWith_Literal_Char(); AssertSql( """ @@ -580,9 +580,9 @@ public override async Task EndsWith_Literal_Char(bool async) """); } - public override async Task EndsWith_Parameter(bool async) + public override async Task EndsWith_Parameter() { - await base.EndsWith_Parameter(async); + await base.EndsWith_Parameter(); AssertSql( """ @@ -594,9 +594,9 @@ public override async Task EndsWith_Parameter(bool async) """); } - public override async Task EndsWith_Parameter_Char(bool async) + public override async Task EndsWith_Parameter_Char() { - await base.EndsWith_Parameter_Char(async); + await base.EndsWith_Parameter_Char(); AssertSql( """ @@ -608,9 +608,9 @@ public override async Task EndsWith_Parameter_Char(bool async) """); } - public override async Task EndsWith_Column(bool async) + public override async Task EndsWith_Column() { - await base.EndsWith_Column(async); + await base.EndsWith_Column(); AssertSql( """ @@ -620,23 +620,23 @@ WHERE substr("b"."String", -length("b"."String")) = "b"."String" OR "b"."String" """); } - public override async Task EndsWith_with_StringComparison_Ordinal(bool async) + public override async Task EndsWith_with_StringComparison_Ordinal() { - await base.EndsWith_with_StringComparison_Ordinal(async); + await base.EndsWith_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task EndsWith_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task EndsWith_with_StringComparison_OrdinalIgnoreCase() { - await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(async); + await base.EndsWith_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task EndsWith_with_StringComparison_unsupported(bool async) + public override async Task EndsWith_with_StringComparison_unsupported() { - await base.EndsWith_with_StringComparison_unsupported(async); + await base.EndsWith_with_StringComparison_unsupported(); AssertSql(); } @@ -645,9 +645,9 @@ public override async Task EndsWith_with_StringComparison_unsupported(bool async #region Contains - public override async Task Contains_Literal(bool async) + public override async Task Contains_Literal() { - await base.Contains_Literal(async); + await base.Contains_Literal(); AssertSql( """ @@ -657,9 +657,9 @@ WHERE instr("b"."String", 'eattl') > 0 """); } - public override async Task Contains_Literal_Char(bool async) + public override async Task Contains_Literal_Char() { - await base.Contains_Literal_Char(async); + await base.Contains_Literal_Char(); AssertSql( """ @@ -669,9 +669,9 @@ WHERE instr("b"."String", 'e') > 0 """); } - public override async Task Contains_Column(bool async) + public override async Task Contains_Column() { - await base.Contains_Column(async); + await base.Contains_Column(); AssertSql( """ @@ -686,9 +686,9 @@ SELECT instr("b"."String", "b"."String") > 0 """); } - public override async Task Contains_negated(bool async) + public override async Task Contains_negated() { - await base.Contains_negated(async); + await base.Contains_negated(); AssertSql( """ @@ -703,30 +703,30 @@ SELECT instr("b"."String", 'eattle') <= 0 """); } - public override async Task Contains_with_StringComparison_Ordinal(bool async) + public override async Task Contains_with_StringComparison_Ordinal() { - await base.Contains_with_StringComparison_Ordinal(async); + await base.Contains_with_StringComparison_Ordinal(); AssertSql(); } - public override async Task Contains_with_StringComparison_OrdinalIgnoreCase(bool async) + public override async Task Contains_with_StringComparison_OrdinalIgnoreCase() { - await base.Contains_with_StringComparison_OrdinalIgnoreCase(async); + await base.Contains_with_StringComparison_OrdinalIgnoreCase(); AssertSql(); } - public override async Task Contains_with_StringComparison_unsupported(bool async) + public override async Task Contains_with_StringComparison_unsupported() { - await base.Contains_with_StringComparison_unsupported(async); + await base.Contains_with_StringComparison_unsupported(); AssertSql(); } - public override async Task Contains_constant_with_whitespace(bool async) + public override async Task Contains_constant_with_whitespace() { - await base.Contains_constant_with_whitespace(async); + await base.Contains_constant_with_whitespace(); AssertSql( """ @@ -736,9 +736,9 @@ WHERE instr("b"."String", ' ') > 0 """); } - public override async Task Contains_parameter_with_whitespace(bool async) + public override async Task Contains_parameter_with_whitespace() { - await base.Contains_parameter_with_whitespace(async); + await base.Contains_parameter_with_whitespace(); AssertSql( """ @@ -754,9 +754,9 @@ WHERE instr("b"."String", @pattern) > 0 #region TrimStart - public override async Task TrimStart_without_arguments(bool async) + public override async Task TrimStart_without_arguments() { - await base.TrimStart_without_arguments(async); + await base.TrimStart_without_arguments(); AssertSql( """ @@ -766,9 +766,9 @@ WHERE ltrim("b"."String") = 'Boston ' """); } - public override async Task TrimStart_with_char_argument(bool async) + public override async Task TrimStart_with_char_argument() { - await base.TrimStart_with_char_argument(async); + await base.TrimStart_with_char_argument(); AssertSql( """ @@ -778,9 +778,9 @@ WHERE ltrim("b"."String", 'S') = 'eattle' """); } - public override async Task TrimStart_with_char_array_argument(bool async) + public override async Task TrimStart_with_char_array_argument() { - await base.TrimStart_with_char_array_argument(async); + await base.TrimStart_with_char_array_argument(); AssertSql( """ @@ -794,9 +794,9 @@ WHERE ltrim("b"."String", 'Se') = 'attle' #region TrimEnd - public override async Task TrimEnd_without_arguments(bool async) + public override async Task TrimEnd_without_arguments() { - await base.TrimEnd_without_arguments(async); + await base.TrimEnd_without_arguments(); AssertSql( """ @@ -806,9 +806,9 @@ WHERE rtrim("b"."String") = ' Boston' """); } - public override async Task TrimEnd_with_char_argument(bool async) + public override async Task TrimEnd_with_char_argument() { - await base.TrimEnd_with_char_argument(async); + await base.TrimEnd_with_char_argument(); AssertSql( """ @@ -818,9 +818,9 @@ WHERE rtrim("b"."String", 'e') = 'Seattl' """); } - public override async Task TrimEnd_with_char_array_argument(bool async) + public override async Task TrimEnd_with_char_array_argument() { - await base.TrimEnd_with_char_array_argument(async); + await base.TrimEnd_with_char_array_argument(); AssertSql( """ @@ -834,9 +834,9 @@ WHERE rtrim("b"."String", 'le') = 'Seatt' #region Trim - public override async Task Trim_without_argument_in_predicate(bool async) + public override async Task Trim_without_argument_in_predicate() { - await base.Trim_without_argument_in_predicate(async); + await base.Trim_without_argument_in_predicate(); AssertSql( """ @@ -846,9 +846,9 @@ WHERE trim("b"."String") = 'Boston' """); } - public override async Task Trim_with_char_argument_in_predicate(bool async) + public override async Task Trim_with_char_argument_in_predicate() { - await base.Trim_with_char_argument_in_predicate(async); + await base.Trim_with_char_argument_in_predicate(); AssertSql( """ @@ -858,9 +858,9 @@ WHERE trim("b"."String", 'S') = 'eattle' """); } - public override async Task Trim_with_char_array_argument_in_predicate(bool async) + public override async Task Trim_with_char_array_argument_in_predicate() { - await base.Trim_with_char_array_argument_in_predicate(async); + await base.Trim_with_char_array_argument_in_predicate(); AssertSql( """ @@ -874,9 +874,9 @@ WHERE trim("b"."String", 'Se') = 'attl' #region Compare - public override async Task Compare_simple_zero(bool async) + public override async Task Compare_simple_zero() { - await base.Compare_simple_zero(async); + await base.Compare_simple_zero(); AssertSql( """ @@ -916,9 +916,9 @@ public override async Task Compare_simple_zero(bool async) """); } - public override async Task Compare_simple_one(bool async) + public override async Task Compare_simple_one() { - await base.Compare_simple_one(async); + await base.Compare_simple_one(); AssertSql( """ @@ -958,9 +958,9 @@ public override async Task Compare_simple_one(bool async) """); } - public override async Task Compare_with_parameter(bool async) + public override async Task Compare_with_parameter() { - await base.Compare_with_parameter(async); + await base.Compare_with_parameter(); AssertSql( """ @@ -1019,9 +1019,9 @@ LIMIT 2 """); } - public override async Task Compare_simple_more_than_one(bool async) + public override async Task Compare_simple_more_than_one() { - await base.Compare_simple_more_than_one(async); + await base.Compare_simple_more_than_one(); AssertSql( """ @@ -1055,9 +1055,9 @@ WHERE 42 > CASE """); } - public override async Task Compare_nested(bool async) + public override async Task Compare_nested() { - await base.Compare_nested(async); + await base.Compare_nested(); AssertSql( """ @@ -1097,9 +1097,9 @@ public override async Task Compare_nested(bool async) """); } - public override async Task Compare_multi_predicate(bool async) + public override async Task Compare_multi_predicate() { - await base.Compare_multi_predicate(async); + await base.Compare_multi_predicate(); AssertSql( """ @@ -1109,9 +1109,9 @@ public override async Task Compare_multi_predicate(bool async) """); } - public override async Task CompareTo_simple_zero(bool async) + public override async Task CompareTo_simple_zero() { - await base.CompareTo_simple_zero(async); + await base.CompareTo_simple_zero(); AssertSql( """ @@ -1151,9 +1151,9 @@ public override async Task CompareTo_simple_zero(bool async) """); } - public override async Task CompareTo_simple_one(bool async) + public override async Task CompareTo_simple_one() { - await base.CompareTo_simple_one(async); + await base.CompareTo_simple_one(); AssertSql( """ @@ -1193,9 +1193,9 @@ public override async Task CompareTo_simple_one(bool async) """); } - public override async Task CompareTo_with_parameter(bool async) + public override async Task CompareTo_with_parameter() { - await base.CompareTo_with_parameter(async); + await base.CompareTo_with_parameter(); AssertSql( """ @@ -1254,9 +1254,9 @@ LIMIT 2 """); } - public override async Task CompareTo_simple_more_than_one(bool async) + public override async Task CompareTo_simple_more_than_one() { - await base.CompareTo_simple_more_than_one(async); + await base.CompareTo_simple_more_than_one(); AssertSql( """ @@ -1290,9 +1290,9 @@ WHERE 42 > CASE """); } - public override async Task CompareTo_nested(bool async) + public override async Task CompareTo_nested() { - await base.CompareTo_nested(async); + await base.CompareTo_nested(); AssertSql( """ @@ -1332,9 +1332,9 @@ public override async Task CompareTo_nested(bool async) """); } - public override async Task Compare_to_multi_predicate(bool async) + public override async Task Compare_to_multi_predicate() { - await base.Compare_to_multi_predicate(async); + await base.Compare_to_multi_predicate(); AssertSql( """ @@ -1348,9 +1348,9 @@ public override async Task Compare_to_multi_predicate(bool async) #region Join - public override async Task Join_over_non_nullable_column(bool async) + public override async Task Join_over_non_nullable_column() { - await base.Join_over_non_nullable_column(async); + await base.Join_over_non_nullable_column(); AssertSql( """ @@ -1360,9 +1360,9 @@ GROUP BY "b"."Int" """); } - public override async Task Join_over_nullable_column(bool async) + public override async Task Join_over_nullable_column() { - await base.Join_over_nullable_column(async); + await base.Join_over_nullable_column(); AssertSql( """ @@ -1375,9 +1375,9 @@ GROUP BY "n0"."Key" """); } - public override async Task Join_with_predicate(bool async) + public override async Task Join_with_predicate() { - await base.Join_with_predicate(async); + await base.Join_with_predicate(); AssertSql( """ @@ -1389,10 +1389,10 @@ GROUP BY "b"."Int" """); } - public override async Task Join_with_ordering(bool async) + public override async Task Join_with_ordering() { // SQLite does not support input ordering on aggregate methods; the below does client evaluation. - await base.Join_with_ordering(async); + await base.Join_with_ordering(); AssertSql( """ @@ -1407,16 +1407,16 @@ GROUP BY "b"."Int" """); } - public override Task Join_non_aggregate(bool async) - => AssertTranslationFailed(() => base.Join_non_aggregate(async)); + public override Task Join_non_aggregate() + => AssertTranslationFailed(() => base.Join_non_aggregate()); #endregion Join #region Concatenation - public override async Task Concat_operator(bool async) + public override async Task Concat_operator() { - await base.Concat_operator(async); + await base.Concat_operator(); AssertSql( """ @@ -1426,9 +1426,9 @@ public override async Task Concat_operator(bool async) """); } - public override async Task Concat_aggregate(bool async) + public override async Task Concat_aggregate() { - await base.Concat_aggregate(async); + await base.Concat_aggregate(); AssertSql( """ @@ -1438,9 +1438,9 @@ GROUP BY "b"."Int" """); } - public override async Task Concat_string_int_comparison1(bool async) + public override async Task Concat_string_int_comparison1() { - await base.Concat_string_int_comparison1(async); + await base.Concat_string_int_comparison1(); AssertSql( """ @@ -1452,9 +1452,9 @@ public override async Task Concat_string_int_comparison1(bool async) """); } - public override async Task Concat_string_int_comparison2(bool async) + public override async Task Concat_string_int_comparison2() { - await base.Concat_string_int_comparison2(async); + await base.Concat_string_int_comparison2(); AssertSql( """ @@ -1466,9 +1466,9 @@ WHERE CAST(@i AS TEXT) || "b"."String" = '10Seattle' """); } - public override async Task Concat_string_int_comparison3(bool async) + public override async Task Concat_string_int_comparison3() { - await base.Concat_string_int_comparison3(async); + await base.Concat_string_int_comparison3(); AssertSql( """ @@ -1481,9 +1481,9 @@ WHERE CAST(@p AS TEXT) || "b"."String" || CAST(@j AS TEXT) || CAST(42 AS TEXT) = """); } - public override async Task Concat_string_int_comparison4(bool async) + public override async Task Concat_string_int_comparison4() { - await base.Concat_string_int_comparison4(async); + await base.Concat_string_int_comparison4(); AssertSql( """ @@ -1493,9 +1493,9 @@ WHERE CAST("b"."Int" AS TEXT) || "b"."String" = '8Seattle' """); } - public override async Task Concat_string_string_comparison(bool async) + public override async Task Concat_string_string_comparison() { - await base.Concat_string_string_comparison(async); + await base.Concat_string_string_comparison(); AssertSql( """ @@ -1507,9 +1507,9 @@ public override async Task Concat_string_string_comparison(bool async) """); } - public override async Task Concat_method_comparison(bool async) + public override async Task Concat_method_comparison() { - await base.Concat_method_comparison(async); + await base.Concat_method_comparison(); AssertSql( """ @@ -1521,9 +1521,9 @@ public override async Task Concat_method_comparison(bool async) """); } - public override async Task Concat_method_comparison_2(bool async) + public override async Task Concat_method_comparison_2() { - await base.Concat_method_comparison_2(async); + await base.Concat_method_comparison_2(); AssertSql( """ @@ -1536,9 +1536,9 @@ public override async Task Concat_method_comparison_2(bool async) """); } - public override async Task Concat_method_comparison_3(bool async) + public override async Task Concat_method_comparison_3() { - await base.Concat_method_comparison_3(async); + await base.Concat_method_comparison_3(); AssertSql( """ @@ -1556,9 +1556,9 @@ public override async Task Concat_method_comparison_3(bool async) #region LINQ Operators - public override async Task FirstOrDefault(bool async) + public override async Task FirstOrDefault() { - await base.FirstOrDefault(async); + await base.FirstOrDefault(); AssertSql( """ @@ -1568,9 +1568,9 @@ WHERE substr("b"."String", 1, 1) = 'S' """); } - public override async Task LastOrDefault(bool async) + public override async Task LastOrDefault() { - await base.LastOrDefault(async); + await base.LastOrDefault(); AssertSql( """ @@ -1584,9 +1584,9 @@ WHERE substr("b"."String", length("b"."String"), 1) = 'e' #region Regex - public override async Task Regex_IsMatch(bool async) + public override async Task Regex_IsMatch() { - await base.Regex_IsMatch(async); + await base.Regex_IsMatch(); AssertSql( """ @@ -1596,9 +1596,9 @@ public override async Task Regex_IsMatch(bool async) """); } - public override async Task Regex_IsMatch_constant_input(bool async) + public override async Task Regex_IsMatch_constant_input() { - await base.Regex_IsMatch_constant_input(async); + await base.Regex_IsMatch_constant_input(); AssertSql( """ @@ -1608,12 +1608,10 @@ public override async Task Regex_IsMatch_constant_input(bool async) """); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Regex_IsMatch_negated(bool async) + [ConditionalFact] + public virtual async Task Regex_IsMatch_negated() { await AssertQuery( - async, ss => ss.Set().Where(o => !Regex.IsMatch(o.String, "^[^S]"))); AssertSql( @@ -1628,9 +1626,9 @@ await AssertQuery( #region Like - public override async Task Where_Like_and_comparison(bool async) + public override async Task Where_Like_and_comparison() { - await base.Where_Like_and_comparison(async); + await base.Where_Like_and_comparison(); AssertSql( """ @@ -1640,9 +1638,9 @@ public override async Task Where_Like_and_comparison(bool async) """); } - public override async Task Where_Like_or_comparison(bool async) + public override async Task Where_Like_or_comparison() { - await base.Where_Like_or_comparison(async); + await base.Where_Like_or_comparison(); AssertSql( """ @@ -1652,9 +1650,9 @@ public override async Task Where_Like_or_comparison(bool async) """); } - public override async Task Like_with_non_string_column_using_ToString(bool async) + public override async Task Like_with_non_string_column_using_ToString() { - await base.Like_with_non_string_column_using_ToString(async); + await base.Like_with_non_string_column_using_ToString(); AssertSql( """ @@ -1664,9 +1662,9 @@ WHERE CAST("b"."Int" AS TEXT) LIKE '%5%' """); } - public override async Task Like_with_non_string_column_using_double_cast(bool async) + public override async Task Like_with_non_string_column_using_double_cast() { - await base.Like_with_non_string_column_using_double_cast(async); + await base.Like_with_non_string_column_using_double_cast(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqliteTest.cs index a5a0765a316..44e233ea5eb 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqliteTest.cs @@ -14,9 +14,9 @@ public DateOnlyTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Year(bool async) + public override async Task Year() { - await base.Year(async); + await base.Year(); AssertSql( """ @@ -26,9 +26,9 @@ WHERE CAST(strftime('%Y', "b"."DateOnly") AS INTEGER) = 1990 """); } - public override async Task Month(bool async) + public override async Task Month() { - await base.Month(async); + await base.Month(); AssertSql( """ @@ -38,9 +38,9 @@ WHERE CAST(strftime('%m', "b"."DateOnly") AS INTEGER) = 11 """); } - public override async Task Day(bool async) + public override async Task Day() { - await base.Day(async); + await base.Day(); AssertSql( """ @@ -50,9 +50,9 @@ WHERE CAST(strftime('%d', "b"."DateOnly") AS INTEGER) = 10 """); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await base.DayOfYear(async); + await base.DayOfYear(); AssertSql( """ @@ -62,9 +62,9 @@ WHERE CAST(strftime('%j', "b"."DateOnly") AS INTEGER) = 314 """); } - public override async Task DayOfWeek(bool async) + public override async Task DayOfWeek() { - await base.DayOfWeek(async); + await base.DayOfWeek(); AssertSql( """ @@ -74,9 +74,9 @@ WHERE CAST(strftime('%w', "b"."DateOnly") AS INTEGER) = 6 """); } - public override async Task DayNumber(bool async) + public override async Task DayNumber() { - await base.DayNumber(async); + await base.DayNumber(); AssertSql( """ @@ -86,9 +86,9 @@ WHERE CAST(julianday("b"."DateOnly") - julianday('0001-01-01') AS INTEGER) = 726 """); } - public override async Task AddYears(bool async) + public override async Task AddYears() { - await base.AddYears(async); + await base.AddYears(); AssertSql( """ @@ -98,9 +98,9 @@ WHERE date("b"."DateOnly", CAST(3 AS TEXT) || ' years') = '1993-11-10' """); } - public override async Task AddMonths(bool async) + public override async Task AddMonths() { - await base.AddMonths(async); + await base.AddMonths(); AssertSql( """ @@ -110,9 +110,9 @@ WHERE date("b"."DateOnly", CAST(3 AS TEXT) || ' months') = '1991-02-10' """); } - public override async Task AddDays(bool async) + public override async Task AddDays() { - await base.AddDays(async); + await base.AddDays(); AssertSql( """ @@ -122,9 +122,9 @@ WHERE date("b"."DateOnly", CAST(3 AS TEXT) || ' days') = '1990-11-13' """); } - public override async Task DayNumber_subtraction(bool async) + public override async Task DayNumber_subtraction() { - await base.DayNumber_subtraction(async); + await base.DayNumber_subtraction(); AssertSql( """ @@ -136,9 +136,9 @@ WHERE CAST(julianday("b"."DateOnly") - julianday('0001-01-01') AS INTEGER) - @Da """); } - public override async Task FromDateTime(bool async) + public override async Task FromDateTime() { - await base.FromDateTime(async); + await base.FromDateTime(); AssertSql( """ @@ -148,9 +148,9 @@ WHERE date("b"."DateTime") = '1998-05-04' """); } - public override async Task FromDateTime_compared_to_property(bool async) + public override async Task FromDateTime_compared_to_property() { - await base.FromDateTime_compared_to_property(async); + await base.FromDateTime_compared_to_property(); AssertSql( """ @@ -160,9 +160,9 @@ WHERE date("b"."DateTime") = "b"."DateOnly" """); } - public override async Task FromDateTime_compared_to_constant_and_parameter(bool async) + public override async Task FromDateTime_compared_to_constant_and_parameter() { - await base.FromDateTime_compared_to_constant_and_parameter(async); + await base.FromDateTime_compared_to_constant_and_parameter(); AssertSql( """ @@ -174,12 +174,10 @@ WHERE date("b"."DateTime") IN (@dateOnly, '1998-05-04') """); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Where_AddYears_Year(bool async) + [ConditionalFact] + public virtual async Task Where_AddYears_Year() { await AssertQuery( - async, ss => ss.Set().Where(m => m.DateOnly.AddYears(3).Year == 1993)); AssertSql( @@ -190,12 +188,10 @@ WHERE CAST(strftime('%Y', "b"."DateOnly", CAST(3 AS TEXT) || ' years') AS INTEGE """); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual async Task Where_AddYears_AddMonths(bool async) + [ConditionalFact] + public virtual async Task Where_AddYears_AddMonths() { await AssertQuery( - async, ss => ss.Set().Where(m => m.DateOnly.AddYears(3).AddMonths(3) == new DateOnly(1994, 2, 10))); AssertSql( @@ -206,37 +202,37 @@ WHERE date("b"."DateOnly", CAST(3 AS TEXT) || ' years', CAST(3 AS TEXT) || ' mon """); } - public override async Task ToDateTime_property_with_constant_TimeOnly(bool async) + public override async Task ToDateTime_property_with_constant_TimeOnly() { - await AssertTranslationFailed(() => base.ToDateTime_property_with_constant_TimeOnly(async)); + await AssertTranslationFailed(() => base.ToDateTime_property_with_constant_TimeOnly()); AssertSql(); } - public override async Task ToDateTime_property_with_property_TimeOnly(bool async) + public override async Task ToDateTime_property_with_property_TimeOnly() { - await AssertTranslationFailed(() => base.ToDateTime_property_with_property_TimeOnly(async)); + await AssertTranslationFailed(() => base.ToDateTime_property_with_property_TimeOnly()); AssertSql(); } - public override async Task ToDateTime_constant_DateTime_with_property_TimeOnly(bool async) + public override async Task ToDateTime_constant_DateTime_with_property_TimeOnly() { - await AssertTranslationFailed(() => base.ToDateTime_constant_DateTime_with_property_TimeOnly(async)); + await AssertTranslationFailed(() => base.ToDateTime_constant_DateTime_with_property_TimeOnly()); AssertSql(); } - public override async Task ToDateTime_with_complex_DateTime(bool async) + public override async Task ToDateTime_with_complex_DateTime() { - await AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime(async)); + await AssertTranslationFailed(() => base.ToDateTime_with_complex_DateTime()); AssertSql(); } - public override async Task ToDateTime_with_complex_TimeOnly(bool async) + public override async Task ToDateTime_with_complex_TimeOnly() { - await AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly(async)); + await AssertTranslationFailed(() => base.ToDateTime_with_complex_TimeOnly()); AssertSql(); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqliteTest.cs index 646645f7247..f3393859de8 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqliteTest.cs @@ -12,100 +12,100 @@ public DateTimeOffsetTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { - await AssertTranslationFailed(() => base.Now(async)); + await AssertTranslationFailed(() => base.Now()); AssertSql(); } - public override async Task UtcNow(bool async) + public override async Task UtcNow() { - await AssertTranslationFailed(() => base.UtcNow(async)); + await AssertTranslationFailed(() => base.UtcNow()); AssertSql(); } - public override async Task Date(bool async) + public override async Task Date() { - await AssertTranslationFailed(() => base.Date(async)); + await AssertTranslationFailed(() => base.Date()); AssertSql(); } - public override async Task Year(bool async) + public override async Task Year() { - await AssertTranslationFailed(() => base.Year(async)); + await AssertTranslationFailed(() => base.Year()); AssertSql(); } - public override async Task Month(bool async) + public override async Task Month() { - await AssertTranslationFailed(() => base.Month(async)); + await AssertTranslationFailed(() => base.Month()); AssertSql(); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await AssertTranslationFailed(() => base.DayOfYear(async)); + await AssertTranslationFailed(() => base.DayOfYear()); AssertSql(); } - public override async Task Day(bool async) + public override async Task Day() { - await AssertTranslationFailed(() => base.Day(async)); + await AssertTranslationFailed(() => base.Day()); AssertSql(); } - public override async Task Hour(bool async) + public override async Task Hour() { - await AssertTranslationFailed(() => base.Hour(async)); + await AssertTranslationFailed(() => base.Hour()); AssertSql(); } - public override async Task Minute(bool async) + public override async Task Minute() { - await AssertTranslationFailed(() => base.Minute(async)); + await AssertTranslationFailed(() => base.Minute()); AssertSql(); } - public override async Task Second(bool async) + public override async Task Second() { - await AssertTranslationFailed(() => base.Second(async)); + await AssertTranslationFailed(() => base.Second()); AssertSql(); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - await AssertTranslationFailed(() => base.Millisecond(async)); + await AssertTranslationFailed(() => base.Millisecond()); AssertSql(); } - public override async Task Microsecond(bool async) + public override async Task Microsecond() { - await AssertTranslationFailed(() => base.Microsecond(async)); + await AssertTranslationFailed(() => base.Microsecond()); AssertSql(); } - public override async Task Nanosecond(bool async) + public override async Task Nanosecond() { - await AssertTranslationFailed(() => base.Nanosecond(async)); + await AssertTranslationFailed(() => base.Nanosecond()); AssertSql(); } - public override async Task TimeOfDay(bool async) + public override async Task TimeOfDay() { - await base.TimeOfDay(async); + await base.TimeOfDay(); AssertSql( """ @@ -114,9 +114,9 @@ public override async Task TimeOfDay(bool async) """); } - public override async Task AddYears(bool async) + public override async Task AddYears() { - await base.AddYears(async); + await base.AddYears(); AssertSql( """ @@ -125,9 +125,9 @@ public override async Task AddYears(bool async) """); } - public override async Task AddMonths(bool async) + public override async Task AddMonths() { - await base.AddMonths(async); + await base.AddMonths(); AssertSql( """ @@ -136,9 +136,9 @@ public override async Task AddMonths(bool async) """); } - public override async Task AddDays(bool async) + public override async Task AddDays() { - await base.AddDays(async); + await base.AddDays(); AssertSql( """ @@ -147,9 +147,9 @@ public override async Task AddDays(bool async) """); } - public override async Task AddHours(bool async) + public override async Task AddHours() { - await base.AddHours(async); + await base.AddHours(); AssertSql( """ @@ -158,9 +158,9 @@ public override async Task AddHours(bool async) """); } - public override async Task AddMinutes(bool async) + public override async Task AddMinutes() { - await base.AddMinutes(async); + await base.AddMinutes(); AssertSql( """ @@ -169,9 +169,9 @@ public override async Task AddMinutes(bool async) """); } - public override async Task AddSeconds(bool async) + public override async Task AddSeconds() { - await base.AddSeconds(async); + await base.AddSeconds(); AssertSql( """ @@ -180,9 +180,9 @@ public override async Task AddSeconds(bool async) """); } - public override async Task AddMilliseconds(bool async) + public override async Task AddMilliseconds() { - await base.AddMilliseconds(async); + await base.AddMilliseconds(); AssertSql( """ @@ -191,15 +191,15 @@ public override async Task AddMilliseconds(bool async) """); } - public override Task ToUnixTimeMilliseconds(bool async) - => AssertTranslationFailed(() => base.ToUnixTimeMilliseconds(async)); + public override Task ToUnixTimeMilliseconds() + => AssertTranslationFailed(() => base.ToUnixTimeMilliseconds()); - public override Task ToUnixTimeSecond(bool async) - => AssertTranslationFailed(() => base.ToUnixTimeSecond(async)); + public override Task ToUnixTimeSecond() + => AssertTranslationFailed(() => base.ToUnixTimeSecond()); - public override async Task Milliseconds_parameter_and_constant(bool async) + public override async Task Milliseconds_parameter_and_constant() { - await base.Milliseconds_parameter_and_constant(async); + await base.Milliseconds_parameter_and_constant(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqliteTest.cs index a40f0cff822..a7970c2d4f2 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqliteTest.cs @@ -12,9 +12,9 @@ public DateTimeTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Now(bool async) + public override async Task Now() { - await base.Now(async); + await base.Now(); AssertSql( """ @@ -26,9 +26,9 @@ WHERE rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', 'now', 'localtime'), '0'), '.') """); } - public override async Task UtcNow(bool async) + public override async Task UtcNow() { - await base.UtcNow(async); + await base.UtcNow(); AssertSql( """ @@ -40,9 +40,9 @@ WHERE rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', 'now'), '0'), '.') <> @myDatetim """); } - public override async Task Today(bool async) + public override async Task Today() { - await base.Today(async); + await base.Today(); AssertSql( """ @@ -52,9 +52,9 @@ public override async Task Today(bool async) """); } - public override async Task Date(bool async) + public override async Task Date() { - await base.Date(async); + await base.Date(); AssertSql( """ @@ -66,9 +66,9 @@ WHERE rtrim(rtrim(strftime('%Y-%m-%d %H:%M:%f', "b"."DateTime", 'start of day'), """); } - public override async Task AddYear(bool async) + public override async Task AddYear() { - await base.AddYear(async); + await base.AddYear(); AssertSql( """ @@ -78,9 +78,9 @@ WHERE CAST(strftime('%Y', "b"."DateTime", CAST(1 AS TEXT) || ' years') AS INTEGE """); } - public override async Task Year(bool async) + public override async Task Year() { - await base.Year(async); + await base.Year(); AssertSql( """ @@ -90,9 +90,9 @@ WHERE CAST(strftime('%Y', "b"."DateTime") AS INTEGER) = 1998 """); } - public override async Task Month(bool async) + public override async Task Month() { - await base.Month(async); + await base.Month(); AssertSql( """ @@ -102,9 +102,9 @@ WHERE CAST(strftime('%m', "b"."DateTime") AS INTEGER) = 5 """); } - public override async Task DayOfYear(bool async) + public override async Task DayOfYear() { - await base.DayOfYear(async); + await base.DayOfYear(); AssertSql( """ @@ -114,9 +114,9 @@ WHERE CAST(strftime('%j', "b"."DateTime") AS INTEGER) = 124 """); } - public override async Task Day(bool async) + public override async Task Day() { - await base.Day(async); + await base.Day(); AssertSql( """ @@ -126,9 +126,9 @@ WHERE CAST(strftime('%d', "b"."DateTime") AS INTEGER) = 4 """); } - public override async Task Hour(bool async) + public override async Task Hour() { - await base.Hour(async); + await base.Hour(); AssertSql( """ @@ -138,9 +138,9 @@ WHERE CAST(strftime('%H', "b"."DateTime") AS INTEGER) = 15 """); } - public override async Task Minute(bool async) + public override async Task Minute() { - await base.Minute(async); + await base.Minute(); AssertSql( """ @@ -150,9 +150,9 @@ WHERE CAST(strftime('%M', "b"."DateTime") AS INTEGER) = 30 """); } - public override async Task Second(bool async) + public override async Task Second() { - await base.Second(async); + await base.Second(); AssertSql( """ @@ -162,9 +162,9 @@ WHERE CAST(strftime('%S', "b"."DateTime") AS INTEGER) = 10 """); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { - await base.Millisecond(async); + await base.Millisecond(); AssertSql( """ @@ -174,9 +174,9 @@ public override async Task Millisecond(bool async) """); } - public override async Task TimeOfDay(bool async) + public override async Task TimeOfDay() { - await base.TimeOfDay(async); + await base.TimeOfDay(); AssertSql( """ @@ -186,12 +186,12 @@ WHERE rtrim(rtrim(strftime('%H:%M:%f', "b"."DateTime"), '0'), '.') = '00:00:00' """); } - public override Task subtract_and_TotalDays(bool async) - => AssertTranslationFailed(() => base.subtract_and_TotalDays(async)); + public override Task subtract_and_TotalDays() + => AssertTranslationFailed(() => base.subtract_and_TotalDays()); - public override async Task Parse_with_constant(bool async) + public override async Task Parse_with_constant() { - await base.Parse_with_constant(async); + await base.Parse_with_constant(); AssertSql( """ @@ -201,9 +201,9 @@ public override async Task Parse_with_constant(bool async) """); } - public override async Task Parse_with_parameter(bool async) + public override async Task Parse_with_parameter() { - await base.Parse_with_parameter(async); + await base.Parse_with_parameter(); AssertSql( """ @@ -215,9 +215,9 @@ public override async Task Parse_with_parameter(bool async) """); } - public override async Task New_with_constant(bool async) + public override async Task New_with_constant() { - await base.New_with_constant(async); + await base.New_with_constant(); AssertSql( """ @@ -227,9 +227,9 @@ public override async Task New_with_constant(bool async) """); } - public override async Task New_with_parameters(bool async) + public override async Task New_with_parameters() { - await base.New_with_parameters(async); + await base.New_with_parameters(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqliteTest.cs index eee73054212..f8ca34671cb 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqliteTest.cs @@ -12,138 +12,138 @@ public TimeOnlyTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITes Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } - public override async Task Hour(bool async) + public override async Task Hour() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Hour(async)); + await AssertTranslationFailed(() => base.Hour()); AssertSql(); } - public override async Task Minute(bool async) + public override async Task Minute() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Minute(async)); + await AssertTranslationFailed(() => base.Minute()); AssertSql(); } - public override async Task Second(bool async) + public override async Task Second() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Second(async)); + await AssertTranslationFailed(() => base.Second()); AssertSql(); } - public override async Task Millisecond(bool async) + public override async Task Millisecond() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Millisecond(async)); + await AssertTranslationFailed(() => base.Millisecond()); AssertSql(); } - public override async Task Microsecond(bool async) + public override async Task Microsecond() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Microsecond(async)); + await AssertTranslationFailed(() => base.Microsecond()); AssertSql(); } - public override async Task Nanosecond(bool async) + public override async Task Nanosecond() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Nanosecond(async)); + await AssertTranslationFailed(() => base.Nanosecond()); AssertSql(); } - public override async Task AddHours(bool async) + public override async Task AddHours() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.AddHours(async)); + await AssertTranslationFailed(() => base.AddHours()); AssertSql(); } - public override async Task AddMinutes(bool async) + public override async Task AddMinutes() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.AddMinutes(async)); + await AssertTranslationFailed(() => base.AddMinutes()); AssertSql(); } - public override async Task Add_TimeSpan(bool async) + public override async Task Add_TimeSpan() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Add_TimeSpan(async)); + await AssertTranslationFailed(() => base.Add_TimeSpan()); AssertSql(); } - public override async Task IsBetween(bool async) + public override async Task IsBetween() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.IsBetween(async)); + await AssertTranslationFailed(() => base.IsBetween()); AssertSql(); } - public override async Task Subtract(bool async) + public override async Task Subtract() { // TimeSpan. Issue #18844. - await AssertTranslationFailed(() => base.Subtract(async)); + await AssertTranslationFailed(() => base.Subtract()); AssertSql(); } - public override async Task FromDateTime_compared_to_property(bool async) + public override async Task FromDateTime_compared_to_property() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.FromDateTime_compared_to_property(async)); + await AssertTranslationFailed(() => base.FromDateTime_compared_to_property()); AssertSql(); } - public override async Task FromDateTime_compared_to_parameter(bool async) + public override async Task FromDateTime_compared_to_parameter() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.FromDateTime_compared_to_parameter(async)); + await AssertTranslationFailed(() => base.FromDateTime_compared_to_parameter()); AssertSql(); } - public override async Task FromDateTime_compared_to_constant(bool async) + public override async Task FromDateTime_compared_to_constant() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.FromDateTime_compared_to_constant(async)); + await AssertTranslationFailed(() => base.FromDateTime_compared_to_constant()); AssertSql(); } - public override async Task FromTimeSpan_compared_to_property(bool async) + public override async Task FromTimeSpan_compared_to_property() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.FromTimeSpan_compared_to_property(async)); + await AssertTranslationFailed(() => base.FromTimeSpan_compared_to_property()); AssertSql(); } - public override async Task FromTimeSpan_compared_to_parameter(bool async) + public override async Task FromTimeSpan_compared_to_parameter() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.FromTimeSpan_compared_to_parameter(async)); + await AssertTranslationFailed(() => base.FromTimeSpan_compared_to_parameter()); AssertSql(); } - public override async Task Order_by_FromTimeSpan(bool async) + public override async Task Order_by_FromTimeSpan() { // TimeOnly/DateOnly is not supported. Issue #25103. - await AssertTranslationFailed(() => base.Order_by_FromTimeSpan(async)); + await AssertTranslationFailed(() => base.Order_by_FromTimeSpan()); AssertSql(); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqliteTest.cs index 3f49f84f9cb..919280880c3 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/Temporal/TimeSpanTranslationsSqliteTest.cs @@ -13,48 +13,48 @@ public TimeSpanTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITes } // Translate TimeSpan members, #18844 - public override async Task Hours(bool async) + public override async Task Hours() { - await AssertTranslationFailed(() => base.Hours(async)); + await AssertTranslationFailed(() => base.Hours()); AssertSql(); } // Translate TimeSpan members, #18844 - public override async Task Minutes(bool async) + public override async Task Minutes() { - await AssertTranslationFailed(() => base.Minutes(async)); + await AssertTranslationFailed(() => base.Minutes()); AssertSql(); } - public override async Task Seconds(bool async) + public override async Task Seconds() { - await AssertTranslationFailed(() => base.Seconds(async)); + await AssertTranslationFailed(() => base.Seconds()); AssertSql(); } // Translate TimeSpan members, #18844 - public override async Task Milliseconds(bool async) + public override async Task Milliseconds() { - await AssertTranslationFailed(() => base.Milliseconds(async)); + await AssertTranslationFailed(() => base.Milliseconds()); AssertSql(); } // Translate TimeSpan members, #18844 - public override async Task Microseconds(bool async) + public override async Task Microseconds() { - await AssertTranslationFailed(() => base.Microseconds(async)); + await AssertTranslationFailed(() => base.Microseconds()); AssertSql(); } // Translate TimeSpan members, #18844 - public override async Task Nanoseconds(bool async) + public override async Task Nanoseconds() { - await AssertTranslationFailed(() => base.Nanoseconds(async)); + await AssertTranslationFailed(() => base.Nanoseconds()); AssertSql(); }