Fix configuration order in tests (nhibernate#3557)

hazzik · Jun 11, 2024 · 7ed5bc8 · 7ed5bc8
1 parent dd77529
commit 7ed5bc8
Show file tree

Hide file tree

Showing 164 changed files with 128 additions and 293 deletions.
diff --git a/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs b/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs
@@ -33,9 +33,9 @@ public class NativeSQLBulkOperationsWithCacheAsync : TestCase
 
  protected override void Configure(Configuration configuration)
  {
- cfg.SetProperty(Environment.UseQueryCache, "true");
- cfg.SetProperty(Environment.UseSecondLevelCache, "true");
- cfg.SetProperty(Environment.CacheProvider, typeof(SubstituteCacheProvider).AssemblyQualifiedName);
+ configuration.SetProperty(Environment.UseQueryCache, "true");
+ configuration.SetProperty(Environment.UseSecondLevelCache, "true");
+ configuration.SetProperty(Environment.CacheProvider, typeof(SubstituteCacheProvider).AssemblyQualifiedName);
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs b/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs
@@ -54,7 +54,6 @@ protected override string[] Mappings
 
  protected override void Configure(NHibernate.Cfg.Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(NHibernate.Cfg.Environment.GenerateStatistics, "true");
  configuration.SetProperty(NHibernate.Cfg.Environment.BatchSize, "0");
  }

diff --git a/src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs b/src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs
@@ -24,13 +24,12 @@ namespace NHibernate.Test.ConnectionTest
  [TestFixture]
  public class AggressiveReleaseTestAsync : ConnectionManagementTestCase
  {
- protected override void Configure(Configuration cfg)
+ protected override void Configure(Configuration configuration)
  {
- base.Configure(cfg);
- cfg.SetProperty(Environment.ReleaseConnections, "after_transaction");
- //cfg.SetProperty(Environment.ConnectionProvider, typeof(DummyConnectionProvider).AssemblyQualifiedName);
- //cfg.SetProperty(Environment.GenerateStatistics, "true");
- cfg.SetProperty(Environment.BatchSize, "0");
+ configuration.SetProperty(Environment.ReleaseConnections, "after_transaction");
+ //configuration.SetProperty(Environment.ConnectionProvider, typeof(DummyConnectionProvider).AssemblyQualifiedName);
+ //configuration.SetProperty(Environment.GenerateStatistics, "true");
+ configuration.SetProperty(Environment.BatchSize, "0");
  }
 
  protected override ISession GetSessionUnderTest()

diff --git a/src/NHibernate.Test/Async/ConnectionTest/BatcherFixture.cs b/src/NHibernate.Test/Async/ConnectionTest/BatcherFixture.cs
@@ -22,10 +22,9 @@ namespace NHibernate.Test.ConnectionTest
  [TestFixture]
  public class BatcherFixtureAsync : ConnectionManagementTestCase
  {
- protected override void Configure(Configuration config)
+ protected override void Configure(Configuration configuration)
  {
- base.Configure(config);
- config.SetProperty(Environment.BatchSize, "10");
+ configuration.SetProperty(Environment.BatchSize, "10");
  }
 
  protected override ISession GetSessionUnderTest()
@@ -53,4 +52,4 @@ public async Task CanCloseCommandsAndUseBatcherAsync()
  }
  }
  }
-}
+}
diff --git a/src/NHibernate.Test/Async/Criteria/ReadonlyTests/QueryOverCacheableTests.cs b/src/NHibernate.Test/Async/Criteria/ReadonlyTests/QueryOverCacheableTests.cs
@@ -27,7 +27,6 @@ protected override void Configure(Configuration config)
  {
  config.SetProperty(Environment.UseQueryCache, "true");
  config.SetProperty(Environment.GenerateStatistics, "true");
- base.Configure(config);
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs b/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs
@@ -44,7 +44,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
  configuration.Properties[Environment.UseSecondLevelCache] = "true";
  }

diff --git a/src/NHibernate.Test/Async/Futures/FallbackFixture.cs b/src/NHibernate.Test/Async/Futures/FallbackFixture.cs
@@ -43,8 +43,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
- using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
+ using (var cp = ConnectionProviderFactory.NewConnectionProvider(configuration.Properties))
  {
  if (cp.Driver is SqlClientDriver)
  {

diff --git a/src/NHibernate.Test/Async/Generatedkeys/Identity/IdentityGeneratedKeysTest.cs b/src/NHibernate.Test/Async/Generatedkeys/Identity/IdentityGeneratedKeysTest.cs
@@ -36,7 +36,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.GenerateStatistics, "true");
  }
 

diff --git a/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs b/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs
@@ -29,7 +29,6 @@ public class ImmutableTestAsync : TestCase
  {
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(NHibernate.Cfg.Environment.GenerateStatistics, "true");
  configuration.SetProperty(NHibernate.Cfg.Environment.BatchSize, "0");
  }

diff --git a/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs b/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs
@@ -30,7 +30,6 @@ public class LazyGroupFixtureAsync : TestCase
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
  configuration.Properties[Environment.UseSecondLevelCache] = "true";
  configuration.Properties[Environment.GenerateStatistics] = "true";

