Skip to content

Commit 7ed5bc8

Browse files
hazzikhazzik
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

+3-3
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

-1
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

+5-6
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

+3-4
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

-1
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

-1
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

+1-2
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

-1
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

-1
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

-1
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";

‎src/NHibernate.Test/Async/Linq/ByMethod/GroupByHavingTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class GroupByHavingTestsAsync : LinqTestCase
2222
{
2323
protected override void Configure(Cfg.Configuration configuration)
2424
{
25-
base.Configure(configuration);
2625
configuration.SetProperty(Cfg.Environment.ShowSql, "true");
2726
}
2827

‎src/NHibernate.Test/Async/Linq/ByMethod/OrderByTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class OrderByTestsAsync : LinqTestCase
2222
{
2323
protected override void Configure(Cfg.Configuration configuration)
2424
{
25-
base.Configure(configuration);
2625
configuration.SetProperty(Environment.ShowSql, "true");
2726
}
2827

‎src/NHibernate.Test/Async/Linq/PreEvaluationTests.cs

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public PreEvaluationTestsAsync(bool legacy, bool fallback)
3636

3737
protected override void Configure(Configuration configuration)
3838
{
39-
base.Configure(configuration);
40-
4139
configuration.SetProperty(Environment.FormatSql, "false");
4240
configuration.SetProperty(Environment.LinqToHqlLegacyPreEvaluation, LegacyPreEvaluation.ToString());
4341
configuration.SetProperty(Environment.LinqToHqlFallbackOnPreEvaluation, FallbackOnPreEvaluation.ToString());

‎src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ namespace NHibernate.Test.Linq
2121
[TestFixture]
2222
public class QueryCacheableTestsAsync : LinqTestCase
2323
{
24-
protected override void Configure(Configuration cfg)
24+
protected override void Configure(Configuration configuration)
2525
{
26-
cfg.SetProperty(Environment.UseQueryCache, "true");
27-
cfg.SetProperty(Environment.GenerateStatistics, "true");
28-
base.Configure(cfg);
26+
configuration.SetProperty(Environment.UseQueryCache, "true");
27+
configuration.SetProperty(Environment.GenerateStatistics, "true");
2928
}
3029

3130
[Test]

‎src/NHibernate.Test/Async/Linq/QueryFlushModeTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class QueryFlushModeTestsAsync : LinqTestCase
2222
protected override void Configure(Configuration configuration)
2323
{
2424
configuration.SetProperty(Environment.GenerateStatistics, "true");
25-
base.Configure(configuration);
2625
}
2726

2827
[Test]

‎src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3232

3333
protected override void Configure(Configuration configuration)
3434
{
35-
base.Configure(configuration);
3635
configuration.SetProperty(Environment.BatchStrategy,
3736
typeof(TimeoutCatchingNonBatchingBatcherFactory).AssemblyQualifiedName);
3837
}

‎src/NHibernate.Test/Async/MultiTenancy/DatabaseStrategyNoDbSpecificFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ protected override void Configure(Configuration configuration)
4444
x.MultiTenancyConnectionProvider<TestMultiTenancyConnectionProvider>();
4545
});
4646
configuration.Properties[Cfg.Environment.GenerateStatistics] = "true";
47-
base.Configure(configuration);
4847
}
4948

5049
private static void ValidateSqlServerConnectionAppName(ISession s, string tenantId)

‎src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
4545

4646
protected override void Configure(Cfg.Configuration configuration)
4747
{
48-
base.Configure(configuration);
4948
configuration.SetProperty(Environment.ShowSql, "true");
5049
}
5150

‎src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ protected override string MappingsAssembly
3232

3333
protected override void Configure(Configuration configuration)
3434
{
35-
base.Configure(configuration);
3635
configuration.LinqToHqlGeneratorsRegistry<EntityWithUserTypePropertyGeneratorsRegistry>();
3736
}
3837

‎src/NHibernate.Test/Async/NHSpecificTest/FileStreamSql2008/Fixture.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3939
return dialect is MsSql2008Dialect;
4040
}
4141

