Upgrade to NUnit3

.gitignore

@@ -128,3 +128,4 @@ output/*
 ._*
 
 _start
+_temp_*/**/*

build.sh

@@ -208,9 +208,9 @@ PackageTests()
     find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
 
     if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+        $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+        mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder

integration_mono.sh

@@ -1,8 +0,0 @@
-EXCLUDE="-exclude:Windows -include:IntegrationTest"
-TESTDIR="."
-NUNIT="$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe"
-
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Api.Result.xml $TESTDIR/NzbDrone.Api.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Core.Result.xml $TESTDIR/NzbDrone.Core.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Integration.Result.xml $TESTDIR/NzbDrone.Integration.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Common.Result.xml $TESTDIR/NzbDrone.Common.Test.dll

src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -46,9 +46,9 @@
       <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -111,4 +111,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Api.Test/packages.config

@@ -3,6 +3,6 @@
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
   <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
 </packages>

src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -49,9 +49,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/NzbDrone.App.Test/packages.config

@@ -4,5 +4,5 @@
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj

@@ -50,9 +50,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/NzbDrone.Automation.Test/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
   <package id="Selenium.Support" version="2.48.0" targetFramework="net40" />
   <package id="Selenium.WebDriver" version="2.48.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common.Test/CacheTests/CachedFixture.cs

@@ -89,7 +89,7 @@ namespace NzbDrone.Common.Test.CacheTests
             int hitCount = 0;
             _cachedString = new Cached<string>();
 
-            for (int i = 0; i < 100; i++)
+            for (int i = 0; i < 10; i++)
             {
                 _cachedString.Get("key", () =>
                     {
@@ -97,7 +97,7 @@ namespace NzbDrone.Common.Test.CacheTests
                         return null;
                     }, TimeSpan.FromMilliseconds(300));
 
-                Thread.Sleep(10);
+                Thread.Sleep(100);
             }
 
             hitCount.Should().BeInRange(3, 6);

src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -49,9 +49,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -6,6 +6,7 @@ using NUnit.Framework;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Test.Common;
+using NzbDrone.Test.Common.Categories;
 
 namespace NzbDrone.Common.Test
 {
@@ -153,7 +154,7 @@ namespace NzbDrone.Common.Test
         }
 
         [Test]
-        [Ignore]
+        [Ignore("Parent, not Grandparent")]
         public void should_not_be_parent_when_it_is_grandparent()
         {
             var path = Path.Combine(_parent, "parent", "child");
@@ -222,6 +223,7 @@ namespace NzbDrone.Common.Test
 
         [Test]
         [Explicit]
+        [ManualTest]
         public void get_actual_casing_should_return_original_casing_for_shares()
         {
             var path = @"\\server\Pool\Apps";

src/NzbDrone.Common.Test/ProcessProviderTests.cs

@@ -31,10 +31,21 @@ namespace NzbDrone.Common.Test
         [TearDown]
         public void TearDown()
         {
-            Process.GetProcessesByName(DummyApp.DUMMY_PROCCESS_NAME).ToList().ForEach(c => c.Kill());
+            Process.GetProcessesByName(DummyApp.DUMMY_PROCCESS_NAME).ToList().ForEach(c =>
+            {
+                try
+                {
+                    c.Kill();
+                }
+                catch (Win32Exception ex)
+                {
+                    TestLogger.Warn(ex, "{0} when killing process", ex.Message);
+                    throw;
+                }
+                
+            });
         }
 
-
         [Test]
         public void GetById_should_return_null_if_process_doesnt_exist()
         {

src/NzbDrone.Common.Test/ServiceProviderTests.cs

@@ -2,7 +2,9 @@
 using System.ServiceProcess;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Test.Common;
+using NzbDrone.Test.Common.Categories;
 
 namespace NzbDrone.Common.Test
 {
@@ -13,7 +15,6 @@ namespace NzbDrone.Common.Test
         private const string ALWAYS_INSTALLED_SERVICE = "SCardSvr"; //Smart Card
         private const string TEMP_SERVICE_NAME = "NzbDrone_Nunit";
 
-
         [SetUp]
         public void Setup()
         {
@@ -24,8 +25,10 @@ namespace NzbDrone.Common.Test
         [TearDown]
         public void TearDown()
         {
-            WindowsOnly();
+            if (OsInfo.IsWindows)
-            CleanupService();
+            {
+                CleanupService();
+            }
         }
 
 
@@ -70,6 +73,7 @@ namespace NzbDrone.Common.Test
 
         [Test]
         [Explicit]
+        [ManualTest]
         public void UnInstallService()
         {
             Subject.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME);
@@ -78,6 +82,7 @@ namespace NzbDrone.Common.Test
 
         [Test]
         [Explicit]
+        [ManualTest]
         public void Should_be_able_to_start_and_stop_service()
         {
             Subject.GetService(ALWAYS_INSTALLED_SERVICE).Status

src/NzbDrone.Common.Test/packages.config

@@ -3,5 +3,5 @@
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;
@@ -8,16 +9,16 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
 {
     public class SearchDefinitionFixture : CoreTest<SingleEpisodeSearchCriteria>
     {
-        [TestCase("Betty White's Off Their Rockers", Result = "Betty+Whites+Off+Their+Rockers")]
+        [TestCase("Betty White's Off Their Rockers", "Betty+Whites+Off+Their+Rockers")]
-        [TestCase("Star Wars: The Clone Wars", Result = "Star+Wars+The+Clone+Wars")]
+        [TestCase("Star Wars: The Clone Wars", "Star+Wars+The+Clone+Wars")]
-        [TestCase("Hawaii Five-0", Result = "Hawaii+Five+0")]
+        [TestCase("Hawaii Five-0", "Hawaii+Five+0")]
-        [TestCase("Franklin & Bash", Result = "Franklin+and+Bash")]
+        [TestCase("Franklin & Bash", "Franklin+and+Bash")]
-        [TestCase("Chicago P.D.", Result = "Chicago+PD")]
+        [TestCase("Chicago P.D.", "Chicago+PD")]
-        [TestCase("Kourtney And Khlo\u00E9 Take The Hamptons", Result = "Kourtney+And+Khloe+Take+The+Hamptons")]
+        [TestCase("Kourtney And Khlo\u00E9 Take The Hamptons", "Kourtney+And+Khloe+Take+The+Hamptons")]
-        public string should_replace_some_special_characters(string input)
+        public void should_replace_some_special_characters(string input, string expected)
         {
             Subject.SceneTitles = new List<string> { input };
-            return Subject.QueryTitles.First();
+            Subject.QueryTitles.First().Should().Be(expected);
         }
     }
 }

src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs

@@ -9,6 +9,7 @@ using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
+using NzbDrone.Test.Common.Categories;
 
 namespace NzbDrone.Core.Test.InstrumentationTests
 {
@@ -68,6 +69,7 @@ namespace NzbDrone.Core.Test.InstrumentationTests
 
         [Test]
         [Explicit]
+        [ManualTest]
         public void perf_test()
         {
             MapRepository.Instance.EnableTraceLogging = false;

src/NzbDrone.Core.Test/NotificationTests/ProwlProviderTest.cs

@@ -2,10 +2,12 @@
 using NzbDrone.Core.Notifications.Prowl;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
+using NzbDrone.Test.Common.Categories;
 
 namespace NzbDrone.Core.Test.NotificationTests
 {
     [Explicit]
+    [ManualTest]
     [TestFixture]
     public class ProwlProviderTest : CoreTest<ProwlService>
     {

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -72,9 +72,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

src/NzbDrone.Core.Test/packages.config

@@ -11,7 +11,7 @@
   <package id="NCrunch.Framework" version="1.46.0.9" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />
 </packages>

src/NzbDrone.Integration.Test/CommandIntegerationTests.cs

@@ -8,7 +8,7 @@ using RestSharp;
 namespace NzbDrone.Integration.Test
 {
     [TestFixture]
-    [Ignore]
+    [Ignore("Command integration tests are bad, maybe?")]
     public class CommandIntegrationTest : IntegrationTest
     {
         [Test]

src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj

@@ -80,9 +80,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/NzbDrone.Integration.Test/packages.config

@@ -11,7 +11,7 @@
   <package id="Nancy.Owin" version="0.23.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
   <package id="RestSharp" version="105.0.1" targetFramework="net40" />
 </packages>

src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj

@@ -50,9 +50,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -95,4 +95,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Libraries.Test/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj

@@ -62,9 +62,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Mono.Posix.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -120,4 +120,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Mono.Test/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Test.Common/Categories/ManualTestAttribute.cs

@@ -0,0 +1,13 @@
+using NUnit.Framework;
+
+namespace NzbDrone.Test.Common.Categories
+{
+    public class ManualTestAttribute : CategoryAttribute
+    {
+        public ManualTestAttribute()
+            : base("ManualTest")
+        {
+
+        }
+    }
+}

src/NzbDrone.Test.Common/LoggingTest.cs

@@ -3,6 +3,7 @@ using NLog;
 using NLog.Config;
 using NLog.Targets;
 using NUnit.Framework;
+using NUnit.Framework.Interfaces;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
@@ -49,7 +50,7 @@ namespace NzbDrone.Test.Common
         {
             //can't use because of a bug in mono with 2.6.2,
             //https://bugs.launchpad.net/nunitv2/+bug/1076932
-            if (BuildInfo.IsDebug && TestContext.CurrentContext.Result.State == TestState.Success)
+            if (BuildInfo.IsDebug && TestContext.CurrentContext.Result.Outcome == ResultState.Success)
             {
                 ExceptionVerification.AssertNoUnexpectedLogs();
             }

src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj

@@ -53,9 +53,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -86,6 +86,7 @@
     <Compile Include="AutoMoq\Unity\AutoMockingBuilderStrategy.cs" />
     <Compile Include="AutoMoq\Unity\AutoMockingContainerExtension.cs" />
     <Compile Include="Categories\DiskAccessTestAttribute.cs" />
+    <Compile Include="Categories\ManualTestAttribute.cs" />
     <Compile Include="Categories\IntegrationTestAttribute.cs" />
     <Compile Include="ConcurrencyCounter.cs" />
     <Compile Include="ExceptionVerification.cs" />

src/NzbDrone.Test.Common/packages.config

@@ -5,7 +5,7 @@
   <package id="Moq" version="4.0.10827" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
   <package id="RestSharp" version="105.0.1" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />
 </packages>

src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj

@@ -49,9 +49,9 @@
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/NzbDrone.Update.Test/packages.config

@@ -4,5 +4,5 @@
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" />
   <package id="NLog" version="4.3.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj

@@ -58,8 +58,9 @@
       <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -115,4 +116,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Windows.Test/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

test.sh

@@ -0,0 +1,44 @@
+PLATFORM=$1
+TYPE=$2
+WHERE="cat != ManualTest"
+TEST_DIR="."
+TEST_PATTERN="*Test.dll"
+ASSEMBLIES=""
+
+if [ -d "$TEST_DIR/_tests" ]; then
+  TEST_DIR="$TEST_DIR/_tests"
+fi
+
+NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe"
+NUNIT_COMMAND="$NUNIT"
+NUNIT_PARAMS="--teamcity"
+
+if [ "$PLATFORM" = "Windows" ]; then
+  WHERE="$WHERE && cat != LINUX"
+elif [ "$PLATFORM" = "Linux" ]; then
+  WHERE="$WHERE && cat != WINDOWS"
+  NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
+elif [ "$PLATFORM" = "Mac" ]; then
+  WHERE="$WHERE && cat != WINDOWS"
+  NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
+else
+  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
+  exit 1
+fi
+
+if [ "$TYPE" = "Unit" ]; then
+  WHERE="$WHERE && cat != IntegrationTest && cat != AutomationTest"
+elif [ "$TYPE" = "Integration" ] || [ "$TYPE" = "int" ] ; then
+  WHERE="$WHERE && cat == IntegrationTest"
+elif [ "$TYPE" = "Automation" ] ; then
+  WHERE="$WHERE && cat == AutomationTest"
+else
+  echo "Type must be provided as second argument: Unit, Integration or Automation"
+  exit 2
+fi
+
+for i in `find $TEST_DIR -name "$TEST_PATTERN"`;
+  do ASSEMBLIES="$ASSEMBLIES $i"
+done
+
+$NUNIT_COMMAND --where "$WHERE" $NUNIT_PARAMS $ASSEMBLIES;

tests_mono.sh

@@ -1,10 +0,0 @@
-EXCLUDE="-exclude:Windows,IntegrationTest"
-TESTDIR="."
-NUNIT="$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe"
-
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Api.Result.xml $TESTDIR/NzbDrone.Api.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Common.Result.xml $TESTDIR/NzbDrone.Common.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Core.Result.xml $TESTDIR/NzbDrone.Core.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Host.Result.xml $TESTDIR/NzbDrone.Host.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Libraries.Result.xml $TESTDIR/NzbDrone.Libraries.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Mono.Result.xml $TESTDIR/NzbDrone.Mono.Test.dll