From a4e56e62f06835535cb789e1a1b24a25361e0765 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 1 Jun 2023 17:19:28 +0200 Subject: [PATCH] Uncomment test output helpers everywhere --- .../EmbeddedDocumentsTest.cs | 2 +- .../Query/FromSqlQueryCosmosTest.cs | 2 +- .../Query/NorthwindAggregateOperatorsQueryCosmosTest.cs | 2 +- .../Query/NorthwindFunctionsQueryCosmosTest.cs | 2 +- .../Query/NorthwindKeylessEntitiesQueryCosmosTest.cs | 2 +- .../Query/NorthwindMiscellaneousQueryCosmosTest.cs | 2 +- .../Query/NorthwindSelectQueryCosmosTest.cs | 2 +- .../Query/NorthwindWhereQueryCosmosTest.cs | 2 +- .../EntitySplittingTestBase.cs | 2 +- .../Query/JsonQueryAdHocTestBase.cs | 8 +++----- .../Query/OperatorsProceduralQueryTestBase.cs | 5 ++--- .../Query/OperatorsQueryTestBase.cs | 6 ++++-- .../TableSplittingTestBase.cs | 2 +- .../BuiltInDataTypesSqlServerTest.cs | 2 +- .../BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs | 2 +- .../BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs | 2 +- .../BulkUpdates/TPCInheritanceBulkUpdatesSqlServerTest.cs | 2 +- .../DataAnnotationSqlServerTest.cs | 3 +-- .../DbContextPoolingTest.cs | 5 ++--- .../Migrations/MigrationsSqlServerTest.cs | 2 +- .../ComplexNavigationsCollectionsQuerySqlServerTest.cs | 2 +- ...xNavigationsCollectionsSharedTypeQuerySqlServerTest.cs | 2 +- ...omplexNavigationsCollectionsSplitQuerySqlServerTest.cs | 2 +- ...gationsCollectionsSplitSharedTypeQuerySqlServerTest.cs | 2 +- .../Query/ComplexNavigationsQuerySqlServerTest.cs | 2 +- .../ComplexNavigationsSharedTypeQuerySqlServerTest.cs | 2 +- .../Query/CompositeKeysQuerySqlServerTest.cs | 2 +- .../Query/CompositeKeysSplitQuerySqlServerTest.cs | 2 +- .../Query/Ef6GroupBySqlServerTest.cs | 2 +- .../Query/FiltersInheritanceQuerySqlServerTest.cs | 2 +- .../Query/FromSqlQuerySqlServerTest.cs | 2 +- .../Query/FunkyDataQuerySqlServerTest.cs | 2 +- .../Query/GearsOfWarQuerySqlServerTest.cs | 4 +--- .../IncompleteMappingInheritanceQuerySqlServerTest.cs | 4 +--- .../Query/InheritanceQuerySqlServerTest.cs | 4 +--- .../Query/JsonQueryAdHocSqlServerTest.cs | 5 ----- .../Query/JsonQuerySqlServerTest.cs | 2 +- .../Query/ManyToManyNoTrackingQuerySqlServerTest.cs | 2 +- .../Query/ManyToManyQuerySqlServerTest.cs | 2 +- .../Query/NorthwindAsNoTrackingQuerySqlServerTest.cs | 2 +- .../Query/NorthwindDbFunctionsQuerySqlServerTest.cs | 2 +- .../Query/NorthwindEFPropertyIncludeQuerySqlServerTest.cs | 1 - .../Query/NorthwindFunctionsQuerySqlServerTest.cs | 4 +--- .../Query/NorthwindGroupByQuerySqlServerTest.cs | 2 +- .../Query/NorthwindIncludeNoTrackingQuerySqlServerTest.cs | 1 - .../Query/NorthwindIncludeQuerySqlServerTest.cs | 3 +-- .../Query/NorthwindJoinQuerySqlServerTest.cs | 2 +- .../Query/NorthwindKeylessEntitiesQuerySqlServerTest.cs | 2 +- .../Query/NorthwindMiscellaneousQuerySqlServerTest.cs | 2 +- .../Query/NorthwindNavigationsQuerySqlServerTest.cs | 2 +- .../Query/NorthwindQueryFiltersQuerySqlServerTest.cs | 2 +- .../Query/NorthwindQueryTaggingQuerySqlServerTest.cs | 2 +- .../Query/NorthwindSelectQuerySqlServerTest.cs | 2 +- .../Query/NorthwindSetOperationsQuerySqlServerTest.cs | 2 +- .../NorthwindSplitIncludeNoTrackingQuerySqlServerTest.cs | 3 +-- .../Query/NorthwindSplitIncludeQuerySqlServerTest.cs | 3 +-- .../Query/NorthwindSqlQuerySqlServerTest.cs | 2 +- .../Query/NorthwindStringIncludeQuerySqlServerTest.cs | 1 - .../Query/NullSemanticsQuerySqlServerTest.cs | 3 +-- .../Query/OperatorsProceduralSqlServerTest.cs | 1 - .../Query/OperatorsQuerySqlServerTest.cs | 8 -------- .../Query/OwnedQuerySqlServerTest.cs | 2 +- .../Query/PrimitiveCollectionsQueryOldSqlServerTest.cs | 2 +- .../Query/PrimitiveCollectionsQuerySqlServerTest.cs | 2 +- .../Query/QueryBugsTest.cs | 3 --- .../Query/QueryFilterFuncletizationSqlServerTest.cs | 2 +- .../Query/RawSqlServerTest.cs | 5 ----- .../Query/SpatialQuerySqlServerGeographyTest.cs | 2 +- .../Query/SpatialQuerySqlServerGeometryTest.cs | 2 +- .../Query/SqlExecutorSqlServerTest.cs | 3 +-- .../Query/SqlQuerySqlServerTest.cs | 2 +- .../Query/TPCFiltersInheritanceQuerySqlServerTest.cs | 2 +- .../Query/TPCGearsOfWarQuerySqlServerTest.cs | 4 +--- .../Query/TPCManyToManyNoTrackingQuerySqlServerTest.cs | 2 +- .../Query/TPCManyToManyQuerySqlServerTest.cs | 2 +- .../Query/TPCRelationshipsQuerySqlServerTest.cs | 2 +- .../Query/TPTFiltersInheritanceQuerySqlServerTest.cs | 2 +- .../Query/TPTGearsOfWarQuerySqlServerTest.cs | 4 +--- .../Query/TPTInheritanceQuerySqlServerTest.cs | 2 +- .../Query/TPTManyToManyNoTrackingQuerySqlServerTest.cs | 2 +- .../Query/TPTManyToManyQuerySqlServerTest.cs | 2 +- ...oralComplexNavigationsCollectionsQuerySqlServerTest.cs | 2 +- ...xNavigationsCollectionsSharedTypeQuerySqlServerTest.cs | 2 +- .../Query/TemporalFiltersInheritanceQuerySqlServerTest.cs | 2 +- .../Query/TemporalGearsOfWarQuerySqlServerTest.cs | 4 +--- .../Query/TemporalManyToManyQuerySqlServerTest.cs | 4 +--- .../Query/TemporalOwnedQuerySqlServerTest.cs | 2 +- .../Query/UdfDbFunctionSqlServerTests.cs | 2 +- .../Update/StoreValueGenerationIdentitySqlServerTest.cs | 2 +- ...reValueGenerationIdentityWithoutOutputSqlServerTest.cs | 2 +- .../Update/StoreValueGenerationSequenceSqlServerTest.cs | 2 +- ...reValueGenerationSequenceWithoutOutputSqlServerTest.cs | 2 +- .../UpdatesSqlServerTPCTest.cs | 1 - .../UpdatesSqlServerTPTTest.cs | 1 - .../UpdatesSqlServerTest.cs | 1 - .../UpdatesSqlServerTestBase.cs | 3 +-- .../BuiltInDataTypesSqliteTest.cs | 2 +- .../BulkUpdates/InheritanceBulkUpdatesSqliteTest.cs | 2 +- .../BulkUpdates/NorthwindBulkUpdatesSqliteTest.cs | 2 +- .../BulkUpdates/TPCInheritanceBulkUpdatesSqliteTest.cs | 2 +- .../BulkUpdates/TPTInheritanceBulkUpdatesSqliteTest.cs | 2 +- .../ConvertToProviderTypesSqliteTest.cs | 2 +- .../DataAnnotationSqliteTest.cs | 3 +-- .../Migrations/MigrationsSqliteTest.cs | 2 +- .../Query/Ef6GroupBySqliteTest.cs | 2 +- .../Query/FromSqlQuerySqliteTest.cs | 2 +- .../Query/GearsOfWarQuerySqliteTest.cs | 2 +- .../Query/InheritanceQuerySqliteTest.cs | 2 +- .../Query/JsonQueryAdHocSqliteTest.cs | 5 ----- .../Query/JsonQuerySqliteTest.cs | 2 +- .../Query/NorthwindAggregateOperatorsQuerySqliteTest.cs | 2 +- .../Query/NorthwindFunctionsQuerySqliteTest.cs | 2 +- .../Query/NorthwindGroupByQuerySqliteTest.cs | 3 +-- .../Query/NorthwindJoinQuerySqliteTest.cs | 2 +- .../Query/NorthwindKeylessEntitiesQuerySqliteTest.cs | 2 +- .../Query/NorthwindMiscellaneousQuerySqliteTest.cs | 3 +-- .../Query/NorthwindQueryFiltersQuerySqliteTest.cs | 2 +- .../Query/NorthwindSelectQuerySqliteTest.cs | 2 +- .../Query/NorthwindSetOperationsQuerySqliteTest.cs | 2 +- .../Query/NorthwindSqlQuerySqliteTest.cs | 2 +- .../Query/NorthwindWhereQuerySqliteTest.cs | 2 +- .../Query/OperatorsProceduralSqliteTest.cs | 5 ----- .../Query/OperatorsQuerySqliteTest.cs | 8 -------- .../Query/PrimitiveCollectionsQuerySqliteTest.cs | 2 +- .../Query/QueryFilterFuncletizationSqliteTest.cs | 2 +- .../Query/SpatialQuerySqliteTest.cs | 2 +- .../Query/SqlQuerySqliteTest.cs | 2 +- .../Query/TPCGearsOfWarQuerySqliteTest.cs | 2 +- .../Query/TPCInheritanceQuerySqliteTest.cs | 2 +- .../Query/TPTGearsOfWarQuerySqliteTest.cs | 2 +- .../Query/TPTInheritanceQuerySqliteTest.cs | 2 +- .../Update/StoreValueGenerationLegacySqliteTest.cs | 2 +- .../Update/StoreValueGenerationSqliteTest.cs | 2 +- 133 files changed, 126 insertions(+), 200 deletions(-) diff --git a/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs b/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs index 97682a1fec4..1988bd4b23e 100644 --- a/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs @@ -17,7 +17,7 @@ public class EmbeddedDocumentsTest : IClassFixture "JsonQueryAdHocTest"; @@ -415,4 +410,7 @@ public class MyJsonEntityArrayOfPrimitives } #endregion + + protected TestSqlLoggerFactory TestSqlLoggerFactory + => (TestSqlLoggerFactory)ListLoggerFactory; } diff --git a/test/EFCore.Relational.Specification.Tests/Query/OperatorsProceduralQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/OperatorsProceduralQueryTestBase.cs index 58dcade93cb..2fe06757e30 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/OperatorsProceduralQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/OperatorsProceduralQueryTestBase.cs @@ -23,9 +23,8 @@ private static readonly MethodInfo StringConcatMethodInfo protected ExpectedQueryRewritingVisitor ExpectedQueryRewriter { get; init; } - protected OperatorsProceduralQueryTestBase(ITestOutputHelper testOutputHelper) + protected OperatorsProceduralQueryTestBase() { - //TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); Binaries = new() { ((typeof(string), typeof(string)), typeof(bool), Expression.Equal), @@ -297,7 +296,7 @@ private Expression MainLoop( var possibleBinariesForResultType = possibleBinaries.Where(x => x.ResultType == currentResultType).ToList(); var possibleUnariesForResultType = possibleUnaries.Where(x => x.ResultType == currentResultType).ToList(); - // if we can't go any deeper (no matching operations) then simply return source + // if we can't go any deeper (no matching operations) then simply return source if (possibleBinariesForResultType.Count == 0 && possibleUnariesForResultType.Count == 0) { return AddRootPropertyAccess(random, currentResultType, rootPropertyExpressions); diff --git a/test/EFCore.Relational.Specification.Tests/Query/OperatorsQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/OperatorsQueryTestBase.cs index d2f4d3c7654..8ffc7ae0137 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/OperatorsQueryTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/OperatorsQueryTestBase.cs @@ -9,9 +9,8 @@ public abstract class OperatorsQueryTestBase : NonSharedModelTestBase { protected OperatorsData ExpectedData { get; init; } - protected OperatorsQueryTestBase(ITestOutputHelper testOutputHelper) + protected OperatorsQueryTestBase() { - //TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); ExpectedData = OperatorsData.Instance; } @@ -301,4 +300,7 @@ class Owned { public string SomeProperty { get; set; } = ""; } + + protected TestSqlLoggerFactory TestSqlLoggerFactory + => (TestSqlLoggerFactory)ListLoggerFactory; } diff --git a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs index 79965575cc3..553890e9114 100644 --- a/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/TableSplittingTestBase.cs @@ -11,7 +11,7 @@ public abstract class TableSplittingTestBase : NonSharedModelTestBase { protected TableSplittingTestBase(ITestOutputHelper testOutputHelper) { - //TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + // TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs index db332a81d50..75f3b68ec93 100644 --- a/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs @@ -22,7 +22,7 @@ public BuiltInDataTypesSqlServerTest(BuiltInDataTypesSqlServerFixture fixture, I : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs index b6f686916fe..00fa1a564bb 100644 --- a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs @@ -12,7 +12,7 @@ public InheritanceBulkUpdatesSqlServerTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs index fdfd67385c2..171bfd08739 100644 --- a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs @@ -13,7 +13,7 @@ public NorthwindBulkUpdatesSqlServerTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqlServerTest.cs index ca5b94fc7a7..8912d92fafb 100644 --- a/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqlServerTest.cs @@ -11,7 +11,7 @@ public TPCInheritanceBulkUpdatesSqlServerTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs index 49b95c883f2..cb2f9870398 100644 --- a/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs @@ -9,12 +9,11 @@ namespace Microsoft.EntityFrameworkCore; public class DataAnnotationSqlServerTest : DataAnnotationRelationalTestBase { - // ReSharper disable once UnusedParameter.Local public DataAnnotationSqlServerTest(DataAnnotationSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction) diff --git a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs index 6b0c90aa798..221b8c8cee3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs @@ -2177,11 +2177,10 @@ private async Task Dispose(IDisposable disposable, bool async) } } - private readonly ITestOutputHelper _testOutputHelper = null; + private readonly ITestOutputHelper _testOutputHelper; - // ReSharper disable once UnusedParameter.Local public DbContextPoolingTest(NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) { - //_testOutputHelper = testOutputHelper; + _testOutputHelper = testOutputHelper; } } diff --git a/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsSqlServerTest.cs index a3a39076926..c0bd201c503 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsSqlServerTest.cs @@ -24,7 +24,7 @@ public MigrationsSqlServerTest(MigrationsSqlServerFixture fixture, ITestOutputHe : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Create_table() diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs index 1d5c71899a0..341d6707f61 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public ComplexNavigationsCollectionsQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs index 03d47b657c0..e17a36d6c4f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs index 00af28c4836..b3c7eb17040 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public ComplexNavigationsCollectionsSplitQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQuerySqlServerTest.cs index de8fdf38990..bf42f2afaae 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQuerySqlServerTest.cs @@ -12,6 +12,6 @@ public ComplexNavigationsCollectionsSplitSharedTypeQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs index 3b776e520e0..802f2b48afe 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs @@ -13,7 +13,7 @@ public ComplexNavigationsQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs index 9d01362a8e4..01f6a0b396f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs @@ -14,7 +14,7 @@ public ComplexNavigationsSharedTypeQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysQuerySqlServerTest.cs index 93ef608ed80..1205b968598 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public CompositeKeysQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysSplitQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysSplitQuerySqlServerTest.cs index b9436997f58..76ca4d90720 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysSplitQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/CompositeKeysSplitQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public CompositeKeysSplitQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Ef6GroupBySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Ef6GroupBySqlServerTest.cs index da042a90b54..c40ba223132 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Ef6GroupBySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Ef6GroupBySqlServerTest.cs @@ -9,7 +9,7 @@ public Ef6GroupBySqlServerTest(Ef6GroupBySqlServerFixture fixture, ITestOutputHe : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/FiltersInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/FiltersInheritanceQuerySqlServerTest.cs index a60cf4ff48a..e415bec1428 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/FiltersInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/FiltersInheritanceQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public FiltersInheritanceQuerySqlServerTest(FiltersInheritanceQuerySqlServerFixt : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/FromSqlQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/FromSqlQuerySqlServerTest.cs index dd571b961aa..f9f1c6b36c6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/FromSqlQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/FromSqlQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public class FromSqlQuerySqlServerTest : FromSqlQueryTestBase fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task FromSqlRaw_queryable_simple(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/FunkyDataQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/FunkyDataQuerySqlServerTest.cs index c554afea882..63533eaf5f4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/FunkyDataQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/FunkyDataQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public FunkyDataQuerySqlServerTest(FunkyDataQuerySqlServerFixture fixture, ITest : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected virtual bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 111d5855b81..8617be7ebfe 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -7,13 +7,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class GearsOfWarQuerySqlServerTest : GearsOfWarQueryRelationalTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public GearsOfWarQuerySqlServerTest(GearsOfWarQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs index d1114119ee0..0aaf7f80363 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs @@ -9,15 +9,13 @@ namespace Microsoft.EntityFrameworkCore.Query; public class IncompleteMappingInheritanceQuerySqlServerTest : InheritanceRelationalQueryTestBase< IncompleteMappingInheritanceQuerySqlServerFixture> { -#pragma warning disable IDE0060 // Remove unused parameter public IncompleteMappingInheritanceQuerySqlServerTest( IncompleteMappingInheritanceQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs index 7ef197c91da..18351bc7699 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs @@ -8,13 +8,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class InheritanceQuerySqlServerTest : InheritanceRelationalQueryTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public InheritanceQuerySqlServerTest(InheritanceQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/JsonQueryAdHocSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/JsonQueryAdHocSqlServerTest.cs index 60b2e09a9f1..643d048cd11 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/JsonQueryAdHocSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/JsonQueryAdHocSqlServerTest.cs @@ -5,11 +5,6 @@ namespace Microsoft.EntityFrameworkCore.Query; public class JsonQueryAdHocSqlServerTest : JsonQueryAdHocTestBase { - public JsonQueryAdHocSqlServerTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) - { - } - protected override ITestStoreFactory TestStoreFactory => SqlServerTestStoreFactory.Instance; diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/JsonQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/JsonQuerySqlServerTest.cs index ef82a21419a..f057572bd58 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/JsonQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/JsonQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public JsonQuerySqlServerTest(JsonQuerySqlServerFixture fixture, ITestOutputHelp : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Basic_json_projection_owner_entity(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyNoTrackingQuerySqlServerTest.cs index 3b3e3026fa0..ebdde95d2bf 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyNoTrackingQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public ManyToManyNoTrackingQuerySqlServerTest(ManyToManyQuerySqlServerFixture fi : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyQuerySqlServerTest.cs index 09a38b7c6d5..1acb1d7a1c0 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public ManyToManyQuerySqlServerTest(ManyToManyQuerySqlServerFixture fixture, ITe : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAsNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAsNoTrackingQuerySqlServerTest.cs index f605747cb60..ed829800e3a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAsNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAsNoTrackingQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public NorthwindAsNoTrackingQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs index fc653cffb6a..7f97ff125e6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs @@ -16,7 +16,7 @@ public NorthwindDbFunctionsQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindEFPropertyIncludeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindEFPropertyIncludeQuerySqlServerTest.cs index e47c60ad524..fb42f6b8a42 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindEFPropertyIncludeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindEFPropertyIncludeQuerySqlServerTest.cs @@ -6,7 +6,6 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindEFPropertyIncludeQuerySqlServerTest : NorthwindEFPropertyIncludeQueryTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindEFPropertyIncludeQuerySqlServerTest(NorthwindQuerySqlServerFixture fixture) : base(fixture) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs index d8aa23243aa..12320c722dc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs @@ -9,14 +9,12 @@ public class NorthwindFunctionsQuerySqlServerTest : NorthwindFunctionsQueryRelat NorthwindQuerySqlServerFixture> { public NorthwindFunctionsQuerySqlServerTest( -#pragma warning disable IDE0060 // Remove unused parameter NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindGroupByQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindGroupByQuerySqlServerTest.cs index 931fd402620..e78b59cca9f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindGroupByQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindGroupByQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public NorthwindGroupByQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeNoTrackingQuerySqlServerTest.cs index 92cbf0125f4..58891fc8b4c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeNoTrackingQuerySqlServerTest.cs @@ -6,7 +6,6 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindIncludeNoTrackingQuerySqlServerTest : NorthwindIncludeNoTrackingQueryTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindIncludeNoTrackingQuerySqlServerTest(NorthwindQuerySqlServerFixture fixture) : base(fixture) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeQuerySqlServerTest.cs index bd7634f0388..3ca3276be9b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindIncludeQuerySqlServerTest.cs @@ -8,14 +8,13 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindIncludeQuerySqlServerTest : NorthwindIncludeQueryRelationalTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindIncludeQuerySqlServerTest( NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindJoinQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindJoinQuerySqlServerTest.cs index 1c4222eeb32..ab8d04d0bf4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindJoinQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindJoinQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public NorthwindJoinQuerySqlServerTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindKeylessEntitiesQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindKeylessEntitiesQuerySqlServerTest.cs index ec25cb173e5..a6e7f893f07 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindKeylessEntitiesQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindKeylessEntitiesQuerySqlServerTest.cs @@ -14,7 +14,7 @@ public NorthwindKeylessEntitiesQuerySqlServerTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs index dd3be5d7c6d..05d5e1d475f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs @@ -17,7 +17,7 @@ public NorthwindMiscellaneousQuerySqlServerTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindNavigationsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindNavigationsQuerySqlServerTest.cs index 5bb41fbeb7c..317cb34d830 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindNavigationsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindNavigationsQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public NorthwindNavigationsQuerySqlServerTest( : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryFiltersQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryFiltersQuerySqlServerTest.cs index 02171dd82da..2959a15f325 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryFiltersQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryFiltersQuerySqlServerTest.cs @@ -14,7 +14,7 @@ public NorthwindQueryFiltersQuerySqlServerTest( : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryTaggingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryTaggingQuerySqlServerTest.cs index 52278206f56..af283dad698 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryTaggingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindQueryTaggingQuerySqlServerTest.cs @@ -14,7 +14,7 @@ public NorthwindQueryTaggingQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs index 14a62d6a3bf..1515576eec3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public NorthwindSelectQuerySqlServerTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSetOperationsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSetOperationsQuerySqlServerTest.cs index de2ec54819e..643efce8374 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSetOperationsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSetOperationsQuerySqlServerTest.cs @@ -14,7 +14,7 @@ public NorthwindSetOperationsQuerySqlServerTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQuerySqlServerTest.cs index b53644b0bd2..b5196338282 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQuerySqlServerTest.cs @@ -8,14 +8,13 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSplitIncludeNoTrackingQuerySqlServerTest : NorthwindSplitIncludeNoTrackingQueryTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindSplitIncludeNoTrackingQuerySqlServerTest( NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeQuerySqlServerTest.cs index 09d6100122a..e869839ad05 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSplitIncludeQuerySqlServerTest.cs @@ -9,14 +9,13 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSplitIncludeQuerySqlServerTest : NorthwindSplitIncludeQueryTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindSplitIncludeQuerySqlServerTest( NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSqlQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSqlQuerySqlServerTest.cs index 996eb55ff57..6b840ffef79 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSqlQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSqlQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public class NorthwindSqlQuerySqlServerTest : NorthwindSqlQueryTestBase fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindStringIncludeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindStringIncludeQuerySqlServerTest.cs index cae3e2f3b4e..f6a8d4940e4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindStringIncludeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindStringIncludeQuerySqlServerTest.cs @@ -6,7 +6,6 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindStringIncludeQuerySqlServerTest : NorthwindStringIncludeQueryTestBase< NorthwindQuerySqlServerFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindStringIncludeQuerySqlServerTest(NorthwindQuerySqlServerFixture fixture) : base(fixture) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs index 79c6dc8fbc6..cb2cb04d5c1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs @@ -7,12 +7,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NullSemanticsQuerySqlServerTest : NullSemanticsQueryTestBase { - // ReSharper disable once UnusedParameter.Local public NullSemanticsQuerySqlServerTest(NullSemanticsQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Compare_bool_with_bool_equal(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsProceduralSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsProceduralSqlServerTest.cs index 7dba2637961..382e77276fb 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsProceduralSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsProceduralSqlServerTest.cs @@ -13,7 +13,6 @@ public class OperatorsProceduralSqlServerTest : OperatorsProceduralQueryTestBase new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(string) })!; public OperatorsProceduralSqlServerTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) { Binaries.AddRange(new List<((Type Left, Type Right) InputTypes, Type ResultType, Func OperatorCreator)> { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsQuerySqlServerTest.cs index 0b30a5f2f55..6c976d5ee66 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/OperatorsQuerySqlServerTest.cs @@ -7,17 +7,9 @@ namespace Microsoft.EntityFrameworkCore.Query; public class OperatorsQuerySqlServerTest : OperatorsQueryTestBase { - public OperatorsQuerySqlServerTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) - { - } - protected override ITestStoreFactory TestStoreFactory => SqlServerTestStoreFactory.Instance; - protected TestSqlLoggerFactory TestSqlLoggerFactory - => (TestSqlLoggerFactory)ListLoggerFactory; - protected void AssertSql(params string[] expected) => TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs index 98c7187249c..6aee96bfba0 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs @@ -8,7 +8,7 @@ public class OwnedQuerySqlServerTest : OwnedQueryRelationalTestBase> { - // ReSharper disable once UnusedParameter.Local public SqlExecutorSqlServerTest(NorthwindQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Executes_stored_procedure(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SqlQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SqlQuerySqlServerTest.cs index 2d2b9ecc76a..f4aa6680fc6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/SqlQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/SqlQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public class SqlQuerySqlServerTest : SqlQueryTestBase fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task SqlQueryRaw_queryable_simple(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCFiltersInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCFiltersInheritanceQuerySqlServerTest.cs index 472dbd42967..eafa57e4770 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCFiltersInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCFiltersInheritanceQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public TPCFiltersInheritanceQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs index 043be0c6f33..3ce60eb4044 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs @@ -7,13 +7,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class TPCGearsOfWarQuerySqlServerTest : TPCGearsOfWarQueryRelationalTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public TPCGearsOfWarQuerySqlServerTest(TPCGearsOfWarQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyNoTrackingQuerySqlServerTest.cs index 6173122c1d1..351e56bdccd 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyNoTrackingQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public TPCManyToManyNoTrackingQuerySqlServerTest(TPCManyToManyQuerySqlServerFixt : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyQuerySqlServerTest.cs index f3dc0fbb67c..aed5d771af1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCManyToManyQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public TPCManyToManyQuerySqlServerTest(TPCManyToManyQuerySqlServerFixture fixtur : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCRelationshipsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCRelationshipsQuerySqlServerTest.cs index 8e9d4df58ac..48b7c247008 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCRelationshipsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCRelationshipsQuerySqlServerTest.cs @@ -12,7 +12,7 @@ public TPCRelationshipsQuerySqlServerTest( : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTFiltersInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTFiltersInheritanceQuerySqlServerTest.cs index 4af39f70b41..785e1ea99b3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTFiltersInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTFiltersInheritanceQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public TPTFiltersInheritanceQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs index 7849b346fe6..2de0ef69f16 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs @@ -7,13 +7,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class TPTGearsOfWarQuerySqlServerTest : TPTGearsOfWarQueryRelationalTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public TPTGearsOfWarQuerySqlServerTest(TPTGearsOfWarQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTInheritanceQuerySqlServerTest.cs index 111a361639b..35f97978691 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTInheritanceQuerySqlServerTest.cs @@ -11,7 +11,7 @@ public TPTInheritanceQuerySqlServerTest(TPTInheritanceQuerySqlServerFixture fixt : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyNoTrackingQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyNoTrackingQuerySqlServerTest.cs index 2a949c57378..a7785c59126 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyNoTrackingQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyNoTrackingQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public TPTManyToManyNoTrackingQuerySqlServerTest(TPTManyToManyQuerySqlServerFixt : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyQuerySqlServerTest.cs index 6090d1e01af..c7b1bc1205c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTManyToManyQuerySqlServerTest.cs @@ -9,7 +9,7 @@ public TPTManyToManyQuerySqlServerTest(TPTManyToManyQuerySqlServerFixture fixtur : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs index dbc78848a13..8fa0f401384 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs @@ -15,7 +15,7 @@ public TemporalComplexNavigationsCollectionsQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override Expression RewriteServerQueryExpression(Expression serverQueryExpression) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs index 8e6b42856d4..2d212500009 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs @@ -15,7 +15,7 @@ public TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override Expression RewriteServerQueryExpression(Expression serverQueryExpression) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerTest.cs index 3c922201d74..f9b81ed4b4f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalFiltersInheritanceQuerySqlServerTest.cs @@ -15,7 +15,7 @@ public TemporalFiltersInheritanceQuerySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override Expression RewriteServerQueryExpression(Expression serverQueryExpression) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs index 3da4aa91429..bd03fa6cfa6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs @@ -10,13 +10,11 @@ namespace Microsoft.EntityFrameworkCore.Query; [SqlServerCondition(SqlServerCondition.SupportsTemporalTablesCascadeDelete)] public class TemporalGearsOfWarQuerySqlServerTest : GearsOfWarQueryRelationalTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public TemporalGearsOfWarQuerySqlServerTest(TemporalGearsOfWarQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override Expression RewriteServerQueryExpression(Expression serverQueryExpression) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerTest.cs index fc448965ee6..064a4c21b33 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerTest.cs @@ -8,13 +8,11 @@ namespace Microsoft.EntityFrameworkCore.Query; [SqlServerCondition(SqlServerCondition.SupportsTemporalTablesCascadeDelete)] public class TemporalManyToManyQuerySqlServerTest : ManyToManyQueryRelationalTestBase { -#pragma warning disable IDE0060 // Remove unused parameter public TemporalManyToManyQuerySqlServerTest(TemporalManyToManyQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) -#pragma warning restore IDE0060 // Remove unused parameter : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override Expression RewriteServerQueryExpression(Expression serverQueryExpression) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs index 12f594daa75..e0b23d9fabe 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalOwnedQuerySqlServerTest.cs @@ -10,7 +10,7 @@ public class TemporalOwnedQuerySqlServerTest : OwnedQueryRelationalTestBase< public TemporalOwnedQuerySqlServerTest(TemporalOwnedQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool CanExecuteQueryString diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs b/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs index aeb735fce1b..f366ec55cf7 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs @@ -11,7 +11,7 @@ public UdfDbFunctionSqlServerTests(SqlServer fixture, ITestOutputHelper testOutp : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } #region Scalar Tests diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs index 9d65a5daf13..b6bb54b4522 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentitySqlServerTest.cs @@ -14,7 +14,7 @@ public StoreValueGenerationIdentitySqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool ShouldCreateImplicitTransaction( diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityWithoutOutputSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityWithoutOutputSqlServerTest.cs index 38c7b104be9..1d91e8f06dc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityWithoutOutputSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationIdentityWithoutOutputSqlServerTest.cs @@ -14,7 +14,7 @@ public StoreValueGenerationIdentityWithoutOutputSqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool ShouldCreateImplicitTransaction( diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs index 0118c224810..2c784399841 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceSqlServerTest.cs @@ -16,7 +16,7 @@ public StoreValueGenerationSequenceSqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool ShouldCreateImplicitTransaction( diff --git a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceWithoutOutputSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceWithoutOutputSqlServerTest.cs index 5e7749f0b38..b5d6f2112f9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceWithoutOutputSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Update/StoreValueGenerationSequenceWithoutOutputSqlServerTest.cs @@ -16,7 +16,7 @@ public StoreValueGenerationSequenceWithoutOutputSqlServerTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override bool ShouldCreateImplicitTransaction( diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPCTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPCTest.cs index baa551d5a65..d8457a56165 100644 --- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPCTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPCTest.cs @@ -9,7 +9,6 @@ namespace Microsoft.EntityFrameworkCore; public class UpdatesSqlServerTPCTest : UpdatesSqlServerTestBase { - // ReSharper disable once UnusedParameter.Local public UpdatesSqlServerTPCTest(UpdatesSqlServerTPCFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture, testOutputHelper) { diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPTTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPTTest.cs index 7d96faae039..ea9afcbb9d7 100644 --- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPTTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTPTTest.cs @@ -9,7 +9,6 @@ namespace Microsoft.EntityFrameworkCore; public class UpdatesSqlServerTPTTest : UpdatesSqlServerTestBase { - // ReSharper disable once UnusedParameter.Local public UpdatesSqlServerTPTTest(UpdatesSqlServerTPTFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture, testOutputHelper) { diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs index 85353b3d725..59b6b56589b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs @@ -7,7 +7,6 @@ namespace Microsoft.EntityFrameworkCore; public class UpdatesSqlServerTest : UpdatesSqlServerTestBase { - // ReSharper disable once UnusedParameter.Local public UpdatesSqlServerTest(UpdatesSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture, testOutputHelper) { diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTestBase.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTestBase.cs index 694b05e156c..4665d2ad822 100644 --- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTestBase.cs +++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTestBase.cs @@ -10,11 +10,10 @@ namespace Microsoft.EntityFrameworkCore; public abstract class UpdatesSqlServerTestBase : UpdatesRelationalTestBase where TFixture : UpdatesSqlServerTestBase.UpdatesSqlServerFixtureBase { - // ReSharper disable once UnusedParameter.Local public UpdatesSqlServerTestBase(TFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); Fixture.TestSqlLoggerFactory.Clear(); } diff --git a/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs index a38d160303c..c90454dd9b9 100644 --- a/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs @@ -13,7 +13,7 @@ public BuiltInDataTypesSqliteTest(BuiltInDataTypesSqliteFixture fixture, ITestOu : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqliteTest.cs index 849a0f545e1..70d3f1bd9cb 100644 --- a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqliteTest.cs @@ -11,7 +11,7 @@ public InheritanceBulkUpdatesSqliteTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqliteTest.cs index 2a26d73e087..ada95466505 100644 --- a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqliteTest.cs @@ -13,7 +13,7 @@ public NorthwindBulkUpdatesSqliteTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqliteTest.cs index 08f9b13d8bb..4a52aad1c83 100644 --- a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesSqliteTest.cs @@ -11,7 +11,7 @@ public TPCInheritanceBulkUpdatesSqliteTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesSqliteTest.cs index 6b974b76140..04dddbe476a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesSqliteTest.cs @@ -11,7 +11,7 @@ public TPTInheritanceBulkUpdatesSqliteTest( : base(fixture) { ClearLog(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs index 564b30b52a2..e31b4585d0e 100644 --- a/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs @@ -10,7 +10,7 @@ public ConvertToProviderTypesSqliteTest(ConvertToProviderTypesSqliteFixture fixt : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public class ConvertToProviderTypesSqliteFixture : ConvertToProviderTypesFixtureBase diff --git a/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs index b24ac046bf3..93de117b2d4 100644 --- a/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs @@ -5,12 +5,11 @@ namespace Microsoft.EntityFrameworkCore; public class DataAnnotationSqliteTest : DataAnnotationRelationalTestBase { - // ReSharper disable once UnusedParameter.Local public DataAnnotationSqliteTest(DataAnnotationSqliteFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction) diff --git a/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs index e33aa24a543..29cba6b159c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Migrations/MigrationsSqliteTest.cs @@ -14,7 +14,7 @@ public MigrationsSqliteTest(MigrationsSqliteFixture fixture, ITestOutputHelper t : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Create_table() diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Ef6GroupBySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Ef6GroupBySqliteTest.cs index dd684826cfa..894cdd4cbdc 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Ef6GroupBySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Ef6GroupBySqliteTest.cs @@ -11,7 +11,7 @@ public Ef6GroupBySqliteTest(Ef6GroupBySqliteFixture fixture, ITestOutputHelper t : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Average_Grouped_from_LINQ_101(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/FromSqlQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/FromSqlQuerySqliteTest.cs index f0c8ef67d43..d4b0ed269c6 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/FromSqlQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/FromSqlQuerySqliteTest.cs @@ -10,7 +10,7 @@ public class FromSqlQuerySqliteTest : FromSqlQueryTestBase fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task FromSqlRaw_queryable_composed(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs index be87fb50ab5..f07d8dda383 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs @@ -13,7 +13,7 @@ public GearsOfWarQuerySqliteTest(GearsOfWarQuerySqliteFixture fixture, ITestOutp : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } [ConditionalFact] diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/InheritanceQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/InheritanceQuerySqliteTest.cs index 23a94c979bf..e37e0356cd5 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/InheritanceQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/InheritanceQuerySqliteTest.cs @@ -9,7 +9,7 @@ public InheritanceQuerySqliteTest(InheritanceQuerySqliteFixture fixture, ITestOu : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/JsonQueryAdHocSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/JsonQueryAdHocSqliteTest.cs index 3a9fa99754a..88033c590dd 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/JsonQueryAdHocSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/JsonQueryAdHocSqliteTest.cs @@ -5,11 +5,6 @@ namespace Microsoft.EntityFrameworkCore.Query; public class JsonQueryAdHocSqliteTest : JsonQueryAdHocTestBase { - public JsonQueryAdHocSqliteTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) - { - } - protected override ITestStoreFactory TestStoreFactory => SqliteTestStoreFactory.Instance; diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/JsonQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/JsonQuerySqliteTest.cs index 87530f53119..7d73ffcec7a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/JsonQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/JsonQuerySqliteTest.cs @@ -13,7 +13,7 @@ public JsonQuerySqliteTest(JsonQuerySqliteFixture fixture, ITestOutputHelper tes : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Json_scalar_length(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqliteTest.cs index c0962c17820..cfc26454937 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqliteTest.cs @@ -14,7 +14,7 @@ public NorthwindAggregateOperatorsQuerySqliteTest( : base(fixture) { ClearLog(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Sum_with_division_on_decimal(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindFunctionsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindFunctionsQuerySqliteTest.cs index 50d5d8b3b19..4a5fdf51a3e 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindFunctionsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindFunctionsQuerySqliteTest.cs @@ -15,7 +15,7 @@ public NorthwindFunctionsQuerySqliteTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override Task Convert_ToBoolean(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindGroupByQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindGroupByQuerySqliteTest.cs index a8e0f4c622c..e6ecda6e258 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindGroupByQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindGroupByQuerySqliteTest.cs @@ -8,12 +8,11 @@ namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindGroupByQuerySqliteTest : NorthwindGroupByQueryRelationalTestBase> { - // ReSharper disable once UnusedParameter.Local public NorthwindGroupByQuerySqliteTest(NorthwindQuerySqliteFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override Task Select_uncorrelated_collection_with_groupby_multiple_collections_work(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindJoinQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindJoinQuerySqliteTest.cs index c1fbef26245..b21d041d051 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindJoinQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindJoinQuerySqliteTest.cs @@ -11,7 +11,7 @@ public NorthwindJoinQuerySqliteTest(NorthwindQuerySqliteFixture> { - // ReSharper disable once UnusedParameter.Local public NorthwindMiscellaneousQuerySqliteTest( NorthwindQuerySqliteFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Query_expression_with_to_string_and_contains(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindQueryFiltersQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindQueryFiltersQuerySqliteTest.cs index 0e77b2c373b..d4931689fbe 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindQueryFiltersQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindQueryFiltersQuerySqliteTest.cs @@ -12,7 +12,7 @@ public NorthwindQueryFiltersQuerySqliteTest( : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Count_query(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindSelectQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindSelectQuerySqliteTest.cs index ac5a3cc7a2f..f1c8cbcd70c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindSelectQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindSelectQuerySqliteTest.cs @@ -12,7 +12,7 @@ public NorthwindSelectQuerySqliteTest(NorthwindQuerySqliteFixture fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override DbParameter CreateDbParameter(string name, object value) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindWhereQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindWhereQuerySqliteTest.cs index 087c7212cde..a18378d8adb 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindWhereQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NorthwindWhereQuerySqliteTest.cs @@ -9,7 +9,7 @@ public NorthwindWhereQuerySqliteTest(NorthwindQuerySqliteFixture SqliteTestStoreFactory.Instance; } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/OperatorsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/OperatorsQuerySqliteTest.cs index 91a74647a6d..fd97bfb6d81 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/OperatorsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/OperatorsQuerySqliteTest.cs @@ -5,17 +5,9 @@ namespace Microsoft.EntityFrameworkCore.Query; public class OperatorsQuerySqliteTest : OperatorsQueryTestBase { - public OperatorsQuerySqliteTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) - { - } - protected override ITestStoreFactory TestStoreFactory => SqliteTestStoreFactory.Instance; - protected TestSqlLoggerFactory TestSqlLoggerFactory - => (TestSqlLoggerFactory)ListLoggerFactory; - protected void AssertSql(params string[] expected) => TestSqlLoggerFactory.AssertBaseline(expected); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs index 4d632724f6d..7c4c417cadc 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs @@ -12,7 +12,7 @@ public PrimitiveCollectionsQuerySqliteTest(PrimitiveCollectionsQuerySqlServerFix : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task Inline_collection_of_ints_Contains(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/QueryFilterFuncletizationSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/QueryFilterFuncletizationSqliteTest.cs index 395491af42a..e68643d9c25 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/QueryFilterFuncletizationSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/QueryFilterFuncletizationSqliteTest.cs @@ -12,7 +12,7 @@ public QueryFilterFuncletizationSqliteTest( : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override void Using_multiple_entities_with_filters_reuses_parameters() diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/SpatialQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/SpatialQuerySqliteTest.cs index 06547917f93..f33422bc68a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/SpatialQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/SpatialQuerySqliteTest.cs @@ -10,7 +10,7 @@ public SpatialQuerySqliteTest(SpatialQuerySqliteFixture fixture, ITestOutputHelp : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task SimpleSelect(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/SqlQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/SqlQuerySqliteTest.cs index 5470ded8278..64ee9bc41b1 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/SqlQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/SqlQuerySqliteTest.cs @@ -10,7 +10,7 @@ public class SqlQuerySqliteTest : SqlQueryTestBase fixture, ITestOutputHelper testOutputHelper) : base(fixture) { - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override async Task SqlQueryRaw_queryable_composed(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs index d61f4d96d88..6168a7f148e 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs @@ -12,7 +12,7 @@ public TPCGearsOfWarQuerySqliteTest(TPCGearsOfWarQuerySqliteFixture fixture, ITe : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override Task Where_datetimeoffset_date_component(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPCInheritanceQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPCInheritanceQuerySqliteTest.cs index f048e2ec51b..e6645c6dc68 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/TPCInheritanceQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/TPCInheritanceQuerySqliteTest.cs @@ -9,7 +9,7 @@ public TPCInheritanceQuerySqliteTest(TPCInheritanceQuerySqliteFixture fixture, I : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs index 8433ff2455b..ce3cc2e8b40 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs @@ -12,7 +12,7 @@ public TPTGearsOfWarQuerySqliteTest(TPTGearsOfWarQuerySqliteFixture fixture, ITe : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } public override Task Where_datetimeoffset_date_component(bool async) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPTInheritanceQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPTInheritanceQuerySqliteTest.cs index d0b0b581d8a..dc1c492208f 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/TPTInheritanceQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/TPTInheritanceQuerySqliteTest.cs @@ -9,7 +9,7 @@ public TPTInheritanceQuerySqliteTest(TPTInheritanceQuerySqliteFixture fixture, I : base(fixture) { Fixture.TestSqlLoggerFactory.Clear(); - //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction) diff --git a/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationLegacySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationLegacySqliteTest.cs index 288948b047f..81d84a99e6d 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationLegacySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationLegacySqliteTest.cs @@ -13,7 +13,7 @@ public StoreValueGenerationWithoutReturningSqliteTest( : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - // fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } // We don't currently batch in Sqlite (the perf impact is likely to be minimal, no networking) diff --git a/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationSqliteTest.cs index a84143fffec..a60ff87d780 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Update/StoreValueGenerationSqliteTest.cs @@ -13,7 +13,7 @@ public StoreValueGenerationSqliteTest(StoreValueGenerationSqliteFixture fixture, : base(fixture) { fixture.TestSqlLoggerFactory.Clear(); - // fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); + fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } // We don't currently batch in Sqlite (the perf impact is likely to be minimal, no networking)