Disable default caching in tests

src/NHibernate.Test/Any/AnyTypeTest.cs

@@ -15,11 +15,6 @@ protected override string[] Mappings
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public void FlushProcessing()
 		{

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

@@ -26,11 +26,6 @@ protected override string[] Mappings
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public async Task FlushProcessingAsync()
 		{

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

@@ -25,6 +25,8 @@ namespace NHibernate.Test.BulkManipulation
 	[TestFixture]
 	public class NativeSQLBulkOperationsWithCacheAsync : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly => "NHibernate.Test";
 
 		protected override string[] Mappings => new[] { "BulkManipulation.Vehicle.hbm.xml" };

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

@@ -44,8 +44,6 @@ public BatchableCacheFixtureAsync(BatchFetchStyle fetchStyle)
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/Async/CacheTest/BuildCacheFixture.cs

@@ -29,9 +29,6 @@ public class BuildCacheFixtureAsync : TestCase
 
 		protected override string[] Mappings => new[] { "CacheTest.EntitiesInSameRegion.hbm.xml" };
 
-		// Disable the TestCase cache overrides.
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseQueryCache, "true");

src/NHibernate.Test/Async/CacheTest/SerializingCacheFixture.cs

@@ -28,8 +28,6 @@ public class SerializingCacheFixtureAsync : TestCase
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs

@@ -38,11 +38,6 @@ protected override string[] Mappings
 			}
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			// Order uses a scalar sub-select formula.

src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs

