From e1114ccda8db2bf1cabf2c5a540be84c3b8c3ef7 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 4 Jul 2016 15:02:59 -0400
Subject: [PATCH] Fix up nunit tests + travis

---
 .gitignore                                     |  1 +
 .travis.yml                                    |  7 +++++--
 TrueCraft.API/TrueCraft.API.csproj             |  2 +-
 TrueCraft.API/packages.config                  |  2 +-
 TrueCraft.Client/TrueCraft.Client.csproj       |  6 +++---
 TrueCraft.Client/packages.config               |  2 +-
 TrueCraft.Core.Test/TrueCraft.Core.Test.csproj | 13 +++++++------
 TrueCraft.Core.Test/World/ChunkTest.cs         |  5 ++++-
 TrueCraft.Core.Test/World/RegionTest.cs        |  6 +++++-
 TrueCraft.Core.Test/World/WorldTest.cs         |  5 ++++-
 TrueCraft.Core.Test/packages.config            |  5 +++--
 TrueCraft.Core/TrueCraft.Core.csproj           |  2 +-
 TrueCraft.Core/packages.config                 |  2 +-
 TrueCraft.Launcher/TrueCraft.Launcher.csproj   |  4 ++--
 TrueCraft.Launcher/packages.config             |  2 +-
 TrueCraft/TrueCraft.csproj                     |  2 +-
 TrueCraft/packages.config                      |  2 +-
 17 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79e3756..ea21801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ config.yaml
 packets.log
 
 world/manifest.nbt
+TestResult.xml
diff --git a/.travis.yml b/.travis.yml
index 216e3f9..f84852c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,10 @@ before_install:
     - git submodule update --init --recursive
 install:
     - nuget restore TrueCraft.sln
-    - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
+    - nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory testrunner
 script:
     - xbuild TrueCraft.sln
-    - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./TrueCraft.Core.Test/bin/Debug/TrueCraft.Core.Test.dll
+    - |
+        mono \
+            ./testrunner/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe \
+            ./TrueCraft.Core.Test/TrueCraft.Core.Test.csproj
diff --git a/TrueCraft.API/TrueCraft.API.csproj b/TrueCraft.API/TrueCraft.API.csproj
index 1e1f137..926f818 100644
--- a/TrueCraft.API/TrueCraft.API.csproj
+++ b/TrueCraft.API/TrueCraft.API.csproj
@@ -40,7 +40,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="YamlDotNet">
-      <HintPath>..\packages\YamlDotNet.3.8.0\lib\net35\YamlDotNet.dll</HintPath>
+      <HintPath>..\packages\YamlDotNet.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
diff --git a/TrueCraft.API/packages.config b/TrueCraft.API/packages.config
index 83349ab..f61df4d 100644
--- a/TrueCraft.API/packages.config
+++ b/TrueCraft.API/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="YamlDotNet" version="3.8.0" targetFramework="net45" />
+  <package id="YamlDotNet" version="3.9.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TrueCraft.Client/TrueCraft.Client.csproj b/TrueCraft.Client/TrueCraft.Client.csproj
index 6510758..f24c6f0 100644
--- a/TrueCraft.Client/TrueCraft.Client.csproj
+++ b/TrueCraft.Client/TrueCraft.Client.csproj
@@ -75,13 +75,13 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="MonoGame.Framework">
-      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.0.1678\lib\net40\MonoGame.Framework.dll</HintPath>
+      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="NVorbis">
-      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.0.1678\lib\net40\NVorbis.dll</HintPath>
+      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK">
-      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.0.1678\lib\net40\OpenTK.dll</HintPath>
+      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TrueCraft.Client/packages.config b/TrueCraft.Client/packages.config
index a6ffc98..a21946d 100644
--- a/TrueCraft.Client/packages.config
+++ b/TrueCraft.Client/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MonoGame.Framework.DesktopGL" version="3.5.0.1678" targetFramework="net45" />
+  <package id="MonoGame.Framework.DesktopGL" version="3.5.1.1679" targetFramework="net45" />
   <package id="NVorbis" version="0.8.4.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TrueCraft.Core.Test/TrueCraft.Core.Test.csproj b/TrueCraft.Core.Test/TrueCraft.Core.Test.csproj
index 338b572..b516541 100644
--- a/TrueCraft.Core.Test/TrueCraft.Core.Test.csproj
+++ b/TrueCraft.Core.Test/TrueCraft.Core.Test.csproj
@@ -34,13 +34,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Core">
+      <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.5.10\lib\net45\Moq.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/TrueCraft.Core.Test/World/ChunkTest.cs b/TrueCraft.Core.Test/World/ChunkTest.cs
index 1db2522..7c4b5a9 100644
--- a/TrueCraft.Core.Test/World/ChunkTest.cs
+++ b/TrueCraft.Core.Test/World/ChunkTest.cs
@@ -4,6 +4,8 @@ using TrueCraft.Core.World;
 using TrueCraft.API;
 using fNbt;
 using TrueCraft.Core.Logic.Blocks;