diff --git a/src/NHibernate.Test/Async/Linq/ByMethod/GroupByHavingTests.cs b/src/NHibernate.Test/Async/Linq/ByMethod/GroupByHavingTests.cs
@@ -22,7 +22,6 @@ public class GroupByHavingTestsAsync : LinqTestCase
  {
  protected override void Configure(Cfg.Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Cfg.Environment.ShowSql, "true");
  } 
 

diff --git a/src/NHibernate.Test/Async/Linq/ByMethod/OrderByTests.cs b/src/NHibernate.Test/Async/Linq/ByMethod/OrderByTests.cs
@@ -22,7 +22,6 @@ public class OrderByTestsAsync : LinqTestCase
  {
  protected override void Configure(Cfg.Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.ShowSql, "true");
  }
 

diff --git a/src/NHibernate.Test/Async/Linq/PreEvaluationTests.cs b/src/NHibernate.Test/Async/Linq/PreEvaluationTests.cs
@@ -36,8 +36,6 @@ public PreEvaluationTestsAsync(bool legacy, bool fallback)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
-
  configuration.SetProperty(Environment.FormatSql, "false");
  configuration.SetProperty(Environment.LinqToHqlLegacyPreEvaluation, LegacyPreEvaluation.ToString());
  configuration.SetProperty(Environment.LinqToHqlFallbackOnPreEvaluation, FallbackOnPreEvaluation.ToString());

diff --git a/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs b/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs
@@ -21,11 +21,10 @@ namespace NHibernate.Test.Linq
  [TestFixture]
  public class QueryCacheableTestsAsync : LinqTestCase
  {
- protected override void Configure(Configuration cfg)
+ protected override void Configure(Configuration configuration)
  {
- cfg.SetProperty(Environment.UseQueryCache, "true");
- cfg.SetProperty(Environment.GenerateStatistics, "true");
- base.Configure(cfg);
+ configuration.SetProperty(Environment.UseQueryCache, "true");
+ configuration.SetProperty(Environment.GenerateStatistics, "true");
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/Linq/QueryFlushModeTests.cs b/src/NHibernate.Test/Async/Linq/QueryFlushModeTests.cs
@@ -22,7 +22,6 @@ public class QueryFlushModeTestsAsync : LinqTestCase
  protected override void Configure(Configuration configuration)
  {
  configuration.SetProperty(Environment.GenerateStatistics, "true");
- base.Configure(configuration);
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs b/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs
@@ -32,7 +32,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.BatchStrategy,
  typeof(TimeoutCatchingNonBatchingBatcherFactory).AssemblyQualifiedName);
  }

diff --git a/src/NHibernate.Test/Async/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs b/src/NHibernate.Test/Async/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs
@@ -44,7 +44,6 @@ protected override void Configure(Configuration configuration)
  x.MultiTenancyConnectionProvider<TestMultiTenancyConnectionProvider>();
  });
  configuration.Properties[Cfg.Environment.GenerateStatistics] = "true";
- base.Configure(configuration);
  }
 
  private static void ValidateSqlServerConnectionAppName(ISession s, string tenantId)

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs
@@ -45,7 +45,6 @@ protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 
  protected override void Configure(Cfg.Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.ShowSql, "true");
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs
@@ -32,7 +32,6 @@ protected override string MappingsAssembly
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.LinqToHqlGeneratorsRegistry<EntityWithUserTypePropertyGeneratorsRegistry>();
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/FileStreamSql2008/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/FileStreamSql2008/Fixture.cs
@@ -39,10 +39,10 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
  return dialect is MsSql2008Dialect;
  }
 
