Update NUnit

.travis.yml

@@ -26,7 +26,7 @@ before_install:
 
 script:
     - ./build --configuration=$BUILD_CONFIGURATION
-    - ./build test+only --configuration=$BUILD_CONFIGURATION --exclude=FlakyNetwork
+    - ./build test+only --configuration=$BUILD_CONFIGURATION --where="cat != FlakyNetwork"
 
 deploy:
     # Releases (which are tagged) go to github

CKAN.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>

Tests/Core/ModuleInstallerDirTest.cs

@@ -27,7 +27,7 @@ public class ModuleInstallerDirTest
         /// Prep environment by setting up a single mod in
         /// a disposable KSP instance.
         /// </summary>
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             _testModule = TestData.DogeCoinFlag_101_module();

Tests/Core/Relationships/SanityChecker.cs

@@ -16,7 +16,7 @@ public class SanityChecker
         private CKAN.Registry registry;
         private DisposableKSP ksp;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Setup()
         {
             ksp = new DisposableKSP();

Tests/Data/TestData.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 using CKAN;
 using CKAN.Versioning;
 using Version = CKAN.Version;
@@ -12,12 +13,14 @@ static public class TestData
     {
         public static string DataDir()
         {
-            // TODO: Have this actually walk our directory structure and find
-            // t/data. This means we can relocate our test executable and
-            // things will still work.
-            string current = Directory.GetCurrentDirectory();
-
-            return Path.Combine(current, "../../../../../Tests/Data");
+            // FIXME: Come up with a better solution for test data
+            // 1. This is fragile with respect to changes in directory structure.
+            // 2. This forces us to disable ReSharper's test assembly shadow copying
+            // 3. "Quick" solution is to embed test data as an archive and extract it on demand to a known temporary location.
+            //    But this makes updates hard.
+            // 4. A better, but much harder solution, is to not require harded files on disk for any of our tests, but that's
+            //    a lot of work.
+            return Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName, "../../../../../Tests/Data");
         }
 
         public static string DataDir(string file)

Tests/GUI/Configuration.cs

@@ -10,13 +10,13 @@ public class ConfigurationTests
     {
         string tempDir;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Setup()
         {
             tempDir = TestData.NewTempDir();
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             Directory.Delete(tempDir, true);

Tests/GUI/GH1866.cs

@@ -47,7 +47,7 @@ public class GH1866
             new NetAsyncModulesDownloader(main.currentUser)
         );*/
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Up()
         {
             _instance = new DisposableKSP();
@@ -84,7 +84,7 @@ public void Up()
             }
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void Down()
         {
             _instance.Dispose();

Tests/GUI/NavigationHistoryTests.cs

@@ -39,7 +39,7 @@ public void After_SingleHistoryItem_CannotNavigate()
             Assert.IsFalse(nav.CanNavigateForward);
         }
 
-        [Test, ExpectedException(typeof(InvalidOperationException))]
+        [Test]
         public void NavigatingBackward_WhenUnable_ThrowsException()
         {
             // arrange
@@ -48,14 +48,14 @@ public void NavigatingBackward_WhenUnable_ThrowsException()
 
             // act
 
-            nav.NavigateBackward();
+            TestDelegate act = () => nav.NavigateBackward();
 
             // assert
 
-            Assert.Fail();
+            Assert.Throws<InvalidOperationException>(act);
         }
 
-        [Test, ExpectedException(typeof(InvalidOperationException))]
+        [Test]
         public void NavigatingForward_WhenUnable_ThrowsException()
         {
             // arrange
@@ -64,11 +64,11 @@ public void NavigatingForward_WhenUnable_ThrowsException()
 
             // act
 
-            nav.NavigateForward();
+            TestDelegate act = () => nav.NavigateForward();
 
             // assert
 
-            Assert.Fail();
+            Assert.Throws<InvalidOperationException>(act);
         }
 
         [Test]

Tests/NetKAN/SDMod.cs

@@ -26,10 +26,10 @@ public void SD_Version_Select_214()
         }
 
         [Test]
-        [TestCase("/mod/42/Example/download/1.23", Result="https://spacedock.info/mod/42/Example/download/1.23")]
-        [TestCase("/mod/42/Example%20With%20Spaces/download/1.23", Result="https://spacedock.info/mod/42/Example%20With%20Spaces/download/1.23")]
-        [TestCase("/mod/42/Example With Spaces/download/1.23", Result="https://spacedock.info/mod/42/Example%20With%20Spaces/download/1.23")]
-        [TestCase("/mod/79/Salyut%20Stations%20%26%20Soyuz%20Ferries/download/0.93",Result="https://spacedock.info/mod/79/Salyut%20Stations%20%26%20Soyuz%20Ferries/download/0.93")]
+        [TestCase("/mod/42/Example/download/1.23", ExpectedResult="https://spacedock.info/mod/42/Example/download/1.23")]
+        [TestCase("/mod/42/Example%20With%20Spaces/download/1.23", ExpectedResult = "https://spacedock.info/mod/42/Example%20With%20Spaces/download/1.23")]
+        [TestCase("/mod/42/Example With Spaces/download/1.23", ExpectedResult = "https://spacedock.info/mod/42/Example%20With%20Spaces/download/1.23")]
+        [TestCase("/mod/79/Salyut%20Stations%20%26%20Soyuz%20Ferries/download/0.93", ExpectedResult = "https://spacedock.info/mod/79/Salyut%20Stations%20%26%20Soyuz%20Ferries/download/0.93")]
         // GH #816: Ensure URLs with & are encoded correctly.
         public string SD_URL_encode_816(string path)
         {

Tests/NetKAN/Sources/Curse/CurseApiTests.cs

@@ -14,7 +14,7 @@ public sealed class CurseApiTests
     {
         private NetFileCache _cache;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetup()
         {
             var tempDirectory = Path.Combine(Path.GetTempPath(), "CKAN", Guid.NewGuid().ToString("N"));
@@ -24,7 +24,7 @@ public void TestFixtureSetup()
             _cache = new NetFileCache(tempDirectory);
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             Directory.Delete(_cache.GetCachePath(), recursive: true);

Tests/NetKAN/Sources/Spacedock/SpacedockApiTests.cs

@@ -14,7 +14,7 @@ public sealed class SpacedockApiTests
     {
         private NetFileCache _cache;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetup()
         {
             var tempDirectory = Path.Combine(Path.GetTempPath(), "CKAN", Guid.NewGuid().ToString("N"));
@@ -24,7 +24,7 @@ public void TestFixtureSetup()
             _cache = new NetFileCache(tempDirectory);
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             Directory.Delete(_cache.GetCachePath(), recursive: true);

Tests/NetKAN/Transformers/GeneratedByTransformerTests.cs

@@ -21,7 +21,7 @@ public void AddsGeneratedByProperty()
             var transformedJson = result.Json();
 
             // Assert
-            Assert.That((string)transformedJson["x_generated_by"], Is.StringContaining("netkan"),
+            Assert.That((string)transformedJson["x_generated_by"], Does.Contain("netkan"),
                 "GeneratedByTransformer should add an x_generated_by property containing the string 'netkan'"
             );
         }

Tests/Tests.csproj

@@ -56,9 +56,8 @@
       <HintPath>..\_build\lib\nuget\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\_build\lib\nuget\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\_build\lib\nuget\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Tests/packages.config

@@ -5,5 +5,5 @@
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Moq" version="4.7.8" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
 </packages>

build.cake

@@ -1,6 +1,6 @@
 #addin "nuget:?package=Cake.SemVer&version=1.0.14"
 #tool "nuget:?package=ILRepack&version=2.0.12"
-#tool "nuget:?package=NUnit.Runners&version=2.6.4"
+#tool "nuget:?package=NUnit.ConsoleRunner&version=3.6.1"
 
 using System.Text.RegularExpressions;
 using Semver;
@@ -112,7 +112,7 @@ Task("Test+Only")
 Task("Test-UnitTests+Only")
     .Does(() =>
 {
-    var exclude = Argument<string>("exclude", null);
+    var where = Argument<string>("where", null);
 
     var testFile = outDirectory
         .Combine("CKAN.Tests")
@@ -127,9 +127,9 @@ Task("Test-UnitTests+Only")
 
     CreateDirectory(nunitOutputDirectory);
 
-    NUnit(testFile.FullPath, new NUnitSettings {
-        Exclude = exclude,
-        ResultsFile = nunitOutputDirectory.CombineWithFilePath("TestResult.xml")
+    NUnit3(testFile.FullPath, new NUnit3Settings {
+        Where = where,
+        Results = nunitOutputDirectory.CombineWithFilePath("TestResult.xml")
     });
 });