From 20d2ce199dc815763d226abd916cf8548550047f Mon Sep 17 00:00:00 2001
From: "OPTIMUS-PRIME\\craig" <craig@craigoates.net>
Date: Sat, 16 Jun 2018 22:26:00 +0100
Subject: [PATCH] Refactored the unit tests. Should be more readable in the
 test runner and the code itself.

---
 TestCentre/TestCentre.fsproj                  |  4 +-
 TestCentre/TestingConstants.fs                | 10 +++++
 .../console-waterworks-announcement.txt       |  0
 .../desktop-clock-info.txt                    |  0
 .../word-generator.txt                        |  0
 TestCentre/UnitTests.fs                       | 41 ++++++++++++-------
 6 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 TestCentre/TestingConstants.fs
 rename TestCentre/{txt Files => TextFiles}/console-waterworks-announcement.txt (100%)
 rename TestCentre/{txt Files => TextFiles}/desktop-clock-info.txt (100%)
 rename TestCentre/{txt Files => TextFiles}/word-generator.txt (100%)

diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj
index e08bf1b..dce0da2 100644
--- a/TestCentre/TestCentre.fsproj
+++ b/TestCentre/TestCentre.fsproj
@@ -55,10 +55,12 @@
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
   <ItemGroup>
-    <Content Include="txt Files\desktop-clock-info.txt" />
+    <Content Include="TextFiles\desktop-clock-info.txt" />
     <Content Include="txt Files\console-waterworks-announcement.txt" />
     <Content Include="txt Files\word-generator.txt" />
+    <Content Include="TextFiles\console-waterworks-announcement.txt" />
     <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="TestingConstants.fs" />
     <Compile Include="UnitTests.fs" />
     <None Include="Script.fsx" />
     <Content Include="packages.config" />
diff --git a/TestCentre/TestingConstants.fs b/TestCentre/TestingConstants.fs
new file mode 100644
index 0000000..3d8123e
--- /dev/null
+++ b/TestCentre/TestingConstants.fs
@@ -0,0 +1,10 @@
+module TestingConstants
+
+[<Literal>]
+let DesktopClock = __SOURCE_DIRECTORY__ + @"\TextFiles\desktop-clock-info.txt"
+
+[<Literal>]
+let ConsoleWaterworks = __SOURCE_DIRECTORY__ +  @"\TextFiles\console-waterworks-announcement.txt"
+
+[<Literal>]
+let WordGenerator = __SOURCE_DIRECTORY__ +  @"\TextFiles\word-generator.txt"
diff --git a/TestCentre/txt Files/console-waterworks-announcement.txt b/TestCentre/TextFiles/console-waterworks-announcement.txt
similarity index 100%
rename from TestCentre/txt Files/console-waterworks-announcement.txt
rename to TestCentre/TextFiles/console-waterworks-announcement.txt
diff --git a/TestCentre/txt Files/desktop-clock-info.txt b/TestCentre/TextFiles/desktop-clock-info.txt
similarity index 100%
rename from TestCentre/txt Files/desktop-clock-info.txt
rename to TestCentre/TextFiles/desktop-clock-info.txt
diff --git a/TestCentre/txt Files/word-generator.txt b/TestCentre/TextFiles/word-generator.txt
similarity index 100%
rename from TestCentre/txt Files/word-generator.txt
rename to TestCentre/TextFiles/word-generator.txt
diff --git a/TestCentre/UnitTests.fs b/TestCentre/UnitTests.fs
index 8c830d8..2a09ef5 100644
--- a/TestCentre/UnitTests.fs
+++ b/TestCentre/UnitTests.fs
@@ -1,21 +1,32 @@
 namespace TestCentre
 
-open Xunit
-open WetPancake
+    module ``Unit Tests`` = 
 
-module UnitTests =
+        open Xunit
+        open WetPancake
+        open TestingConstants
 
-    [<Fact>]
-    let ``Request Random Text does not generate a null`` () =
-        let result = Pancake.RequestRandomText
-        Assert.NotNull result
+        [<Fact>]
+        let ``Request Random Text does not generate a null`` () =
+            let result = Pancake.RequestRandomText
+            Assert.NotNull result
 
-    [<Fact>]
-    let ``Request Text does not generate a null`` () =
-        let result = Pancake.RequestText 5 5
-        Assert.NotNull result
+        [<Fact>]
+        let ``Request Text does not generate a null`` () =
+            let result = Pancake.RequestText 5 5
+            Assert.NotNull result
 
-    [<Fact>]
-    let ``Request Text From File does not generate a null`` () =
-        let result = Pancake.RequestTextFromFile 5 5 (__SOURCE_DIRECTORY__ + "\\txt Files\\word-generator.txt")
-        Assert.NotNull result
\ No newline at end of file
+        [<Fact>]
+        let ``Request Text From File does not generate a null for desktop-clock-info.txt`` () =
+            let result = Pancake.RequestTextFromFile 5 5 DesktopClock
+            Assert.NotNull result
+
+        [<Fact>]
+        let ``Request Text From File does not generate a null for console-waterworks-announcement.txt`` () =
+            let result = Pancake.RequestTextFromFile 5 5 ConsoleWaterworks
+            Assert.NotNull result
+
+        [<Fact>]
+        let ``Request Text From File does not generate a null for word-generator.txt`` () =
+            let result = Pancake.RequestTextFromFile 5 5 WordGenerator
+            Assert.NotNull result
\ No newline at end of file