Refactored tests.

Added new property tests.

TestCentre/PropertyTests.fs

@@ -4,21 +4,64 @@
     open global.Xunit
     open FsCheck.Xunit
     open WetPancake
+    open TestingConstants
 
     [<Property>]
-    let ``Request Random Text consistently produces a valid output`` () =
-        let ProduceResult =
-            Assert.NotNull (Pancake.RequestRandomText)
-        Check.Quick ProduceResult
+    let ``Request Random Text does not return null when using the built-in random settings`` () =
+        let test = Pancake.RequestRandomText
+        let results = Assert.NotNull test
+        Check.Quick results
 
     [<Property>]
-    let ``Request Text returns not null with fixed input`` () =
-        let ProduceResult () =
-            Assert.NotNull (Pancake.RequestText 5 5)
-        Check.Quick ProduceResult
+    let ``Request Text does not return null when using fixed input parameters`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let test = Pancake.RequestText gibberishLevel totalSentences
+        let results = Assert.NotNull test
+        Check.Quick results
 
     [<Property>]
-    let ``Request Text returns a valid output using random gibberish level`` () =
-        let ProduceResult () =
-            Assert.NotNull (Pancake.RequestText (System.Random().Next(2, 20)) 10)
-        Check.Quick ProduceResult
+    let ``Request Text does not return null when using a random gibberish level`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let test = Pancake.RequestText gibberishLevel 10
+        let results = Assert.NotNull test
+        Check.Quick results
+
+    [<Property>]
+    let ``Request Text does not return null when using a random sentence count`` () =
+        let totalSentences = System.Random().Next(2, 20)
+        let test () = Pancake.RequestText 5 totalSentences
+        let results () = Assert.NotNull test
+        Check.Quick results
+
+    [<Property>]
+    let ``Using desktop-clock-info does not return null`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let test = Pancake.RequestTextFromFile gibberishLevel totalSentences DesktopClock
+        let results = Assert.NotNull test
+        Check.Quick results
+
+    [<Property>]
+    let ``Using console-waterworks-announcement does not return null`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let test = Pancake.RequestTextFromFile gibberishLevel totalSentences ConsoleWaterworks
+        let results = Assert.NotNull test
+        Check.Quick results
+
+    [<Property>]
+    let ``Using word-generator does not return null`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let test = Pancake.RequestTextFromFile gibberishLevel totalSentences WordGenerator
+        let results = Assert.NotNull test
+        Check.Quick results
+
+    [<Property>]
+    let ``Using test-post does not return null`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let test = Pancake.RequestTextFromFile gibberishLevel totalSentences TestPost
+        let results = Assert.NotNull test
+        Check.Quick results

TestCentre/UnitTests.fs

@@ -9,51 +9,61 @@
     The Wet Pancake library does not expose the file accessfunctions so the .txt files are mirrored here (in Text Centre).
     The mirroring, also, doubles up as sample files to pass intoWet     Pancake.*)
     [<Fact>]
-    let ``desktop-clock-info-txt can be found`` () =
+    let ``desktop-clock-info can be found`` () =
         let result = File.Exists DesktopClock
         Assert.Equal(true, result);
     
     [<Fact>]
-    let ``console-waterworks-announcements-txt can be found`` () =
+    let ``console-waterworks-announcements can be found`` () =
         let result = File.Exists ConsoleWaterworks
         Assert.Equal(true, result);
     
     [<Fact>]
-    let ``word-generator-txt can be found`` () =
+    let ``word-generator can be found`` () =
         let result = File.Exists WordGenerator
         Assert.Equal(true, result);
     
     [<Fact>]
-    let ``test-post-txt can be found`` () =
+    let ``test-post can be found`` () =
         let result = File.Exists TestPost
         Assert.Equal(true, result)
     
     [<Fact>]
-    let ``Request Random Text does not generate a null`` () =
+    let ``Request Random Text does not return a null`` () =
         let result = Pancake.RequestRandomText
         Assert.NotNull result
     
     [<Fact>]
-    let ``Request Text does not generate a null`` () =
-        let result = Pancake.RequestText 5 5
+    let ``Request Text does not return a null`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let result () = Pancake.RequestText gibberishLevel totalSentences
         Assert.NotNull result
     
     [<Fact>]
-    let ``Request Text From File does not generate a null fordesktop-  clock-   info-txt`` () =
-        let result = Pancake.RequestTextFromFile 5 5 DesktopClock
+    let ``Request Text From File does not return a null for desktop-clock-info`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let result = Pancake.RequestTextFromFile gibberishLevel totalSentences DesktopClock
         Assert.NotNull result
     
     [<Fact>]
-    let ``Request Text From File does not generate a null forconsole-   waterworks-announcement-txt`` () =
-        let result = Pancake.RequestTextFromFile 5 5 ConsoleWaterworks
+    let ``Request Text From File does not return a null for console-waterworks-announcement`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let result = Pancake.RequestTextFromFile gibberishLevel totalSentences ConsoleWaterworks
         Assert.NotNull result
     
     [<Fact>]
-    let ``Request Text From File does not generate a null forword- generator-   txt`` () =
-        let result = Pancake.RequestTextFromFile 5 5 WordGenerator
+    let ``Request Text From File does not return a null for word-generator`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let result = Pancake.RequestTextFromFile gibberishLevel totalSentences WordGenerator
         Assert.NotNull result
     
     [<Fact>]
-    let ``Request Test From File does not generate a null fortest- post-txt``   () =
-        let result = Pancake.RequestTextFromFile 5 5 TestPost
+    let ``Request Test From File does not generate a null for test-post`` () =
+        let gibberishLevel = System.Random().Next(2, 20)
+        let totalSentences = System.Random().Next(2, 20)
+        let result = Pancake.RequestTextFromFile gibberishLevel totalSentences TestPost
         Assert.NotNull result