- protected override void Configure(Configuration cfg)
+ protected override void Configure(Configuration configuration)
  {
  //Points to the database created with FileStream Filegroup.
- cfg.Properties["connection.connection_string"] =
+ configuration.Properties["connection.connection_string"] =
  @"Data Source=localhost\SQLEXPRESS;Initial Catalog=FileStreamDB;Integrated Security=True;Pooling=False";
 
  #region CREATE DATABASE example

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1486/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1486/Fixture.cs
@@ -24,7 +24,6 @@ public class FixtureAsync : BugTestCase
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetInterceptor(_interceptor);
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs
@@ -28,7 +28,6 @@ public class FixtureAsync : BugTestCase
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.AppendListeners(ListenerType.PostUpdate, new[] { _auditEventListener });
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1547/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1547/Fixture.cs
@@ -34,8 +34,6 @@ public class FixtureAsync : BugTestCase
  {
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
-
  var driverClass = ReflectHelper.ClassForName(configuration.GetProperty(Cfg.Environment.ConnectionDriver));
  DriverForSubstitutedCommand.DriverClass = driverClass;
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1730/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1730/Fixture.cs
@@ -19,7 +19,7 @@ public class FixtureAsync : BugTestCase
  {
  protected override void Configure(Configuration configuration)
  {
- cfg.SetProperty(Environment.GenerateStatistics, "true");
+ configuration.SetProperty(Environment.GenerateStatistics, "true");
  }
 
  protected override void OnTearDown()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepth0Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepth0Fixture.cs
@@ -26,7 +26,6 @@ public CircularReferenceFetchDepth0FixtureAsync() : base(0)
  protected override void Configure(Configuration configuration)
  {
  configuration.SetProperty("max_fetch_depth", "0");
- base.Configure(configuration);
  }
 
  protected override void OnSetUp()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepthFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepthFixture.cs
@@ -28,7 +28,6 @@ public CircularReferenceFetchDepthFixtureAsync(int depth) : base(depth)
  protected override void Configure(Configuration configuration)
  {
  configuration.SetProperty("max_fetch_depth", _depth.ToString());
- base.Configure(configuration);
  }
 
  protected override void OnSetUp()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH3113/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3113/FixtureByCode.cs
@@ -44,8 +44,6 @@ protected override void Configure(Configuration configuration)
  var dialect = NHibernate.Dialect.Dialect.GetDialect(configuration.Properties);
  if (dialect is Oracle8iDialect)
  configuration.SetProperty(Environment.Dialect, typeof(Oracle9iDialect).FullName);
-
- base.Configure(configuration);
  }
 
  protected override void OnSetUp()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH3176/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3176/FixtureByCode.cs
@@ -60,7 +60,6 @@ protected override HbmMapping GetMappings()
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
  configuration.Properties[Environment.UseSecondLevelCache] = "true";
  configuration.Properties[Environment.GenerateStatistics] = "true";

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH3198/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3198/FixtureByCode.cs
@@ -32,7 +32,6 @@ protected override void Configure(Configuration configuration)
  {
  new TestEventListener()
  };
- base.Configure(configuration);
  }
 
  protected override HbmMapping GetMappings()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH3215/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3215/FixtureByCode.cs
@@ -45,7 +45,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.Hbm2ddlKeyWords, "auto-quote");
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Logs/LogsFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Logs/LogsFixture.cs
@@ -46,7 +46,6 @@ protected override string MappingsAssembly
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Cfg.Environment.UseSecondLevelCache, "false");
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1001/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1001/Fixture.cs
@@ -21,7 +21,7 @@ public class FixtureAsync : BugTestCase
  {
  protected override void Configure(Configuration configuration)
  {
- cfg.SetProperty(Environment.GenerateStatistics, "true");
+ configuration.SetProperty(Environment.GenerateStatistics, "true");
  }
 
  private int employeeId;

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1101/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1101/Fixture.cs
@@ -22,8 +22,7 @@ public class FixtureAsync : BugTestCase
 
  protected override void Configure(Cfg.Configuration configuration)
  {
- base.Configure(configuration);
- cfg.SetProperty(Cfg.Environment.GenerateStatistics, "true");
+ configuration.SetProperty(Cfg.Environment.GenerateStatistics, "true");
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs
@@ -21,12 +21,9 @@ namespace NHibernate.Test.NHSpecificTest.NH1144
  [TestFixture]
  public class FixtureAsync : BugTestCase
  {
- private Configuration configuration;
-
  protected override void Configure(Configuration configuration)
  {
- this.configuration = configuration;
- this.configuration.Properties[Environment.BatchSize] = "10";
+ configuration.Properties[Environment.BatchSize] = "10";
  }
 
  [Test]

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1452/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1452/Fixture.cs
@@ -20,7 +20,6 @@ public class FixtureAsync : BugTestCase
  {
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.FormatSql, "false");
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs
@@ -205,7 +205,6 @@ protected override void OnTearDown()
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.SqlExceptionConverter,
  typeof (SQLUpdateConflictToStaleStateExceptionConverter).AssemblyQualifiedName);
  }

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs
@@ -24,7 +24,6 @@ public class NativeSqlCollectionLoaderFixtureAsync : BugTestCase
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetProperty(Environment.UseQueryCache, WithQueryCache.ToString());
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1882/TestCollectionInitializingDuringFlush.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1882/TestCollectionInitializingDuringFlush.cs
@@ -30,7 +30,6 @@ protected override void Configure(Configuration configuration)
  {
  listener
  };
- base.Configure(configuration);
  }
 
  protected override HbmMapping GetMappings()

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1989/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1989/Fixture.cs
@@ -31,7 +31,6 @@ protected override bool AppliesTo(ISessionFactoryImplementor factory)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
  configuration.Properties[Environment.UseQueryCache] = "true";
  }

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2043/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2043/Fixture.cs
@@ -30,7 +30,6 @@ public override string GetEntityName(object entity)
 
  protected override void Configure(Configuration configuration)
  {
- base.Configure(configuration);
  configuration.SetInterceptor(new Namer());
  }
 

diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs
@@ -27,12 +27,6 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
  return (dialect is Dialect.MsSql2000Dialect);
  }
 
- protected override void Configure(Configuration configuration)
- {
- base.Configure(configuration);
- cfg = configuration;
- }
-
  [Test] 
  public async Task CanCreateAndDropSchemaAsync() 
  {