Upgrade to NUnit3

This commit is contained in:
Mark McDowall
2016-04-01 19:19:32 -07:00
parent 2fabe2d198
commit edea488dbe
37 changed files with 151 additions and 85 deletions
@@ -0,0 +1,13 @@
using NUnit.Framework;
namespace NzbDrone.Test.Common.Categories
{
public class ManualTestAttribute : CategoryAttribute
{
public ManualTestAttribute()
: base("ManualTest")
{
}
}
}
+2 -1
View File
@@ -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();
}
@@ -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">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.2.0\lib\net40\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" />
+1 -1
View File
@@ -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>