Make ServiceStack.Redis.Tests compilable on .NET Core

xplicit · xplicit · commit 8e47f56cf234 · 2016-07-25T20:05:22.000+07:00
diff --git a/src/ServiceStack.Redis/RedisNativeClient_Utils.cs b/src/ServiceStack.Redis/RedisNativeClient_Utils.cs
@@ -598,7 +598,7 @@ protected T SendReceive<T>(byte[][] cmdWithBinaryArgs,
 
                     Interlocked.Increment(ref RedisState.TotalRetryCount);
 #if NETSTANDARD
-                    Task.Delay(GetBackOffMultiplier(++i));
+                    Task.Delay(GetBackOffMultiplier(++i)).Wait();
 #else
                     Thread.Sleep(GetBackOffMultiplier(++i));
 #endif
diff --git a/src/ServiceStack.Redis/RedisPubSubServer.cs b/src/ServiceStack.Redis/RedisPubSubServer.cs
@@ -335,7 +335,7 @@ private void RunLoop()
             {
                 if (WaitBeforeNextRestart != null)
 #if NETSTANDARD
-                    Task.Delay(WaitBeforeNextRestart.Value);
+                    Task.Delay(WaitBeforeNextRestart.Value).Wait();
 #else
                     Thread.Sleep(WaitBeforeNextRestart.Value);
 #endif
@@ -474,7 +474,7 @@ private void SleepBackOffMultiplier(int continuousErrorsCount)
                 Log.Debug("Sleeping for {0}ms after {1} continuous errors".Fmt(nextTry, continuousErrorsCount));
 
 #if NETSTANDARD
-            Task.Delay(nextTry);
+            Task.Delay(nextTry).Wait();
 #else
             Thread.Sleep(nextTry);
 #endif
diff --git a/src/ServiceStack.Redis/RedisSentinel.cs b/src/ServiceStack.Redis/RedisSentinel.cs
@@ -335,7 +335,7 @@ private RedisSentinelWorker GetValidSentinelWorker()
 
             this.failures = 0; //reset
 #if NETSTANDARD
-            Task.Delay(WaitBetweenFailedHosts);
+            Task.Delay(WaitBetweenFailedHosts).Wait();
 #else
             Thread.Sleep(WaitBetweenFailedHosts);
 #endif
diff --git a/src/ServiceStack.Redis/RedisSentinelResolver.cs b/src/ServiceStack.Redis/RedisSentinelResolver.cs
@@ -152,7 +152,7 @@ public virtual RedisClient CreateRedisClient(RedisEndpoint config, bool master)
 
                                 sentinel.ForceMasterFailover();
 #if NETSTANDARD
-                                Task.Delay(sentinel.WaitBetweenFailedHosts);
+                                Task.Delay(sentinel.WaitBetweenFailedHosts).Wait();
 #else
                                 Thread.Sleep(sentinel.WaitBetweenFailedHosts);
 #endif
diff --git a/src/ServiceStack.Redis/Support/Locking/DistributedLock.cs b/src/ServiceStack.Redis/Support/Locking/DistributedLock.cs
@@ -41,7 +41,7 @@ public virtual long Lock(string key, int acquisitionTimeout, int lockTimeout, ou
 				while (wasSet == 0 && count < tryCount && totalTime < acquisitionTimeout)
 				{
 #if NETSTANDARD
-					System.Threading.Tasks.Task.Delay(sleepIfLockSet);
+					System.Threading.Tasks.Task.Delay(sleepIfLockSet).Wait();
 #else
 					System.Threading.Thread.Sleep(sleepIfLockSet);
 #endif
@@ -83,7 +83,7 @@ public virtual long Lock(string key, int acquisitionTimeout, int lockTimeout, ou
 				}
                 if (wasSet != LOCK_NOT_ACQUIRED) break;
 #if NETSTANDARD
-				System.Threading.Tasks.Task.Delay(sleepIfLockSet);
+				System.Threading.Tasks.Task.Delay(sleepIfLockSet).Wait();
 #else
 				System.Threading.Thread.Sleep(sleepIfLockSet);
 #endif
diff --git a/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs b/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs
@@ -13,15 +13,24 @@ public class CultureInfoTests
         [TestFixtureSetUp]
         public void TestFixtureSetUp()
         {
+#if NETCORE
+            previousCulture = CultureInfo.CurrentCulture;
+            CultureInfo.CurrentCulture = new CultureInfo("fr-FR");
+#else
             previousCulture = Thread.CurrentThread.CurrentCulture;
             Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR");
             Thread.CurrentThread.CurrentUICulture = new CultureInfo("fr-FR");
+#endif
         }
 
         [TestFixtureTearDown]
         public void TestFixtureTearDown()
         {
+#if NETCORE
+            CultureInfo.CurrentCulture = previousCulture;
+#else
             Thread.CurrentThread.CurrentCulture = previousCulture;
+#endif
         }
 
         [Test]
diff --git a/tests/ServiceStack.Redis.Tests/Issues/TransactionIssueTests.cs b/tests/ServiceStack.Redis.Tests/Issues/TransactionIssueTests.cs
@@ -107,7 +107,7 @@ private void CheckThisConnection()
             }
         }
 
-        private void CheckConnection()
+        private void CheckConnection(object state)
         {
             Task.Factory.StartNew(CheckThisConnection);
         }
diff --git a/tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs b/tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs
@@ -7,6 +7,7 @@
 using NUnit.Framework;
 using ServiceStack.Configuration;
 using ServiceStack.Text;
+using System;
 
 namespace ServiceStack.Redis.Tests
 {
@@ -76,7 +77,11 @@ public class RegisteredLicenseUsageTests : LicenseUsageTests
         [Test]
         public void Allows_access_of_21_types()
         {
+#if NETCORE
+	    Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+#else
             Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));
+#endif
 
             using (var client = new RedisClient(TestConfig.SingleHost))
             {
@@ -90,7 +95,11 @@ public void Allows_access_of_21_types()
         [Test, Explicit("Takes too long - but works!")]
         public void Allows_access_of_6100_operations()
         {
+#if NETCORE
+	    Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+#else
             Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));
+#endif
 
             using (var client = new RedisClient(TestConfig.SingleHost))
             {
diff --git a/tests/ServiceStack.Redis.Tests/RedisBenchmarkTests.cs b/tests/ServiceStack.Redis.Tests/RedisBenchmarkTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if !NETCORE_SUPPORT
+using System;
 using System.Diagnostics;
 using NUnit.Framework;
 using ServiceStack.Logging;
@@ -248,3 +249,4 @@ public void Benchmark_SET_raw_bytes_1k_Sider()
     }
 
 }
+#endif
diff --git a/tests/ServiceStack.Redis.Tests/RedisCacheClientTests.cs b/tests/ServiceStack.Redis.Tests/RedisCacheClientTests.cs
@@ -72,6 +72,7 @@ public void Can_Set_and_Get_key_with_all_byte_values()
             Assert.That(resultValue, Is.EquivalentTo(value));
         }
 
