Upgrade test proj to net46, enable .NET Core + convert Explicit to Ignore

mythz · mythz · commit a6b12867b011 · 2017-12-10T02:52:07.000-05:00
diff --git a/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs b/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs
@@ -4,7 +4,7 @@
 namespace ServiceStack.Redis.Tests.Sentinel
 {
     [TestFixture, Category("Integration")]
-    [Explicit("Requires cloud setup")]
+    [Ignore("Requires cloud setup")]
     public class Redis3SentinelSetupTests
         : RedisSentinelTestBase
     {
diff --git a/tests/ServiceStack.Redis.Tests/Benchmarks/DoubleSerializationBenchmarks.cs b/tests/ServiceStack.Redis.Tests/Benchmarks/DoubleSerializationBenchmarks.cs
@@ -8,7 +8,7 @@
 
 namespace ServiceStack.Redis.Tests.Benchmarks
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Benchmark")]
     public class DoubleSerializationBenchmarks
     {
         const int times = 100000;
diff --git a/tests/ServiceStack.Redis.Tests/DiagnosticTests.cs b/tests/ServiceStack.Redis.Tests/DiagnosticTests.cs
@@ -5,7 +5,7 @@
 
 namespace ServiceStack.Redis.Tests
 {
-    [Explicit("Diagnostic only Integration Test")]
+    [Ignore("Diagnostic only Integration Test")]
     [TestFixture]
     public class DiagnosticTests
     {
diff --git a/tests/ServiceStack.Redis.Tests/Examples/BestPractice/BlogPostBestPractice.cs b/tests/ServiceStack.Redis.Tests/Examples/BestPractice/BlogPostBestPractice.cs
@@ -273,7 +273,7 @@ public List<T> Inject<T>(IEnumerable<T> entities)
     #endregion
 
 
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class BlogPostBestPractice
     {
         readonly RedisClient redisClient = new RedisClient(TestConfig.SingleHost);
diff --git a/tests/ServiceStack.Redis.Tests/Examples/BestPractice/BlogPostMigrations.cs b/tests/ServiceStack.Redis.Tests/Examples/BestPractice/BlogPostMigrations.cs
@@ -52,7 +52,7 @@ public enum BlogPostType
 
 namespace ServiceStack.Redis.Tests.Examples.BestPractice
 {
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class BlogPostMigrations
     {
         readonly RedisClient redisClient = new RedisClient(TestConfig.SingleHost);
diff --git a/tests/ServiceStack.Redis.Tests/Examples/BlogPostExample.cs b/tests/ServiceStack.Redis.Tests/Examples/BlogPostExample.cs
@@ -64,7 +64,7 @@ public class BlogPostComment
     }
 
 
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class BlogPostExample
     {
         readonly RedisClient redis = new RedisClient(TestConfig.SingleHost);
diff --git a/tests/ServiceStack.Redis.Tests/Examples/ServiceStack_Redis_UseCase.cs b/tests/ServiceStack.Redis.Tests/Examples/ServiceStack_Redis_UseCase.cs
@@ -4,7 +4,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Integration")]
     public class ServiceStack_Redis_UseCase
     {
         public class Todo
diff --git a/tests/ServiceStack.Redis.Tests/Examples/SimpleExamples.cs b/tests/ServiceStack.Redis.Tests/Examples/SimpleExamples.cs
@@ -8,7 +8,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class SimpleExamples
     {
         readonly RedisClient redis = new RedisClient(TestConfig.SingleHost);
diff --git a/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs b/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs
@@ -7,7 +7,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class SimpleLocks
     {
         [SetUp]
diff --git a/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs b/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs
@@ -6,7 +6,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class SimplePubSub
     {
         const string ChannelName = "SimplePubSubCHANNEL";
diff --git a/tests/ServiceStack.Redis.Tests/Examples/TestData.cs b/tests/ServiceStack.Redis.Tests/Examples/TestData.cs
@@ -4,7 +4,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Integration")]
     public class TestData
         : RedisClientTestsBase
     {
diff --git a/tests/ServiceStack.Redis.Tests/Examples/TodoApp.cs b/tests/ServiceStack.Redis.Tests/Examples/TodoApp.cs
@@ -2,7 +2,7 @@
 
 namespace ServiceStack.Redis.Tests.Examples
 {
-    [TestFixture, Explicit, Category("Integration")]
+    [TestFixture, Ignore("Integration"), Category("Integration")]
     public class TodoApp
     {
         [SetUp]
diff --git a/tests/ServiceStack.Redis.Tests/Generic/RedisTypedClientTests.cs b/tests/ServiceStack.Redis.Tests/Generic/RedisTypedClientTests.cs
@@ -76,7 +76,7 @@ public void Can_Expire()
             Assert.That(RedisTyped.GetById("key"), Is.Null);
         }
 
-        [Explicit("Changes in system clock can break test")]
+        [Ignore("Changes in system clock can break test")]
         [Test]
         public void Can_ExpireAt()
         {
diff --git a/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs b/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs
@@ -22,7 +22,7 @@ public void onBeforeTestFixture()
             testData = TypeSerializer.SerializeToString(results);
         }
 
-        [Explicit("Can hang CI")]
+        [Ignore("Can hang CI")]
         [Test]
         public void Can_support_64_threads_using_the_client_simultaneously()
         {
diff --git a/tests/ServiceStack.Redis.Tests/Issues/TransactionIssueTests.cs b/tests/ServiceStack.Redis.Tests/Issues/TransactionIssueTests.cs
@@ -112,7 +112,7 @@ private void CheckConnection(object state)
             Task.Factory.StartNew(CheckThisConnection);
         }
 
-        [Explicit, Test]
+        [Ignore("Integration"), Test]
         public void Can_queue_large_transaction()
         {
             var q = new System.Threading.Timer(CheckConnection, null, 30000, 2);
diff --git a/tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs b/tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs
@@ -47,7 +47,7 @@ public void Throws_on_access_of_21_types()
             }
         }
 
-        [Test, Explicit("Takes too long - but works!")]
+        [Test, Ignore("Takes too long - but works!")]
         public void Allows_access_of_6000_operations()
         {
             using (var client = new RedisClient(TestConfig.SingleHost))
@@ -56,7 +56,7 @@ public void Allows_access_of_6000_operations()
             }
         }
 
-        [Test, Explicit("Takes too long - but works!")]
+        [Test, Ignore("Takes too long - but works!")]
         public void Throws_on_access_of_6100_operations()
         {
             using (var client = new RedisClient(TestConfig.SingleHost))
@@ -88,7 +88,7 @@ public void Allows_access_of_21_types()
             }
         }
 
-        [Test, Explicit("Takes too long - but works!")]
+        [Test, Ignore("Takes too long - but works!")]
         public void Allows_access_of_6100_operations()
         {
 #if NETCORE
diff --git a/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs b/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs
@@ -404,7 +404,7 @@ public void Does_throw_TimeoutException_when_PoolTimeout_exceeded()
             }
         }
 
-        //[Explicit,Ignore("tempromental integration test")]
+        //[Ignore("tempromental integration test")]
         //[Test]
         //public void Can_support_64_threads_using_the_client_simultaneously()
         //{
diff --git a/tests/ServiceStack.Redis.Tests/RedisBenchmarkTests.cs b/tests/ServiceStack.Redis.Tests/RedisBenchmarkTests.cs
@@ -7,7 +7,7 @@
 
 namespace ServiceStack.Redis.Tests
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Benchmark")]
     public class RedisBenchmarkTests
         : RedisClientTestsBase
     {
@@ -117,7 +117,7 @@ public void Compare_sort_nosort_to_smembers_mget()
         }
     }
 
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Benchmark")]
     public class RawBytesSetBenchmark
     {
         public void Run(string name, int nBlockSizeBytes, Action<int, byte[]> fn)
diff --git a/tests/ServiceStack.Redis.Tests/RedisClientConfigTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientConfigTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.Redis.Tests
     public class RedisClientConfigTests
         : RedisClientTestsBase
     {
-        [Explicit("Hurts MSOpenTech Redis Server")]
+        [Ignore("Hurts MSOpenTech Redis Server")]
         [Test]
         public void Can_Set_and_Get_Config()
         {
diff --git a/tests/ServiceStack.Redis.Tests/RedisClientTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientTests.cs
@@ -180,7 +180,7 @@ public void Can_Expire_Ms()
             Assert.That(Redis.ContainsKey("key"), Is.False);
         }
 
-        [Explicit("Changes in system clock can break test")]
+        [Ignore("Changes in system clock can break test")]
         [Test]
         public void Can_ExpireAt()
         {
diff --git a/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs b/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs
@@ -4,9 +4,7 @@
 namespace ServiceStack.Redis.Tests
 {
     [TestFixture]
-#if !NETCORE    
-    [Explicit, Ignore("CI requires redis-server v3.2.0")]
-#endif
+    [Ignore("CI requires redis-server v3.2.0")]
     public class RedisGeoNativeClientTests
     {
         private readonly RedisNativeClient redis;
diff --git a/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs b/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs
@@ -4,9 +4,7 @@
 namespace ServiceStack.Redis.Tests
 {
     [TestFixture]
-#if !NETCORE
-    [Explicit, Ignore("CI requires redis-server v3.2.0")]
-#endif
+    [Ignore("CI requires redis-server v3.2.0")]
     public class RedisGeoTests
     {
         private readonly RedisClient redis;
diff --git a/tests/ServiceStack.Redis.Tests/RedisHyperLogTests.cs b/tests/ServiceStack.Redis.Tests/RedisHyperLogTests.cs
@@ -4,7 +4,7 @@
 
 namespace ServiceStack.Redis.Tests
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Integration")]
     public class RedisHyperLogTests
     {
         [Test]
diff --git a/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs b/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs
@@ -6,7 +6,7 @@ namespace ServiceStack.Redis.Tests
     public class RedisPasswordTests
     {
 
-        [Explicit("Integration")]
+        [Ignore("Integration")]
         [Test]
         public void Can_connect_to_Slaves_and_Masters_with_Password()
         {
diff --git a/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs b/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs
@@ -14,7 +14,7 @@ public void OneTimeSetUp()
         }
 
         [Test]
-        [Explicit]
+        [Ignore("too long")]
         public void Batch_and_Pipeline_requests_only_counts_as_1_request()
         {
             var reqCount = RedisNativeClient.RequestsPerHour;
diff --git a/tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj b/tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.Redis.Tests</AssemblyName>
@@ -19,14 +19,16 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\ServiceStack.Redis\ServiceStack.Redis.csproj" />
-    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <DefineConstants>$(DefineConstants);NET45</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Tasks" />
@@ -56,7 +58,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(NUNITLITE)' != '' ">
-    <PackageReference Include="NUnitLite" Version="3.6.1" />
+    <PackageReference Include="NUnitLite" Version="3.9.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
diff --git a/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs b/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs
@@ -3,7 +3,7 @@
 
 namespace ServiceStack.Redis.Tests
 {
-    [TestFixture, Explicit]
+    [TestFixture, Ignore("Integration")]
     public class TwemproxyTests
     {
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace ServiceStack.Redis.Tests.Sentinel`
`5`	`5`	`{`
`6`	`6`	`[TestFixture, Category("Integration")]`
`7`		`- [Explicit("Requires cloud setup")]`
	`7`	`+ [Ignore("Requires cloud setup")]`
`8`	`8`	`public class Redis3SentinelSetupTests`
`9`	`9`	`: RedisSentinelTestBase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace ServiceStack.Redis.Tests.Benchmarks`
`10`	`10`	`{`
`11`		`- [TestFixture, Explicit]`
	`11`	`+ [TestFixture, Ignore("Benchmark")]`
`12`	`12`	`public class DoubleSerializationBenchmarks`
`13`	`13`	`{`
`14`	`14`	`const int times = 100000;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace ServiceStack.Redis.Tests`
`7`	`7`	`{`
`8`		`- [Explicit("Diagnostic only Integration Test")]`
	`8`	`+ [Ignore("Diagnostic only Integration Test")]`
`9`	`9`	`[TestFixture]`
`10`	`10`	`public class DiagnosticTests`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public List<T> Inject<T>(IEnumerable<T> entities)`
`273`	`273`	`#endregion`
`274`	`274`
`275`	`275`
`276`		`- [TestFixture, Explicit, Category("Integration")]`
	`276`	`+ [TestFixture, Ignore("Integration"), Category("Integration")]`
`277`	`277`	`public class BlogPostBestPractice`
`278`	`278`	`{`
`279`	`279`	`readonly RedisClient redisClient = new RedisClient(TestConfig.SingleHost);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public enum BlogPostType`
`52`	`52`
`53`	`53`	`namespace ServiceStack.Redis.Tests.Examples.BestPractice`
`54`	`54`	`{`
`55`		`- [TestFixture, Explicit, Category("Integration")]`
	`55`	`+ [TestFixture, Ignore("Integration"), Category("Integration")]`
`56`	`56`	`public class BlogPostMigrations`
`57`	`57`	`{`
`58`	`58`	`readonly RedisClient redisClient = new RedisClient(TestConfig.SingleHost);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public class BlogPostComment`
`64`	`64`	`}`
`65`	`65`
`66`	`66`
`67`		`- [TestFixture, Explicit, Category("Integration")]`
	`67`	`+ [TestFixture, Ignore("Integration"), Category("Integration")]`
`68`	`68`	`public class BlogPostExample`
`69`	`69`	`{`
`70`	`70`	`readonly RedisClient redis = new RedisClient(TestConfig.SingleHost);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace ServiceStack.Redis.Tests.Examples`
`9`	`9`	`{`
`10`		`- [TestFixture, Explicit, Category("Integration")]`
	`10`	`+ [TestFixture, Ignore("Integration"), Category("Integration")]`
`11`	`11`	`public class SimpleLocks`
`12`	`12`	`{`
`13`	`13`	`[SetUp]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace ServiceStack.Redis.Tests.Examples`
`8`	`8`	`{`
`9`		`- [TestFixture, Explicit, Category("Integration")]`
	`9`	`+ [TestFixture, Ignore("Integration"), Category("Integration")]`
`10`	`10`	`public class SimplePubSub`
`11`	`11`	`{`
`12`	`12`	`const string ChannelName = "SimplePubSubCHANNEL";`