Switch unit tests to NUnit

Author: Daniel15

build.proj

@@ -29,10 +29,6 @@ of patent rights can be found in the PATENTS file in the same directory.
 	</ItemGroup>
 
 	<Import Project="$(MSBuildProjectDirectory)\tools\MSBuildTasks\MSBuild.Community.Tasks.Targets" />
-	<UsingTask
-		AssemblyFile="src\packages\xunit.1.9.2\lib\net20\xunit.runner.msbuild.dll"
-		TaskName="Xunit.Runner.MSBuild.xunit"
-	/>
 	<UsingTask 
 		AssemblyFile="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v12.0\Web\Microsoft.Web.Publishing.Tasks.dll"
 		TaskName="TransformXml"
@@ -74,7 +70,10 @@ of patent rights can be found in the PATENTS file in the same directory.
 		<ItemGroup>
 			<TestAssemblies Include="bin/ReleaseTests/**/React.Tests*.dll" />
 		</ItemGroup>
-		<xunit Assemblies="@(TestAssemblies)" />
+		<NUnit
+			ToolPath="src\packages\NUnit.Runners.2.6.3\tools"
+			Assemblies="@(TestAssemblies)"
+		/>
 	</Target>
 
 	<Target Name="GenerateNuSpecs">

src/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit.Runners" version="2.6.3" />
+</packages>

src/React.Tests/Core/JavaScriptEngineFactoryTest.cs

@@ -9,13 +9,14 @@
 
 using System.Threading;
 using JavaScriptEngineSwitcher.Core;