42-
protected override void Configure(Configuration cfg)
42+
protected override void Configure(Configuration configuration)
4343
{
4444
//Points to the database created with FileStream Filegroup.
45-
cfg.Properties["connection.connection_string"] =
45+
configuration.Properties["connection.connection_string"] =
4646
@"Data Source=localhost\SQLEXPRESS;Initial Catalog=FileStreamDB;Integrated Security=True;Pooling=False";
4747

4848
#region CREATE DATABASE example

‎src/NHibernate.Test/Async/NHSpecificTest/GH1486/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class FixtureAsync : BugTestCase
2424

2525
protected override void Configure(Configuration configuration)
2626
{
27-
base.Configure(configuration);
2827
configuration.SetInterceptor(_interceptor);
2928
}
3029

‎src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class FixtureAsync : BugTestCase
2828

2929
protected override void Configure(Configuration configuration)
3030
{
31-
base.Configure(configuration);
3231
configuration.AppendListeners(ListenerType.PostUpdate, new[] { _auditEventListener });
3332
}
3433

‎src/NHibernate.Test/Async/NHSpecificTest/GH1547/Fixture.cs

-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public class FixtureAsync : BugTestCase
3434
{
3535
protected override void Configure(Configuration configuration)
3636
{
37-
base.Configure(configuration);
38-
3937
var driverClass = ReflectHelper.ClassForName(configuration.GetProperty(Cfg.Environment.ConnectionDriver));
4038
DriverForSubstitutedCommand.DriverClass = driverClass;
4139

‎src/NHibernate.Test/Async/NHSpecificTest/GH1730/Fixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class FixtureAsync : BugTestCase
1919
{
2020
protected override void Configure(Configuration configuration)
2121
{
22-
cfg.SetProperty(Environment.GenerateStatistics, "true");
22+
configuration.SetProperty(Environment.GenerateStatistics, "true");
2323
}
2424

2525
protected override void OnTearDown()

‎src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepth0Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public CircularReferenceFetchDepth0FixtureAsync() : base(0)
2626
protected override void Configure(Configuration configuration)
2727
{
2828
configuration.SetProperty("max_fetch_depth", "0");
29-
base.Configure(configuration);
3029
}
3130

3231
protected override void OnSetUp()

‎src/NHibernate.Test/Async/NHSpecificTest/GH2201/CircularReferenceFetchDepthFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public CircularReferenceFetchDepthFixtureAsync(int depth) : base(depth)
2828
protected override void Configure(Configuration configuration)
2929
{
3030
configuration.SetProperty("max_fetch_depth", _depth.ToString());
31-
base.Configure(configuration);
3231
}
3332

3433
protected override void OnSetUp()

‎src/NHibernate.Test/Async/NHSpecificTest/GH3113/FixtureByCode.cs

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected override void Configure(Configuration configuration)
4444
var dialect = NHibernate.Dialect.Dialect.GetDialect(configuration.Properties);
4545
if (dialect is Oracle8iDialect)
4646
configuration.SetProperty(Environment.Dialect, typeof(Oracle9iDialect).FullName);
47-
48-
base.Configure(configuration);
4947
}
5048

5149
protected override void OnSetUp()

‎src/NHibernate.Test/Async/NHSpecificTest/GH3176/FixtureByCode.cs

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ protected override HbmMapping GetMappings()
6060

6161
protected override void Configure(Configuration configuration)
6262
{
63-
base.Configure(configuration);
6463
configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
6564
configuration.Properties[Environment.UseSecondLevelCache] = "true";
6665
configuration.Properties[Environment.GenerateStatistics] = "true";

‎src/NHibernate.Test/Async/NHSpecificTest/GH3198/FixtureByCode.cs

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ protected override void Configure(Configuration configuration)
3232
{
3333
new TestEventListener()
3434
};
35-
base.Configure(configuration);
3635
}
3736

3837
protected override HbmMapping GetMappings()

‎src/NHibernate.Test/Async/NHSpecificTest/GH3215/FixtureByCode.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
4545

4646
protected override void Configure(Configuration configuration)
4747
{
48-
base.Configure(configuration);
4948
configuration.SetProperty(Environment.Hbm2ddlKeyWords, "auto-quote");
5049
}
5150

‎src/NHibernate.Test/Async/NHSpecificTest/Logs/LogsFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ protected override string MappingsAssembly
4646

4747
protected override void Configure(Configuration configuration)
4848
{
49-
base.Configure(configuration);
5049
configuration.SetProperty(Cfg.Environment.UseSecondLevelCache, "false");
5150
}
5251

‎src/NHibernate.Test/Async/NHSpecificTest/NH1001/Fixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class FixtureAsync : BugTestCase
2121
{
2222
protected override void Configure(Configuration configuration)
2323
{
24-
cfg.SetProperty(Environment.GenerateStatistics, "true");
24+
configuration.SetProperty(Environment.GenerateStatistics, "true");
2525
}
2626

2727
private int employeeId;

‎src/NHibernate.Test/Async/NHSpecificTest/NH1101/Fixture.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class FixtureAsync : BugTestCase
2222

2323
protected override void Configure(Cfg.Configuration configuration)
2424
{
25-
base.Configure(configuration);
26-
cfg.SetProperty(Cfg.Environment.GenerateStatistics, "true");
25+
configuration.SetProperty(Cfg.Environment.GenerateStatistics, "true");
2726
}
2827

2928
[Test]

‎src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ namespace NHibernate.Test.NHSpecificTest.NH1144
2121
[TestFixture]
2222
public class FixtureAsync : BugTestCase
2323
{
24-
private Configuration configuration;
25-
2624
protected override void Configure(Configuration configuration)
2725
{
28-
this.configuration = configuration;
29-
this.configuration.Properties[Environment.BatchSize] = "10";
26+
configuration.Properties[Environment.BatchSize] = "10";
3027
}
3128

3229
[Test]

‎src/NHibernate.Test/Async/NHSpecificTest/NH1452/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class FixtureAsync : BugTestCase
2020
{
2121
protected override void Configure(Configuration configuration)
2222
{
23-
base.Configure(configuration);
2423
configuration.SetProperty(Environment.FormatSql, "false");
2524
}
2625

‎src/NHibernate.Test/Async/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ protected override void OnTearDown()
205205

206206
protected override void Configure(Configuration configuration)
207207
{
208-
base.Configure(configuration);
209208
configuration.SetProperty(Environment.SqlExceptionConverter,
210209
typeof (SQLUpdateConflictToStaleStateExceptionConverter).AssemblyQualifiedName);
211210
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH1612/NativeSqlCollectionLoaderFixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class NativeSqlCollectionLoaderFixtureAsync : BugTestCase
2424

2525
protected override void Configure(Configuration configuration)
2626
{
27-
base.Configure(configuration);
2827
configuration.SetProperty(Environment.UseQueryCache, WithQueryCache.ToString());
2928
}
3029

‎src/NHibernate.Test/Async/NHSpecificTest/NH1882/TestCollectionInitializingDuringFlush.cs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ protected override void Configure(Configuration configuration)
3030
{
3131
listener
3232
};
33-
base.Configure(configuration);
3433
}
3534

3635
protected override HbmMapping GetMappings()

‎src/NHibernate.Test/Async/NHSpecificTest/NH1989/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ protected override bool AppliesTo(ISessionFactoryImplementor factory)
3131

3232
protected override void Configure(Configuration configuration)
3333
{
34-
base.Configure(configuration);
3534
configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
3635
configuration.Properties[Environment.UseQueryCache] = "true";
3736
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH2043/Fixture.cs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public override string GetEntityName(object entity)
3030

3131
protected override void Configure(Configuration configuration)
3232
{
33-
base.Configure(configuration);
3433
configuration.SetInterceptor(new Namer());
3534
}
3635

‎src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs

-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
2727
return (dialect is Dialect.MsSql2000Dialect);
2828
}
2929

30-
protected override void Configure(Configuration configuration)
31-
{
32-
base.Configure(configuration);
33-
cfg = configuration;
34-
}
35-
3630
[Test]
3731
public async Task CanCreateAndDropSchemaAsync()
3832
{

0 commit comments

Comments
 (0)