First iteration of making ServiceStack.Redis.Tests compilable on .NET Core

Author: xplicit

tests/ServiceStack.Redis.Tests.NetCore/ServiceStack.Redis.Tests/Program.cs

@@ -0,0 +1,36 @@
+using NUnitLite;
+using NUnit.Common;
+using System.Reflection;
+using ServiceStack;
+using ServiceStack.Text;
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace NUnitLite.Tests
+{
+    public class Program
+    {
+        /// <summary>
+        /// The main program executes the tests. Output may be routed to
+        /// various locations, depending on the arguments passed.
+        /// </summary>
+        /// <remarks>Run with --help for a full list of arguments supported</remarks>
+        /// <param name="args"></param>
+        public static int Main(string[] args)
+        {
+            var licenseKey = Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+            if (licenseKey.IsNullOrEmpty())
+                throw new ArgumentNullException("SERVICESTACK_LICENSE", "Add Environment variable for SERVICESTACK_LICENSE");
+
+            Licensing.RegisterLicense(licenseKey);
+            //"ActivatedLicenseFeatures: ".Print(LicenseUtils.ActivatedLicenseFeatures());
+
+	    CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
+            JsConfig.InitStatics();
+            //JsonServiceClient client = new JsonServiceClient();
+            var writer = new ExtendedTextWrapper(Console.Out);
+            return new AutoRun(((IReflectableType)typeof(Program)).GetTypeInfo().Assembly).Execute(args, writer, Console.In);
+        }
+    }
+}

tests/ServiceStack.Redis.Tests.NetCore/ServiceStack.Redis.Tests/project.json

@@ -0,0 +1,48 @@
+{
+  "configurations": {
+    "Debug": {
+      "buildOptions": {
+        "define": ["NETCORE_SUPPORT", "NETCORE", "DEBUG", "TRACE"]
+      }
+    },
+    "Release": {
+      "buildOptions": {
+        "define": ["NETCORE_SUPPORT", "NETCORE", "TRACE"],
+        "optimize": true
+      }
+    }
+  },
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "compile": ["../../ServiceStack.Redis.Tests/**/*.cs"],
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+          "type": "platform",
+      "version": "1.0.0"
+    },
+    "NUnitLite" : "3.2.1",
+    "ServiceStack.Redis" : "4.0.*",
+    "ServiceStack.Interfaces" : "4.0.*",
+    "ServiceStack.Text" : "4.0.*",
+    "ServiceStack.Common" : "4.0.*"
+  },
+  "frameworks": {
+   "netcoreapp1.0": { 
+            "imports": "dnxcore50",
+	     "dependencies" : {
+		"System.Drawing.Primitives" : "4.0.0",
+		"System.Collections.Specialized": "4.0.1",
+		"System.Runtime.Serialization.Json": "4.0.2",
+		"System.Runtime.Serialization.Primitives": "4.1.1",
+		"System.Collections.NonGeneric": "4.0.1",
+		"System.Diagnostics.Tracing": "4.1.0",
+		"System.Diagnostics.Debug": "4.0.11",
+		"System.Diagnostics.TextWriterTraceListener" : "4.0.0",
+		"System.Reflection": "4.1.0",
+		"System.Reflection.Extensions" : "4.0.1",
+            }	
+     }
+  }
+}

tests/ServiceStack.Redis.Tests.NetCore/global.json

@@ -0,0 +1,6 @@
+{
+    "projects": [
+       "../../src/ServiceStack.Redis.NetCore",
+       "ServiceStack.Common.Tests"
+    ]
+}

tests/ServiceStack.Redis.Tests/Issues/TransactionIssueTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using NUnit.Framework;
 using ServiceStack.Text;
 
@@ -108,17 +107,15 @@ private void CheckThisConnection()
             }
         }
 
-        private void CheckConnection(object sender, ElapsedEventArgs e)
+        private void CheckConnection()
         {
             Task.Factory.StartNew(CheckThisConnection);
         }
 
         [Explicit, Test]
         public void Can_queue_large_transaction()
         {
-            var q = new System.Timers.Timer { Interval = 2 };
-            q.Elapsed += CheckConnection;
-            q.Enabled = true;
+            var q = new System.Threading.Timer(CheckConnection, null, 30000, 2);
 
             Thread.Sleep(30000);
         }

tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs

@@ -1,8 +1,9 @@
 // Copyright (c) Service Stack LLC. All Rights Reserved.
 // License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
 
-
+#if !NETCORE
 using System.Data;
+#endif
 using NUnit.Framework;
 using ServiceStack.Configuration;
 using ServiceStack.Text;