+#if !NETCORE_SUPPORT
         [Test]
         public void Can_Replace_By_Pattern()
         {
@@ -102,6 +103,7 @@ public void Can_Replace_By_Pattern()
             result2 = cacheClient.Get<string>("string1");
             Assert.That(result2, Is.Null);
         }
+#endif
 
         [Test]
         public void Can_GetTimeToLive()
diff --git a/tests/ServiceStack.Redis.Tests/RedisClientSortedSetTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientSortedSetTests.cs
@@ -263,7 +263,11 @@ public void Can_IncrementItemInSortedSet()
         [Test]
         public void Can_WorkInSortedSetUnderDifferentCulture()
         {
+#if NETCORE
+            CultureInfo.CurrentCulture = new CultureInfo("ru-RU");
+#else
             Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("ru-RU");
+#endif
             Redis.AddItemToSortedSet(SetId, "key", 123.22);
 
             var map = Redis.GetAllWithScoresFromSortedSet(SetId);
diff --git a/tests/ServiceStack.Redis.Tests/SslTests.cs b/tests/ServiceStack.Redis.Tests/SslTests.cs
@@ -26,11 +26,13 @@ public class SslTests
         [TestFixtureSetUp]
         public void TestFixtureSetUp()
         {
+#if !NETCORE_SUPPORT
             var settings = new TextFileSettings("~/azureconfig.txt".MapProjectPath());
             Host = settings.GetString("Host");
             Port = settings.Get("Port", 6379);
             Password = settings.GetString("Password");
             connectionString = "{0}@{1}".Fmt(Password, Host);
+#endif
         }
 
         [Test]
diff --git a/tests/ServiceStack.Redis.Tests/Support/TcpClientWithTimeout.cs b/tests/ServiceStack.Redis.Tests/Support/TcpClientWithTimeout.cs
@@ -1,3 +1,4 @@
+#if !NETCORE
 using System;
 using System.Net.Sockets;
 using System.Threading;
@@ -92,12 +93,9 @@ void Main()
             stream.Read(readbuf, 0, 10); // read
 
             // Disconnect nicely
-#if NETCORE
-            stream.Dispose();
-#else
             stream.Close(); // workaround for a .net bug: http://support.microsoft.com/kb/821625
-#endif
             connection.Close();
         }
     }