@@ -32,6 +32,8 @@ public class SelectModeTestAsync : TestCaseMappingByCode
 	{
 		private Guid _parentEntityComplexId;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		[Test]
 		public async Task SelectModeJoinOnlyAsync()
 		{

src/NHibernate.Test/Async/Extralazy/ExtraLazyFixture.cs

@@ -32,11 +32,6 @@ protected override string[] Mappings
 			get { return new[] {"Extralazy.UserGroup.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Cfg.Environment.GenerateStatistics, "true");

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

@@ -25,6 +25,8 @@ namespace NHibernate.Test.FetchLazyProperties
 	[TestFixture]
 	public class FetchLazyPropertiesFixtureAsync : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }

src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

@@ -28,6 +28,8 @@ public class DynamicFilterTestAsync : TestCase
 		private static readonly ILog log = LogManager.GetLogger(typeof(DynamicFilterTestAsync));
 		private TestData testData;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnSetUp()
 		{
 			testData = new TestData(this);

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

@@ -20,6 +20,8 @@ namespace NHibernate.Test.Futures
 	[TestFixture]
 	public class LinqFutureFixtureAsync : FutureFixture
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnTearDown()
 		{
 			using (var session = OpenSession())

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

@@ -28,6 +28,8 @@ public class QueryBatchFixtureAsync : TestCaseMappingByCode
 		private Guid _parentId;
 		private Guid _eagerId;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		[Test]
 		public async Task CanCombineCriteriaAndHqlInFutureAsync()
 		{

src/NHibernate.Test/Async/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs

@@ -30,10 +30,5 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect is MsSql2000Dialect || dialect is Oracle8iDialect;
 		}
-
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
 	}
 }

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

@@ -22,6 +22,8 @@ namespace NHibernate.Test.LazyGroup
 	[TestFixture]
 	public class LazyGroupFixtureAsync : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly => "NHibernate.Test";
 
 		protected override string[] Mappings => new[] { "LazyGroup.Mappings.hbm.xml" };

src/NHibernate.Test/Async/LazyOneToOne/LazyOneToOneTest.cs

@@ -41,11 +41,6 @@ protected override void Configure(Cfg.Configuration configuration)
 			configuration.SetProperty(Environment.UseSecondLevelCache, "false");
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public async Task LazyAsync()
 		{

src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs

@@ -36,8 +36,6 @@ protected override string[] Mappings
 			get { return new[] { "LazyProperty.Mappings.hbm.xml" }; }
 		}
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override DebugSessionFactory BuildSessionFactory()
 		{
 			using (var logSpy = new LogSpy(typeof(EntityMetamodel)))

src/NHibernate.Test/Async/NHSpecificTest/GH1754/Fixture.cs

@@ -19,9 +19,6 @@ namespace NHibernate.Test.NHSpecificTest.GH1754
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
-		// Disable second level cache
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void OnSetUp()
 		{
 			Sfi.Statistics.IsStatisticsEnabled = true;

src/NHibernate.Test/Async/NHSpecificTest/GH1756/UnsavedValueNoneFixture.cs

@@ -19,9 +19,6 @@ namespace NHibernate.Test.NHSpecificTest.GH1756
 	[TestFixture]
 	public class UnsavedValueNoneFixtureAsync : BugTestCase
 	{
-		// disable second level cache enabled by default by the base class.
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void OnSetUp()
 		{
 			using (var session = OpenSession())

src/NHibernate.Test/Async/NHSpecificTest/GH2552/Fixture.cs

@@ -23,8 +23,6 @@ namespace NHibernate.Test.NHSpecificTest.GH2552
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(NHCfg.Configuration configuration)
 		{
 			configuration.SetProperty(NHCfg.Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/Async/NHSpecificTest/NH1093/Fixture.cs

@@ -27,11 +27,6 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		private async Task CleanupAsync(CancellationToken cancellationToken = default(CancellationToken))
 		{
 			using (var s = OpenSession())

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

@@ -18,6 +18,8 @@ namespace NHibernate.Test.NHSpecificTest.NH1101
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void Configure(Cfg.Configuration configuration)
 		{
 			base.Configure(configuration);
@@ -76,4 +78,4 @@ public async Task BehaviorAsync()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH1388/Fixture.cs

@@ -109,10 +109,5 @@ protected override void OnTearDown()
 				tran.Commit();
 			}
 		}
-
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
 	}
 }

src/NHibernate.Test/Async/NHSpecificTest/NH1483/Fixture.cs

@@ -19,6 +19,8 @@ namespace NHibernate.Test.NHSpecificTest.NH1483
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnTearDown()
 		{
 			DeleteAll(true);
@@ -152,4 +154,4 @@ public async Task LoadSubclassFromSecondLevelCacheAsBaseClassAsync()
 			await (TestLoadFromSecondLevelCacheAsync<BaseClass>());
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3046/Fixture.cs

@@ -60,10 +60,5 @@ public async Task MemoryLeakAsync()
 				}
 			}
 		}
-
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
 	}
 }

src/NHibernate.Test/Async/NHSpecificTest/NH3079/Fixture.cs

@@ -18,9 +18,6 @@ namespace NHibernate.Test.NHSpecificTest.NH3079
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
-		// Disable second level cache
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void OnTearDown()
 		{
 			using (var s = OpenSession())

src/NHibernate.Test/Async/NHSpecificTest/NH750/Fixture.cs

@@ -28,11 +28,6 @@ protected override void OnTearDown()
 			}
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Cfg.Environment.UseSecondLevelCache, "false");

src/NHibernate.Test/Async/NHSpecificTest/NH995/Fixture.cs

@@ -17,6 +17,8 @@ namespace NHibernate.Test.NHSpecificTest.NH995
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnTearDown()
 		{
 			using (ISession s = OpenSession())

src/NHibernate.Test/Async/Pagination/PaginationFixture.cs

@@ -37,11 +37,6 @@ protected override void Configure(Configuration configuration)
 			cfg.SetProperty(Environment.DefaultBatchFetchSize, "20");
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public async Task PagTestAsync()
 		{
@@ -127,4 +122,4 @@ public async Task PagingWithLock_NH2255Async()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/SecondLevelCacheTest/NeverCachedEntityTests.cs

@@ -26,7 +26,6 @@ namespace NHibernate.Test.SecondLevelCacheTest
 	[TestFixture]
 	public class NeverCachedEntityTestsAsync : TestCase
 	{
-		protected override string CacheConcurrencyStrategy => null;
 		protected override string MappingsAssembly => "NHibernate.Test";
 
 		protected override string[] Mappings => new[] { "SecondLevelCacheTest.Item.hbm.xml" };

src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

@@ -14,6 +14,8 @@ namespace NHibernate.Test.BulkManipulation
 	[TestFixture]
 	public class NativeSQLBulkOperationsWithCache : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly => "NHibernate.Test";
 
 		protected override string[] Mappings => new[] { "BulkManipulation.Vehicle.hbm.xml" };

src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs

@@ -32,8 +32,6 @@ public BatchableCacheFixture(BatchFetchStyle fetchStyle)
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/CacheTest/BuildCacheFixture.cs

@@ -18,9 +18,6 @@ public class BuildCacheFixture : TestCase
 
 		protected override string[] Mappings => new[] { "CacheTest.EntitiesInSameRegion.hbm.xml" };
 
-		// Disable the TestCase cache overrides.
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseQueryCache, "true");

src/NHibernate.Test/CacheTest/SerializingCacheFixture.cs

@@ -17,8 +17,6 @@ public class SerializingCacheFixture : TestCase
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/CompositeId/CompositeIdFixture.cs

@@ -26,11 +26,6 @@ protected override string[] Mappings
 			}
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			// Order uses a scalar sub-select formula.

src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs

@@ -21,6 +21,8 @@ public class SelectModeTest : TestCaseMappingByCode
 	{
 		private Guid _parentEntityComplexId;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		[Test]
 		public void SelectModeJoinOnly()
 		{

src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs

@@ -21,11 +21,6 @@ protected override string[] Mappings
 			get { return new[] {"Extralazy.UserGroup.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Cfg.Environment.GenerateStatistics, "true");