Fix partially configured regions not fallback-ing on defauts

 * Fixes #19
 * Cleanup of modified classes
 * Upgrade of AsyncGenerator, it was failing with up-to-date VS

Author: fredericDelaporte

EnyimMemcached/NHibernate.Caches.EnyimMemcached.Tests/Async/MemCacheFixture.cs

@@ -48,7 +48,7 @@ public async Task TestRemove144Async()
 
 			// add the item
 			await (cache.PutAsync(key, value, CancellationToken.None));
-			Thread.Sleep(1000);
+			await (Task.Delay(1000));
 
 			// make sure it's there
 			var item = await (cache.GetAsync(key, CancellationToken.None));

MemCache/NHibernate.Caches.MemCache.Tests/Async/MemCacheFixture.cs

@@ -74,7 +74,7 @@ public async Task TestRemove144Async()
 
 			// add the item
 			await (cache.PutAsync(key, value, CancellationToken.None));
-			Thread.Sleep(1000);
+			await (Task.Delay(1000));
 
 			// make sure it's there
 			var item = await (cache.GetAsync(key, CancellationToken.None));

NHibernate.Caches.Common.Tests/Async/CacheFixture.cs

@@ -166,11 +166,11 @@ public async Task TestObjectExpirationAsync([ValueSource(nameof(ExpirationSettin
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Null, "Unexpected entry for key");
 			await (cache.PutAsync(key, obj, CancellationToken.None));
 			// Wait up to 1 sec before expiration
-			Thread.Sleep(TimeSpan.FromSeconds(expirySeconds - 1));
+			await (Task.Delay(TimeSpan.FromSeconds(expirySeconds - 1)));
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Not.Null, "Missing entry for key");
 
 			// Wait expiration
-			Thread.Sleep(TimeSpan.FromSeconds(2));
+			await (Task.Delay(TimeSpan.FromSeconds(2)));
 
 			// Check it expired
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Null, "Unexpected entry for key after expiration");
@@ -197,7 +197,7 @@ public async Task TestObjectExpirationAfterUpdateAsync([ValueSource(nameof(Expir
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Not.Null, "Missing entry for key after update");
 
 			// Wait
-			Thread.Sleep(TimeSpan.FromSeconds(expirySeconds + 2));
+			await (Task.Delay(TimeSpan.FromSeconds(expirySeconds + 2)));
 
 			// Check it expired
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Null, "Unexpected entry for key after expiration");
@@ -219,15 +219,15 @@ public async Task TestSlidingExpirationAsync()
 
 			await (cache.PutAsync(key, obj, CancellationToken.None));
 			// Wait up to 1 sec before expiration
-			Thread.Sleep(TimeSpan.FromSeconds(expirySeconds - 1));
+			await (Task.Delay(TimeSpan.FromSeconds(expirySeconds - 1)));
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Not.Null, "Missing entry for key");
 
 			// Wait up to 1 sec before expiration again
-			Thread.Sleep(TimeSpan.FromSeconds(expirySeconds - 1));
+			await (Task.Delay(TimeSpan.FromSeconds(expirySeconds - 1)));
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Not.Null, "Missing entry for key after get and wait less than expiration");
 
 			// Wait expiration
-			Thread.Sleep(TimeSpan.FromSeconds(expirySeconds + 1));
+			await (Task.Delay(TimeSpan.FromSeconds(expirySeconds + 1)));
 
 			// Check it expired
 			Assert.That(await (cache.GetAsync(key, CancellationToken.None)), Is.Null, "Unexpected entry for key after expiration");

NHibernate.Caches.Common.Tests/CacheProviderFixture.cs

@@ -16,7 +16,7 @@ public void TestBuildCacheNoRegionNoProperties()
 		public void TestBuildCacheNoRegionWithProperties()
 		{
 			// Using same "region" than another test, need to get another provider for avoiding it
-			// to yield a previously built cache.
+			// to yield a previously built cache if the underlying provider does some instance caching.
 			var cache = GetNewProvider().BuildCache(null, GetDefaultProperties());
 			Assert.That(cache, Is.Not.Null, "no cache returned");
 		}

RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/App.config

@@ -9,6 +9,7 @@
 
 	<rtmemorycache>
 		<cache region="foo" expiration="500" sliding="true" />
+		<cache region="noExplicitExpiration" sliding="true" />
 	</rtmemorycache>
 	<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
 		<session-factory>

RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs

@@ -49,5 +49,28 @@ public void TestBuildCacheFromConfig()
 			ICache cache = DefaultProvider.BuildCache("foo", null);
 			Assert.That(cache, Is.Not.Null, "pre-configured cache not found");
 		}
+
+		[Test]
+		public void TestExpiration()
+		{
+			var cache = DefaultProvider.BuildCache("foo", null) as RtMemoryCache;
+			Assert.That(cache, Is.Not.Null, "pre-configured foo cache not found");
+			Assert.That(cache.Expiration, Is.EqualTo(TimeSpan.FromSeconds(500)), "Unexpected expiration value for foo region");
+
+			cache = DefaultProvider.BuildCache("noExplicitExpiration", null) as RtMemoryCache;
+			Assert.That(cache.Expiration, Is.EqualTo(TimeSpan.FromSeconds(300)),
+				"Unexpected expiration value for noExplicitExpiration region");
+			Assert.That(cache.UseSlidingExpiration, Is.True, "Unexpected sliding value for noExplicitExpiration region");
+
+			cache = DefaultProvider
+				.BuildCache("noExplicitExpiration", new Dictionary<string, string> { { "expiration", "100" } }) as RtMemoryCache;
+			Assert.That(cache.Expiration, Is.EqualTo(TimeSpan.FromSeconds(100)),
+				"Unexpected expiration value for noExplicitExpiration region with default expiration");
+
+			cache = DefaultProvider
+				.BuildCache("noExplicitExpiration", new Dictionary<string, string> { { Cfg.Environment.CacheDefaultExpiration, "50" } }) as RtMemoryCache;
+			Assert.That(cache.Expiration, Is.EqualTo(TimeSpan.FromSeconds(50)),
+				"Unexpected expiration value for noExplicitExpiration region with cache.default_expiration");
+		}
 	}
 }

RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/RtMemoryCacheSectionHandlerFixture.cs

@@ -22,8 +22,6 @@
 
 #endregion
 
-using System.Collections.Generic;
-using System.Runtime.Caching;
 using System.Xml;
 using NUnit.Framework;
 
@@ -39,16 +37,6 @@ public XmlNode GetConfigurationSection(string xml)
 			return doc.DocumentElement;
 		}
 
-		public RtMemoryCache[] CreateCache(CacheConfig[] configuration)
-		{
-			var result = new List<RtMemoryCache>(configuration.Length);
-			foreach (var config in configuration)
-			{
-				result.Add(new RtMemoryCache(config.Region, config.Properties));
-			}
-			return result.ToArray();
-		}
-
 		[Test]
 		public void TestGetConfigNullSection()
 		{