-}
+}
+#endif
diff --git a/tests/ServiceStack.Redis.Tests/UserSessionRedisClientTests.cs b/tests/ServiceStack.Redis.Tests/UserSessionRedisClientTests.cs
@@ -14,7 +14,9 @@ public class UserSessionTests
     {
         static UserSessionTests()
         {
+#if !NETCORE
             LogManager.LogFactory = new ConsoleLogFactory();
+#endif
         }
 
         //MasterUser master;

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,24 @@ public class CultureInfoTests`
`13`	`13`	`[TestFixtureSetUp]`
`14`	`14`	`public void TestFixtureSetUp()`
`15`	`15`	`{`
	`16`	`+#if NETCORE`
	`17`	`+ previousCulture = CultureInfo.CurrentCulture;`
	`18`	`+ CultureInfo.CurrentCulture = new CultureInfo("fr-FR");`
	`19`	`+#else`
`16`	`20`	`previousCulture = Thread.CurrentThread.CurrentCulture;`
`17`	`21`	`Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR");`
`18`	`22`	`Thread.CurrentThread.CurrentUICulture = new CultureInfo("fr-FR");`
	`23`	`+#endif`
`19`	`24`	`}`
`20`	`25`
`21`	`26`	`[TestFixtureTearDown]`
`22`	`27`	`public void TestFixtureTearDown()`
`23`	`28`	`{`
	`29`	`+#if NETCORE`
	`30`	`+ CultureInfo.CurrentCulture = previousCulture;`
	`31`	`+#else`
`24`	`32`	`Thread.CurrentThread.CurrentCulture = previousCulture;`
	`33`	`+#endif`
`25`	`34`	`}`
`26`	`35`
`27`	`36`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private void CheckThisConnection()`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- private void CheckConnection()`
	`110`	`+ private void CheckConnection(object state)`
`111`	`111`	`{`
`112`	`112`	`Task.Factory.StartNew(CheckThisConnection);`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using NUnit.Framework;`
`8`	`8`	`using ServiceStack.Configuration;`
`9`	`9`	`using ServiceStack.Text;`
	`10`	`+using System;`
`10`	`11`
`11`	`12`	`namespace ServiceStack.Redis.Tests`
`12`	`13`	`{`
`@@ -76,7 +77,11 @@ public class RegisteredLicenseUsageTests : LicenseUsageTests`
`76`	`77`	`[Test]`
`77`	`78`	`public void Allows_access_of_21_types()`
`78`	`79`	`{`
	`80`	`+#if NETCORE`
	`81`	`+ Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");`
	`82`	`+#else`
`79`	`83`	`Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));`
	`84`	`+#endif`
`80`	`85`
`81`	`86`	`using (var client = new RedisClient(TestConfig.SingleHost))`
`82`	`87`	`{`
`@@ -90,7 +95,11 @@ public void Allows_access_of_21_types()`
`90`	`95`	`[Test, Explicit("Takes too long - but works!")]`
`91`	`96`	`public void Allows_access_of_6100_operations()`
`92`	`97`	`{`
	`98`	`+#if NETCORE`
	`99`	`+ Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");`
	`100`	`+#else`
`93`	`101`	`Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));`
	`102`	`+#endif`
`94`	`103`
`95`	`104`	`using (var client = new RedisClient(TestConfig.SingleHost))`
`96`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+#if !NETCORE_SUPPORT`
	`2`	`+using System;`
`2`	`3`	`using System.Diagnostics;`
`3`	`4`	`using NUnit.Framework;`
`4`	`5`	`using ServiceStack.Logging;`
`@@ -248,3 +249,4 @@ public void Benchmark_SET_raw_bytes_1k_Sider()`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`}`
	`252`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public void Can_Set_and_Get_key_with_all_byte_values()`
`72`	`72`	`Assert.That(resultValue, Is.EquivalentTo(value));`
`73`	`73`	`}`
`74`	`74`
	`75`	`+#if !NETCORE_SUPPORT`
`75`	`76`	`[Test]`
`76`	`77`	`public void Can_Replace_By_Pattern()`
`77`	`78`	`{`
`@@ -102,6 +103,7 @@ public void Can_Replace_By_Pattern()`
`102`	`103`	`result2 = cacheClient.Get<string>("string1");`
`103`	`104`	`Assert.That(result2, Is.Null);`
`104`	`105`	`}`
	`106`	`+#endif`
`105`	`107`
`106`	`108`	`[Test]`
`107`	`109`	`public void Can_GetTimeToLive()`