@@ -22,7 +23,11 @@ public void SetUp()
         [TearDown]
         public void TearDown()
         {
+#if NETCORE
+	    Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+#else
             Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));
+#endif
         }
 
         [Test]

tests/ServiceStack.Redis.Tests/RedisClientTests.cs

@@ -216,12 +216,12 @@ public void Can_GetServerTime()
             var now = Redis.GetServerTime();
 
             now.Kind.PrintDump();
-            now.ToLongDateString().Print();
-            now.ToLongTimeString().Print();
+            now.ToString("D").Print();
+            now.ToString("T").Print();
 
             "UtcNow".Print();
-            DateTime.UtcNow.ToLongDateString().Print();
-            DateTime.UtcNow.ToLongTimeString().Print();
+            DateTime.UtcNow.ToString("D").Print();
+            DateTime.UtcNow.ToString("T").Print();
 
             Assert.That(now.Date, Is.EqualTo(DateTime.UtcNow.Date));
         }

tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs

@@ -25,23 +25,26 @@ public void Can_connect_to_Slaves_and_Masters_with_Password()
         }
 
         [Test]
-        [ExpectedException(typeof(ServiceStack.Redis.RedisResponseException), UserMessage = "Expected an exception after Redis AUTH command; try using a password that doesn't match.")]
         public void Passwords_are_not_leaked_in_exception_messages()
-        {
+        {            
             const string password = "yesterdayspassword";
-            try
-            {
-                var factory = new PooledRedisClientManager(password + "@" + TestConfig.SingleHost); // redis will throw when using password and it's not configured
-                using (var redis = factory.GetClient())
+
+            Assert.Throws<ServiceStack.Redis.RedisResponseException>(() => {
+                try
                 {
-                    redis.SetEntry("Foo", "Bar");
+                    var factory = new PooledRedisClientManager(password + "@" + TestConfig.SingleHost); // redis will throw when using password and it's not configured
+                    using (var redis = factory.GetClient())
+                    {
+                        redis.SetEntry("Foo", "Bar");
+                    }
                 }
-            }
-            catch (RedisResponseException ex)
-            {
-                Assert.That(ex.Message, Is.Not.StringContaining(password));
-                throw;
-            }
+                catch (RedisResponseException ex)
+                {
+                    Assert.That(ex.Message, Is.Not.StringContaining(password));
+                    throw;
+                }
+            },
+	    "Expected an exception after Redis AUTH command; try using a password that doesn't match.");
         }
     }
 }

tests/ServiceStack.Redis.Tests/RetryCommandTests.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Net.Sockets;
 using System.Threading;
-using System.Timers;
 using NUnit.Framework;
 using ServiceStack.Logging;
 using ServiceStack.Text;

tests/ServiceStack.Redis.Tests/SslTests.cs

@@ -93,7 +93,11 @@ public void Can_connect_to_NetworkStream()
 
             if (!socket.Connected)
             {
+#if NETCORE
+                socket.Dispose();
+#else
                 socket.Close();
+#endif
                 throw new Exception("Could not connect");
             }
 
@@ -115,7 +119,11 @@ public void Can_connect_to_Buffered_SslStream()
 
             if (!socket.Connected)
             {
+#if NETCORE
+                socket.Dispose();
+#else
                 socket.Close();
+#endif
                 throw new Exception("Could not connect");
             }
 
@@ -133,8 +141,13 @@ public void Can_connect_to_Buffered_SslStream()
             }
             else
             {
+#if NETCORE
+                var ctor = typeof(SslStream).GetTypeInfo().GetConstructors()
+                    .First(x => x.GetParameters().Length == 5);
+#else
                 var ctor = typeof(SslStream).GetConstructors()
                     .First(x => x.GetParameters().Length == 5);
+#endif
 
                 var policyType = AssemblyUtils.FindType("System.Net.Security.EncryptionPolicy");
                 var policyValue = Enum.Parse(policyType, "RequireEncryption");
@@ -154,7 +167,11 @@ public void Can_connect_to_Buffered_SslStream()
                 //    encryptionPolicy: EncryptionPolicy.RequireEncryption);
             }
 
+#if NETCORE
+            sslStream.AuthenticateAsClientAsync(Host).Wait();
+#else
             sslStream.AuthenticateAsClient(Host);
+#endif
 
             if (!sslStream.IsEncrypted)
                 throw new Exception("Could not establish an encrypted connection to " + Host);

tests/ServiceStack.Redis.Tests/Support/TcpClientWithTimeout.cs

@@ -92,7 +92,11 @@ 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();
         }
     }