+using System.IO;
+using System.Reflection;
 
 namespace TrueCraft.Core.Test.World
 {
@@ -15,7 +17,8 @@ namespace TrueCraft.Core.Test.World
         [TestFixtureSetUp]
         public void SetUp()
         {
-            var file = new NbtFile("Files/TestChunk.nbt");
+            var assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            var file = new NbtFile(Path.Combine(assemblyDir, "Files", "TestChunk.nbt"));
             Chunk = Chunk.FromNbt(file);
         }
 
diff --git a/TrueCraft.Core.Test/World/RegionTest.cs b/TrueCraft.Core.Test/World/RegionTest.cs
index 5ff2d23..6e4a266 100644
--- a/TrueCraft.Core.Test/World/RegionTest.cs
+++ b/TrueCraft.Core.Test/World/RegionTest.cs
@@ -2,6 +2,8 @@
 using NUnit.Framework;
 using TrueCraft.Core.World;
 using TrueCraft.API;
+using System.IO;
+using System.Reflection;
 
 namespace TrueCraft.Core.Test.World
 {
@@ -14,7 +16,9 @@ namespace TrueCraft.Core.Test.World
         public void SetUp()
         {
             var world = new TrueCraft.Core.World.World();
-            Region = new Region(Coordinates2D.Zero, world, "Files/r.0.0.mca");
+            var assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            Region = new Region(Coordinates2D.Zero, world,
+                Path.Combine(assemblyDir, "Files", "r.0.0.mca"));
         }
 
         [Test]
diff --git a/TrueCraft.Core.Test/World/WorldTest.cs b/TrueCraft.Core.Test/World/WorldTest.cs
index fde6984..7459116 100644
--- a/TrueCraft.Core.Test/World/WorldTest.cs
+++ b/TrueCraft.Core.Test/World/WorldTest.cs
@@ -4,6 +4,8 @@ using NUnit.Framework;
 using TrueCraft.API;
 using TrueCraft.Core.TerrainGen;
 using TrueCraft.API.World;
+using System.IO;
+using System.Reflection;
 
 namespace TrueCraft.Core.Test.World
 {
@@ -15,7 +17,8 @@ namespace TrueCraft.Core.Test.World
         [TestFixtureSetUp]
         public void SetUp()
         {
-            World = TrueCraft.Core.World.World.LoadWorld("Files");
+            var assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            World = TrueCraft.Core.World.World.LoadWorld(Path.Combine(assemblyDir, "Files"));
         }
 
         [Test]
diff --git a/TrueCraft.Core.Test/packages.config b/TrueCraft.Core.Test/packages.config
index 1c35356..c7f51e9 100644
--- a/TrueCraft.Core.Test/packages.config
+++ b/TrueCraft.Core.Test/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
-  <package id="NUnit" version="3.2.1" targetFramework="net45" />
+  <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
+  <package id="Moq" version="4.5.10" targetFramework="net45" />
+  <package id="NUnit" version="3.4.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TrueCraft.Core/TrueCraft.Core.csproj b/TrueCraft.Core/TrueCraft.Core.csproj
index bd3b124..7624b1b 100644
--- a/TrueCraft.Core/TrueCraft.Core.csproj
+++ b/TrueCraft.Core/TrueCraft.Core.csproj
@@ -41,7 +41,7 @@
       <HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TrueCraft.Core/packages.config b/TrueCraft.Core/packages.config
index 583acbd..e1fae9c 100644
--- a/TrueCraft.Core/packages.config
+++ b/TrueCraft.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj
index eab8820..72ec1dc 100644
--- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj
+++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj
@@ -38,7 +38,7 @@
       <HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -94,7 +94,6 @@
     <None Include="truecraft">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
     <None Include="..\lib\Xwt.Gtk3.dll">
       <Link>Xwt.Gtk3.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -111,6 +110,7 @@
       <Link>Xwt.WPF.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Content\truecraft-logo.png" />
diff --git a/TrueCraft.Launcher/packages.config b/TrueCraft.Launcher/packages.config
index 583acbd..e1fae9c 100644
--- a/TrueCraft.Launcher/packages.config
+++ b/TrueCraft.Launcher/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TrueCraft/TrueCraft.csproj b/TrueCraft/TrueCraft.csproj
index e7a5667..ec209eb 100644
--- a/TrueCraft/TrueCraft.csproj
+++ b/TrueCraft/TrueCraft.csproj
@@ -38,7 +38,7 @@
       <HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
     <Reference Include="YamlDotNet">
-      <HintPath>..\packages\YamlDotNet.3.8.0\lib\net35\YamlDotNet.dll</HintPath>
+      <HintPath>..\packages\YamlDotNet.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TrueCraft/packages.config b/TrueCraft/packages.config
index 83349ab..f61df4d 100644
--- a/TrueCraft/packages.config
+++ b/TrueCraft/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="YamlDotNet" version="3.8.0" targetFramework="net45" />
+  <package id="YamlDotNet" version="3.9.0" targetFramework="net45" />
 </packages>
\ No newline at end of file