Rearrange file structure and remove hardcoded test path

scorpdx · Oct 5, 2019 · c9b2ac9 · c9b2ac9
1 parent b284a0e
commit c9b2ac9
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 5 deletions.
diff --git a/Chronicler/Chronicler.sln → Chronicler.sln b/Chronicler/Chronicler.sln → Chronicler.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29319.158
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chronicler", "Chronicler.csproj", "{21E7FB31-022C-4917-A69C-5B428A67187E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chronicler", "src\Chronicler\Chronicler.csproj", "{21E7FB31-022C-4917-A69C-5B428A67187E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChroniclerTests", "..\test\ChronicleTests\ChroniclerTests.csproj", "{3577DBE9-BCF0-471A-9E74-FBFF1445D9C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChroniclerTests", "test\ChroniclerTests\ChroniclerTests.csproj", "{3577DBE9-BCF0-471A-9E74-FBFF1445D9C8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Chronicler/Chronicle.cs → src/Chronicler/Chronicle.cs b/Chronicler/Chronicle.cs → src/Chronicler/Chronicle.cs
diff --git a/Chronicler/ChronicleChapter.cs → src/Chronicler/ChronicleChapter.cs b/Chronicler/ChronicleChapter.cs → src/Chronicler/ChronicleChapter.cs
diff --git a/Chronicler/ChronicleCollection.cs → src/Chronicler/ChronicleCollection.cs b/Chronicler/ChronicleCollection.cs → src/Chronicler/ChronicleCollection.cs
diff --git a/Chronicler/ChronicleEntry.cs → src/Chronicler/ChronicleEntry.cs b/Chronicler/ChronicleEntry.cs → src/Chronicler/ChronicleEntry.cs
diff --git a/Chronicler/Chronicler.csproj → src/Chronicler/Chronicler.csproj b/Chronicler/Chronicler.csproj → src/Chronicler/Chronicler.csproj
diff --git a/...r/Converters/ChronicleChapterConverter.cs → ...r/Converters/ChronicleChapterConverter.cs b/...r/Converters/ChronicleChapterConverter.cs → ...r/Converters/ChronicleChapterConverter.cs
diff --git a/...onverters/ChronicleCollectionConverter.cs → ...onverters/ChronicleCollectionConverter.cs b/...onverters/ChronicleCollectionConverter.cs → ...onverters/ChronicleCollectionConverter.cs
diff --git a/Chronicler/Converters/ChronicleConverter.cs → ...ronicler/Converters/ChronicleConverter.cs b/Chronicler/Converters/ChronicleConverter.cs → ...ronicler/Converters/ChronicleConverter.cs
diff --git a/Chronicler/JsonElementSerializer.cs → src/Chronicler/JsonElementSerializer.cs b/Chronicler/JsonElementSerializer.cs → src/Chronicler/JsonElementSerializer.cs
diff --git a/...ChronicleTests/ChronicleCollectionTest.cs → ...hroniclerTests/ChronicleCollectionTest.cs b/...ChronicleTests/ChronicleCollectionTest.cs → ...hroniclerTests/ChronicleCollectionTest.cs
@@ -1,18 +1,21 @@
 using System;
 using System.IO;
+using System.IO.Compression;
 using System.Text.Json;
 using Xunit;
 
 namespace ChroniclerTests
 {
     public class ChronicleCollectionTest
     {
-        private static JsonDocument GetCK2Json() => JsonDocument.Parse(File.ReadAllText(@"C:\Users\scorp\Desktop\ck2kok.json"));
+        private static string CK2JsonPath => Path.Combine("resources", "Ironman_West_Francia_HaR.json");
+
+        private static readonly JsonDocument CK2Json = JsonDocument.Parse(File.ReadAllText(CK2JsonPath));
 
         [Fact]
         public void TestParseJson()
         {
-            var chronicleCollection = Chronicler.ChronicleCollection.ParseJson(GetCK2Json());
+            var chronicleCollection = Chronicler.ChronicleCollection.ParseJson(CK2Json);
             Assert.False(string.IsNullOrEmpty(chronicleCollection.Chronicles[0].Chapters[0].Entries[0].Text));
         }
     }

diff --git a/test/ChronicleTests/ChroniclerTests.csproj → test/ChroniclerTests/ChroniclerTests.csproj b/test/ChronicleTests/ChroniclerTests.csproj → test/ChroniclerTests/ChroniclerTests.csproj
@@ -14,7 +14,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Chronicler\Chronicler.csproj" />
+    <ProjectReference Include="..\..\src\Chronicler\Chronicler.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="resources\Ironman_West_Francia_HaR.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>