Skip to content

Commit 7ed5bc8

Browse files
authored
Fix configuration order in tests (#3557)
1 parent dd77529 commit 7ed5bc8

File tree

164 files changed

+128
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+128
-293
lines changed

src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public class NativeSQLBulkOperationsWithCacheAsync : TestCase
3333

3434
protected override void Configure(Configuration configuration)
3535
{
36-
cfg.SetProperty(Environment.UseQueryCache, "true");
37-
cfg.SetProperty(Environment.UseSecondLevelCache, "true");
38-
cfg.SetProperty(Environment.CacheProvider, typeof(SubstituteCacheProvider).AssemblyQualifiedName);
36+
configuration.SetProperty(Environment.UseQueryCache, "true");
37+
configuration.SetProperty(Environment.UseSecondLevelCache, "true");
38+
configuration.SetProperty(Environment.CacheProvider, typeof(SubstituteCacheProvider).AssemblyQualifiedName);
3939
}
4040

4141
[Test]

src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ protected override string[] Mappings
5454

5555
protected override void Configure(NHibernate.Cfg.Configuration configuration)
5656
{
57-
base.Configure(configuration);
5857
configuration.SetProperty(NHibernate.Cfg.Environment.GenerateStatistics, "true");
5958
configuration.SetProperty(NHibernate.Cfg.Environment.BatchSize, "0");
6059
}

src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ namespace NHibernate.Test.ConnectionTest
2424
[TestFixture]
2525
public class AggressiveReleaseTestAsync : ConnectionManagementTestCase
2626
{
27-
protected override void Configure(Configuration cfg)
27+
protected override void Configure(Configuration configuration)
2828
{
29-
base.Configure(cfg);
30-
cfg.SetProperty(Environment.ReleaseConnections, "after_transaction");
31-
//cfg.SetProperty(Environment.ConnectionProvider, typeof(DummyConnectionProvider).AssemblyQualifiedName);
32-
//cfg.SetProperty(Environment.GenerateStatistics, "true");
33-
cfg.SetProperty(Environment.BatchSize, "0");
29+
configuration.SetProperty(Environment.ReleaseConnections, "after_transaction");
30+
//configuration.SetProperty(Environment.ConnectionProvider, typeof(DummyConnectionProvider).AssemblyQualifiedName);
31+
//configuration.SetProperty(Environment.GenerateStatistics, "true");
32+
configuration.SetProperty(Environment.BatchSize, "0");
3433
}
3534

3635
protected override ISession GetSessionUnderTest()

src/NHibernate.Test/Async/ConnectionTest/BatcherFixture.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ namespace NHibernate.Test.ConnectionTest
2222
[TestFixture]
2323
public class BatcherFixtureAsync : ConnectionManagementTestCase
2424
{
25-
protected override void Configure(Configuration config)
25+
protected override void Configure(Configuration configuration)
2626
{
27-
base.Configure(config);
28-
config.SetProperty(Environment.BatchSize, "10");
27+
configuration.SetProperty(Environment.BatchSize, "10");
2928
}
3029

3130
protected override ISession GetSessionUnderTest()
@@ -53,4 +52,4 @@ public async Task CanCloseCommandsAndUseBatcherAsync()
5352
}
5453
}
5554
}
56-
}
55+
}

src/NHibernate.Test/Async/Criteria/ReadonlyTests/QueryOverCacheableTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ protected override void Configure(Configuration config)
2727
{
2828
config.SetProperty(Environment.UseQueryCache, "true");
2929
config.SetProperty(Environment.GenerateStatistics, "true");
30-
base.Configure(config);
3130
}
3231

3332
[Test]

src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
4444

4545
protected override void Configure(Configuration configuration)
4646
{
47-
base.Configure(configuration);
4847
configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
4948
configuration.Properties[Environment.UseSecondLevelCache] = "true";
5049
}

src/NHibernate.Test/Async/Futures/FallbackFixture.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
4343

4444
protected override void Configure(Configuration configuration)
4545
{
46-
base.Configure(configuration);
47-
using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
46+
using (var cp = ConnectionProviderFactory.NewConnectionProvider(configuration.Properties))
4847
{
4948
if (cp.Driver is SqlClientDriver)
5049
{

src/NHibernate.Test/Async/Generatedkeys/Identity/IdentityGeneratedKeysTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3636

3737
protected override void Configure(Configuration configuration)
3838
{
39-
base.Configure(configuration);
4039
configuration.SetProperty(Environment.GenerateStatistics, "true");
4140
}
4241

src/NHibernate.Test/Async/Immutable/ImmutableTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class ImmutableTestAsync : TestCase
2929
{
3030
protected override void Configure(Configuration configuration)
3131
{
32-
base.Configure(configuration);
3332
configuration.SetProperty(NHibernate.Cfg.Environment.GenerateStatistics, "true");
3433
configuration.SetProperty(NHibernate.Cfg.Environment.BatchSize, "0");
3534
}

src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class LazyGroupFixtureAsync : TestCase
3030

3131
protected override void Configure(Configuration configuration)
3232
{
33-
base.Configure(configuration);
3433
configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
3534
configuration.Properties[Environment.UseSecondLevelCache] = "true";
3635
configuration.Properties[Environment.GenerateStatistics] = "true";

0 commit comments

Comments
 (0)