-using Xunit;
+using NUnit.Framework;
 
 namespace React.Tests.Core
 {
+	[TestFixture]
 	public class JavaScriptEngineFactoryTest
 	{
-		[Fact]
+		[Test]
 		public void ShouldCallOnNewEngineWhenCreatingNew()
 		{
 			var factory = new JavaScriptEngineFactory();
@@ -30,7 +31,7 @@ public void ShouldCallOnNewEngineWhenCreatingNew()
 			Assert.True(called);
 		}
 
-		[Fact]
+		[Test]
 		public void ShouldNotCallOnNewEngineWhenUsingExisting()
 		{
 			var factory = new JavaScriptEngineFactory();
@@ -42,18 +43,18 @@ public void ShouldNotCallOnNewEngineWhenUsingExisting()
 			Assert.False(called);
 		}
 
-		[Fact]
+		[Test]
 		public void ShouldReturnSameEngine()
 		{
 			var factory = new JavaScriptEngineFactory();
 			var engine1 = factory.GetEngineForCurrentThread();
 			var engine2 = factory.GetEngineForCurrentThread();
 
-			Assert.Equal(engine1, engine2);
+			Assert.AreEqual(engine1, engine2);
 			factory.DisposeEngineForCurrentThread();
 		}
 
-		[Fact]
+		[Test]
 		public void ShouldReturnNewEngineAfterDisposing()
 		{
 			var factory = new JavaScriptEngineFactory();
@@ -62,10 +63,10 @@ public void ShouldReturnNewEngineAfterDisposing()
 			var engine2 = factory.GetEngineForCurrentThread();
 			factory.DisposeEngineForCurrentThread();
 
-			Assert.NotEqual(engine1, engine2);
+			Assert.AreNotEqual(engine1, engine2);
 		}
 
-		[Fact]
+		[Test]
 		public void ShouldCreateNewEngineForNewThread()
 		{
 			var factory = new JavaScriptEngineFactory();
@@ -84,9 +85,9 @@ public void ShouldCreateNewEngineForNewThread()
 			var engine3 = factory.GetEngineForCurrentThread();
 
 			// Different threads should have different engines
-			Assert.NotEqual(engine1, engine2);
+			Assert.AreNotEqual(engine1, engine2);
 			// Same thread should share same engine
-			Assert.Equal(engine1, engine3);
+			Assert.AreEqual(engine1, engine3);
 			factory.DisposeEngineForCurrentThread();
 		}
 	}

src/React.Tests/Core/JsxTransformerTests.cs

@@ -8,14 +8,15 @@
  */
 
 using Moq;
+using NUnit.Framework;
 using React.Exceptions;
-using Xunit;
 
 namespace React.Tests.Core
 {
+	[TestFixture]
 	public class JsxTransformerTests
 	{
-		[Fact]
+		[Test]
 		public void ShouldNotTransformJsxIfNoAnnotationPresent()
 		{
 			var environment = new Mock<IReactEnvironment>();
@@ -29,10 +30,10 @@ public void ShouldNotTransformJsxIfNoAnnotationPresent()
 			const string input = "<div>Hello World</div>";
 
 			var output = jsxTransformer.TransformJsx(input);
-			Assert.Equal(input, output);
+			Assert.AreEqual(input, output);
 		}
 
-		[Fact]
+		[Test]
 		public void ShouldTransformJsxIfAnnotationPresent()
 		{
 			var environment = new Mock<IReactEnvironment>();

src/React.Tests/Core/ReactComponentTest.cs

@@ -1,12 +1,22 @@
-using Moq;
+/*
+ *  Copyright (c) 2014, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using Moq;
+using NUnit.Framework;
 using React.Exceptions;
-using Xunit;
 
 namespace React.Tests.Core
 {
+	[TestFixture]
 	public class ReactComponentTest
 	{
-		[Fact]
+		[Test]
 		public void RenderHtmlShouldThrowExceptionIfComponentDoesNotExist()
 		{
 			var environment = new Mock<IReactEnvironment>();
@@ -19,7 +29,7 @@ public void RenderHtmlShouldThrowExceptionIfComponentDoesNotExist()
 			});
 		}
 
-		[Fact]
+		[Test]
 		public void RenderHtmlShouldCallRenderComponent()
 		{
 			var environment = new Mock<IReactEnvironment>();
@@ -34,7 +44,7 @@ public void RenderHtmlShouldCallRenderComponent()
 			environment.Verify(x => x.Execute<string>(@"React.renderComponentToString(Foo({""hello"":""World""}))"));
 		}
 
-		[Fact]
+		[Test]
 		public void RenderHtmlShouldWrapComponentInDiv()
 		{
 			var environment = new Mock<IReactEnvironment>();
@@ -48,10 +58,10 @@ public void RenderHtmlShouldWrapComponentInDiv()
 			};
 			var result = component.RenderHtml();
 
-			Assert.Equal(@"<div id=""container"">[HTML]</div>", result);
+			Assert.AreEqual(@"<div id=""container"">[HTML]</div>", result);
 		}
 
-		[Fact]
+		[Test]
 		public void RenderJavaScriptShouldCallRenderComponent()
 		{
 			var environment = new Mock<IReactEnvironment>();
@@ -62,7 +72,7 @@ public void RenderJavaScriptShouldCallRenderComponent()
 			};
 			var result = component.RenderJavaScript();
 
-			Assert.Equal(
+			Assert.AreEqual(
 				@"React.renderComponent(Foo({""hello"":""World""}), document.getElementById(""container""))",
 				result
 			);

src/React.Tests/Core/ReactEnvironmentTest.cs

@@ -10,13 +10,14 @@
 using System;
 using JavaScriptEngineSwitcher.Core;
 using Moq;
-using Xunit;
+using NUnit.Framework;
 
 namespace React.Tests.Core
 {
+	[TestFixture]
 	public class ReactEnvironmentTest
 	{
-		[Fact]
+		[Test]
 		public void ExecuteWithLargerStackIfRequiredWithNoNewThread()
 		{
 			var mocks = new Mocks();
@@ -26,7 +27,7 @@ public void ExecuteWithLargerStackIfRequiredWithNoNewThread()
 			mocks.Engine.Verify(x => x.Evaluate<int>("1+1"));
 		}
 
-		[Fact]
+		[Test]
 		public void ExecuteWithLargerStackIfRequiredWithNewThread()
 		{
 			var mocks = new Mocks();
@@ -50,7 +51,7 @@ public void ExecuteWithLargerStackIfRequiredWithNewThread()
 			);
 		}
 
-		[Fact]
+		[Test]
 		public void ExecuteWithLargerStackIfRequiredShouldBubbleExceptions()
 		{
 			var mocks = new Mocks();

src/React.Tests/React.Tests.csproj

@@ -47,6 +47,9 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
@@ -55,9 +58,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit">
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">

src/React.Tests/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="JavaScriptEngineSwitcher.Core" version="1.1.3" targetFramework="net40" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
-  <package id="xunit" version="1.9.2" targetFramework="net40" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
 </packages>

src/React.sln

@@ -44,6 +44,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Web.Mvc3", "React.Web
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.MSBuild", "React.MSBuild\React.MSBuild.csproj", "{AF531A37-B93F-4113-9C2C-4DB28064B926}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F2875D3A-0C8A-439B-B734-ECABA00AC629}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU