Fix 10 tests on .NET Core

Author: xplicit

tests/ServiceStack.Redis.Tests/Integration/IntegrationTestBase.cs

@@ -4,6 +4,9 @@
 using System.Threading;
 using NUnit.Framework;
 using ServiceStack.Text;
+#if NETCORE
+using System.Threading.Tasks;
+#endif
 
 namespace ServiceStack.Redis.Tests.Integration
 {
@@ -51,18 +54,30 @@ protected void RunSimultaneously(
 
             const int noOfConcurrentClients = 64; //WaitHandle.WaitAll limit is <= 64
 
+#if NETCORE
+            List<Task> tasks = new List<Task>();
+#else
             var clientAsyncResults = new List<IAsyncResult>();
+#endif             
             using (var manager = clientManagerFactory(TestConfig.MasterHosts, TestConfig.SlaveHosts))
             {
                 for (var i = 0; i < noOfConcurrentClients; i++)
                 {
                     var clientNo = i;
                     var action = (Action)(() => useClientFn(manager, clientNo));
+#if NETCORE
+                    tasks.Add(Task.Run(action));
+#else                                       
                     clientAsyncResults.Add(action.BeginInvoke(null, null));
+#endif
                 }
             }
 
+#if NETCORE
+            Task.WaitAll(tasks.ToArray());
+#else            
             WaitHandle.WaitAll(clientAsyncResults.ConvertAll(x => x.AsyncWaitHandle).ToArray());
+#endif
 
             Debug.WriteLine(String.Format("Time Taken: {0}", (Stopwatch.GetTimestamp() - before) / 1000));
         }

tests/ServiceStack.Redis.Tests/Integration/MultiThreadedRedisClientIntegrationTests.cs

@@ -5,6 +5,9 @@
 using NUnit.Framework;
 using ServiceStack.Common.Tests.Models;
 using ServiceStack.Text;
+#if NETCORE
+using System.Threading.Tasks;
+#endif
 
 namespace ServiceStack.Redis.Tests.Integration
 {
@@ -29,19 +32,29 @@ public void Can_support_64_threads_using_the_client_simultaneously()
 
             const int noOfConcurrentClients = 64; //WaitHandle.WaitAll limit is <= 64
 
+#if NETCORE
+            List<Task> tasks = new List<Task>();
+#else
             var clientAsyncResults = new List<IAsyncResult>();
+#endif             
             using (var redisClient = new RedisClient(TestConfig.SingleHost))
             {
                 for (var i = 0; i < noOfConcurrentClients; i++)
                 {
                     var clientNo = i;
                     var action = (Action)(() => UseClientAsync(redisClient, clientNo));
+#if NETCORE
+                    tasks.Add(Task.Run(action));
+#else                                       
                     clientAsyncResults.Add(action.BeginInvoke(null, null));
+#endif
                 }
             }
-
+#if NETCORE
+            Task.WaitAll(tasks.ToArray());
+#else            
             WaitHandle.WaitAll(clientAsyncResults.ConvertAll(x => x.AsyncWaitHandle).ToArray());
-
+#endif
             Debug.WriteLine(String.Format("Time Taken: {0}", (Stopwatch.GetTimestamp() - before) / 1000));
         }
 

tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs

@@ -5,6 +5,9 @@
 using System.Threading;
 using NUnit.Framework;
 using ServiceStack.Text;
+#if NETCORE
+using System.Threading.Tasks;
+#endif
 
 namespace ServiceStack.Redis.Tests
 {
@@ -306,7 +309,11 @@ public void Does_block_ReadWrite_clients_pool()
                     client4.Dispose();
                 };
 
+#if NETCORE                
+                Task.Run(func);
+#else
                 func.BeginInvoke(null, null);
+#endif
 
                 var start = DateTime.Now;
 
@@ -338,9 +345,11 @@ public void Does_block_ReadOnly_clients_pool()
                     Thread.Sleep(delay + TimeSpan.FromSeconds(0.5));
                     client3.Dispose();
                 };
-
+#if NETCORE                
+                Task.Run(func);
+#else
                 func.BeginInvoke(null, null);
-
+#endif
                 var start = DateTime.Now;
 
                 var client4 = manager.GetReadOnlyClient();

tests/ServiceStack.Redis.Tests/RedisManagerPoolTests.cs

@@ -4,6 +4,9 @@
 using System.Threading;
 using NUnit.Framework;
 using ServiceStack.Text;
+#if NETCORE
+using System.Threading.Tasks;
+#endif
 
 namespace ServiceStack.Redis.Tests
 {
@@ -155,9 +158,11 @@ public void Does_not_block_ReadWrite_clients_pool()
                     Thread.Sleep(delay + TimeSpan.FromSeconds(0.5));
                     client4.Dispose();
                 };
-
+#if NETCORE
+                Task.Run(func);
+#else                
                 func.BeginInvoke(null, null);
-
+#endif
                 var start = DateTime.Now;
 
                 var client5 = manager.GetClient();
@@ -180,18 +185,30 @@ public void Can_support_64_threads_using_the_client_simultaneously()
             const int noOfConcurrentClients = 64; //WaitHandle.WaitAll limit is <= 64
             var clientUsageMap = new Dictionary<string, int>();
 
+#if NETCORE
+            List<Task> tasks = new List<Task>();
+#else
             var clientAsyncResults = new List<IAsyncResult>();
+#endif             
             using (var manager = CreateManager())
             {
                 for (var i = 0; i < noOfConcurrentClients; i++)
                 {
                     var clientNo = i;
                     var action = (Action)(() => UseClient(manager, clientNo, clientUsageMap));
+#if NETCORE
+                    tasks.Add(Task.Run(action));
+#else                                       
                     clientAsyncResults.Add(action.BeginInvoke(null, null));
+#endif
                 }
             }
 
+#if NETCORE
+            Task.WaitAll(tasks.ToArray());
+#else            
             WaitHandle.WaitAll(clientAsyncResults.ConvertAll(x => x.AsyncWaitHandle).ToArray());
+#endif
 
             Debug.WriteLine(TypeSerializer.SerializeToString(clientUsageMap));