trackler 2.2.1.102 → 2.2.1.103

data/tracks/fsharp/exercises/proverb/ProverbTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module ProverbTest
 
@@ -9,36 +9,36 @@ open Proverb
 
 [<Fact>]
 let ``Zero pieces`` () =
-    let input: string list = []
+    let strings: string list = []
     let expected: string list = []
-    recite input |> should equal expected
+    recite strings |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``One piece`` () =
-    let input = ["nail"]
+    let strings = ["nail"]
     let expected = ["And all for the want of a nail."]
-    recite input |> should equal expected
+    recite strings |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Two pieces`` () =
-    let input = ["nail"; "shoe"]
+    let strings = ["nail"; "shoe"]
     let expected = 
         [ "For want of a nail the shoe was lost.";
           "And all for the want of a nail." ]
-    recite input |> should equal expected
+    recite strings |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Three pieces`` () =
-    let input = ["nail"; "shoe"; "horse"]
+    let strings = ["nail"; "shoe"; "horse"]
     let expected = 
         [ "For want of a nail the shoe was lost.";
           "For want of a shoe the horse was lost.";
           "And all for the want of a nail." ]
-    recite input |> should equal expected
+    recite strings |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Full proverb`` () =
-    let input = ["nail"; "shoe"; "horse"; "rider"; "message"; "battle"; "kingdom"]
+    let strings = ["nail"; "shoe"; "horse"; "rider"; "message"; "battle"; "kingdom"]
     let expected = 
         [ "For want of a nail the shoe was lost.";
           "For want of a shoe the horse was lost.";
@@ -47,15 +47,15 @@ let ``Full proverb`` () =
           "For want of a message the battle was lost.";
           "For want of a battle the kingdom was lost.";
           "And all for the want of a nail." ]
-    recite input |> should equal expected
+    recite strings |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Four pieces modernized`` () =
-    let input = ["pin"; "gun"; "soldier"; "battle"]
+    let strings = ["pin"; "gun"; "soldier"; "battle"]
     let expected = 
         [ "For want of a pin the gun was lost.";
           "For want of a gun the soldier was lost.";
           "For want of a soldier the battle was lost.";
           "And all for the want of a pin." ]
-    recite input |> should equal expected
+    recite strings |> should equal expected
 

data/tracks/fsharp/exercises/queen-attack/QueenAttackTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 2.0.0 of the canonical data.
+// This file was auto-generated based on version 2.1.0 of the canonical data.
 
 module QueenAttackTest
 

data/tracks/fsharp/exercises/rail-fence-cipher/RailFenceCipherTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.1 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module RailFenceCipherTest
 

data/tracks/fsharp/exercises/raindrops/RaindropsTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module RaindropsTest
 

data/tracks/fsharp/exercises/rectangles/RectanglesTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module RectanglesTest
 
@@ -9,109 +9,109 @@ open Rectangles
 
 [<Fact>]
 let ``No rows`` () =
-    let input = []
-    rectangles input |> should equal 0
+    let strings = []
+    rectangles strings |> should equal 0
 
 [<Fact(Skip = "Remove to run test")>]
 let ``No columns`` () =
-    let input = [""]
-    rectangles input |> should equal 0
+    let strings = [""]
+    rectangles strings |> should equal 0
 
 [<Fact(Skip = "Remove to run test")>]
 let ``No rectangles`` () =
-    let input = [" "]
-    rectangles input |> should equal 0
+    let strings = [" "]
+    rectangles strings |> should equal 0
 
 [<Fact(Skip = "Remove to run test")>]
 let ``One rectangle`` () =
-    let input = 
-      [ "+-+"; 
-        "| |"; 
-        "+-+" ]
-    rectangles input |> should equal 1
+    let strings = 
+        [ "+-+";
+          "| |";
+          "+-+" ]
+    rectangles strings |> should equal 1
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Two rectangles without shared parts`` () =
-    let input = 
-      [ "  +-+"; 
-        "  | |"; 
-        "+-+-+"; 
-        "| |  "; 
-        "+-+  " ]
-    rectangles input |> should equal 2
+    let strings = 
+        [ "  +-+";
+          "  | |";
+          "+-+-+";
+          "| |  ";
+          "+-+  " ]
+    rectangles strings |> should equal 2
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Five rectangles with shared parts`` () =
-    let input = 
-      [ "  +-+"; 
-        "  | |"; 
-        "+-+-+"; 
-        "| | |"; 
-        "+-+-+" ]
-    rectangles input |> should equal 5
+    let strings = 
+        [ "  +-+";
+          "  | |";
+          "+-+-+";
+          "| | |";
+          "+-+-+" ]
+    rectangles strings |> should equal 5
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Rectangle of height 1 is counted`` () =
-    let input = 
-      [ "+--+"; 
-        "+--+" ]
-    rectangles input |> should equal 1
+    let strings = 
+        [ "+--+";
+          "+--+" ]
+    rectangles strings |> should equal 1
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Rectangle of width 1 is counted`` () =
-    let input = 
-      [ "++"; 
-        "||"; 
-        "++" ]
-    rectangles input |> should equal 1
+    let strings = 
+        [ "++";
+          "||";
+          "++" ]
+    rectangles strings |> should equal 1
 
 [<Fact(Skip = "Remove to run test")>]
 let ``1x1 square is counted`` () =
-    let input = 
-      [ "++"; 
-        "++" ]
-    rectangles input |> should equal 1
+    let strings = 
+        [ "++";
+          "++" ]
+    rectangles strings |> should equal 1
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Only complete rectangles are counted`` () =
-    let input = 
-      [ "  +-+"; 
-        "    |"; 
-        "+-+-+"; 
-        "| | -"; 
-        "+-+-+" ]
-    rectangles input |> should equal 1
+    let strings = 
+        [ "  +-+";
+          "    |";
+          "+-+-+";
+          "| | -";
+          "+-+-+" ]
+    rectangles strings |> should equal 1
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Rectangles can be of different sizes`` () =
-    let input = 
-      [ "+------+----+"; 
-        "|      |    |"; 
-        "+---+--+    |"; 
-        "|   |       |"; 
-        "+---+-------+" ]
-    rectangles input |> should equal 3
+    let strings = 
+        [ "+------+----+";
+          "|      |    |";
+          "+---+--+    |";
+          "|   |       |";
+          "+---+-------+" ]
+    rectangles strings |> should equal 3
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Corner is required for a rectangle to be complete`` () =
-    let input = 
-      [ "+------+----+"; 
-        "|      |    |"; 
-        "+------+    |"; 
-        "|   |       |"; 
-        "+---+-------+" ]
-    rectangles input |> should equal 2
+    let strings = 
+        [ "+------+----+";
+          "|      |    |";
+          "+------+    |";
+          "|   |       |";
+          "+---+-------+" ]
+    rectangles strings |> should equal 2
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Large input with many rectangles`` () =
-    let input = 
-      [ "+---+--+----+"; 
-        "|   +--+----+"; 
-        "+---+--+    |"; 
-        "|   +--+----+"; 
-        "+---+--+--+-+"; 
-        "+---+--+--+-+"; 
-        "+------+  | |"; 
-        "          +-+" ]
-    rectangles input |> should equal 60
+    let strings = 
+        [ "+---+--+----+";
+          "|   +--+----+";
+          "+---+--+    |";
+          "|   +--+----+";
+          "+---+--+--+-+";
+          "+---+--+--+-+";
+          "+------+  | |";
+          "          +-+" ]
+    rectangles strings |> should equal 60
 

data/tracks/fsharp/exercises/reverse-string/ReverseStringTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.1 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module ReverseStringTest
 

data/tracks/fsharp/exercises/robot-simulator/RobotSimulatorTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 2.0.0 of the canonical data.
+// This file was auto-generated based on version 2.2.0 of the canonical data.
 
 module RobotSimulatorTest
 

data/tracks/fsharp/exercises/roman-numerals/RomanNumeralsTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.1.0 of the canonical data.
+// This file was auto-generated based on version 1.2.0 of the canonical data.
 
 module RomanNumeralsTest
 
@@ -43,6 +43,10 @@ let ``20 is two X's`` () =
 let ``48 is not 50 - 2 but rather 40 + 8`` () =
     roman 48 |> should equal "XLVIII"
 
+[<Fact(Skip = "Remove to run test")>]
+let ``49 is not 40 + 5 + 4 but rather 50 - 10 + 10 - 1`` () =
+    roman 49 |> should equal "XLIX"
+
 [<Fact(Skip = "Remove to run test")>]
 let ``50 is a single L`` () =
     roman 59 |> should equal "LIX"

data/tracks/fsharp/exercises/run-length-encoding/RunLengthEncodingTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.0.0 of the canonical data.
+// This file was auto-generated based on version 1.1.0 of the canonical data.
 
 module RunLengthEncodingTest
 

data/tracks/fsharp/exercises/word-count/Example.fs

@@ -2,7 +2,7 @@
 
 open System.Text.RegularExpressions
 
-let countwords (phrase: string) = 
+let countWords (phrase: string) = 
     Regex.Matches(phrase.ToLowerInvariant(), @"\w+('\w+)*") 
     |> Seq.cast<Match> 
     |> Seq.countBy (fun m -> m.Value)

data/tracks/fsharp/exercises/word-count/WordCount.fs

@@ -1,3 +1,3 @@
 module WordCount
 
-let countwords phrase = failwith "You need to implement this function."
+let countWords phrase = failwith "You need to implement this function."

data/tracks/fsharp/exercises/word-count/WordCountTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.1.0 of the canonical data.
+// This file was auto-generated based on version 1.2.0 of the canonical data.
 
 module WordCountTest
 
@@ -10,7 +10,7 @@ open WordCount
 [<Fact>]
 let ``Count one word`` () =
     let expected = [("word", 1)] |> Map.ofList
-    countwords "word" |> should equal expected
+    countWords "word" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Count one of each word`` () =
@@ -19,7 +19,7 @@ let ``Count one of each word`` () =
           ("of", 1);
           ("each", 1) ]
         |> Map.ofList
-    countwords "one of each" |> should equal expected
+    countWords "one of each" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Multiple occurrences of a word`` () =
@@ -30,7 +30,7 @@ let ``Multiple occurrences of a word`` () =
           ("red", 1);
           ("blue", 1) ]
         |> Map.ofList
-    countwords "one fish two fish red fish blue fish" |> should equal expected
+    countWords "one fish two fish red fish blue fish" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Handles cramped lists`` () =
@@ -39,7 +39,7 @@ let ``Handles cramped lists`` () =
           ("two", 1);
           ("three", 1) ]
         |> Map.ofList
-    countwords "one,two,three" |> should equal expected
+    countWords "one,two,three" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Handles expanded lists`` () =
@@ -48,7 +48,7 @@ let ``Handles expanded lists`` () =
           ("two", 1);
           ("three", 1) ]
         |> Map.ofList
-    countwords "one,\ntwo,\nthree" |> should equal expected
+    countWords "one,\ntwo,\nthree" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Ignore punctuation`` () =
@@ -59,7 +59,7 @@ let ``Ignore punctuation`` () =
           ("java", 1);
           ("javascript", 1) ]
         |> Map.ofList
-    countwords "car: carpet as java: javascript!!&@$%^&" |> should equal expected
+    countWords "car: carpet as java: javascript!!&@$%^&" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Include numbers`` () =
@@ -68,7 +68,7 @@ let ``Include numbers`` () =
           ("1", 1);
           ("2", 1) ]
         |> Map.ofList
-    countwords "testing, 1, 2 testing" |> should equal expected
+    countWords "testing, 1, 2 testing" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Normalize case`` () =
@@ -76,7 +76,7 @@ let ``Normalize case`` () =
         [ ("go", 3);
           ("stop", 2) ]
         |> Map.ofList
-    countwords "go Go GO Stop stop" |> should equal expected
+    countWords "go Go GO Stop stop" |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``With apostrophes`` () =
@@ -87,7 +87,7 @@ let ``With apostrophes`` () =
           ("then", 1);
           ("cry", 1) ]
         |> Map.ofList
-    countwords "First: don't laugh. Then: don't cry." |> should equal expected
+    countWords "First: don't laugh. Then: don't cry." |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``With quotations`` () =
@@ -99,7 +99,7 @@ let ``With quotations`` () =
           ("large", 2);
           ("and", 1) ]
         |> Map.ofList
-    countwords "Joe can't tell between 'large' and large." |> should equal expected
+    countWords "Joe can't tell between 'large' and large." |> should equal expected
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Multiple spaces not detected as a word`` () =
@@ -107,5 +107,5 @@ let ``Multiple spaces not detected as a word`` () =
         [ ("multiple", 1);
           ("whitespaces", 1) ]
         |> Map.ofList
-    countwords " multiple   whitespaces" |> should equal expected
+    countWords " multiple   whitespaces" |> should equal expected
 

data/tracks/fsharp/generators/Generators.fs

@@ -235,7 +235,7 @@ type Clock() =
         sprintf "let %s = create %s %s" clockId hour minute
 
     member private this.RenderPropertyValue canonicalDataCase property =
-        this.RenderSutParameter (canonicalDataCase, property, Map.find property canonicalDataCase.Properties)
+        this.RenderSutParameter (canonicalDataCase, property, Map.find property canonicalDataCase.Input)
 
     override __.PropertiesWithIdentifier _ = ["clock1"; "clock2"]
 
@@ -246,7 +246,7 @@ type Clock() =
     
     override this.RenderArrange canonicalDataCase =
         match canonicalDataCase.Property with
-        | "create" | "add" -> 
+        | "create" | "add" | "subtract" -> 
             let hour = this.RenderPropertyValue canonicalDataCase "hour"
             let minute = this.RenderPropertyValue canonicalDataCase "minute"
             [sprintf "let clock = create %s %s" hour minute]
@@ -258,8 +258,11 @@ type Clock() =
         | "create" -> 
             sprintf "display clock"
         | "add" -> 
-            this.RenderPropertyValue canonicalDataCase "add"
+            this.RenderPropertyValue canonicalDataCase "value"
             |> sprintf "add %s clock |> display" 
+        | "subtract" -> 
+            this.RenderPropertyValue canonicalDataCase "value"
+            |> sprintf "subtract %s clock |> display" 
         | "equal" -> 
             "clock1 = clock2" 
         | _ -> 
@@ -732,7 +735,7 @@ type PalindromeProducts() =
         |> formatOption 
         |> parenthesizeOption
 
-    override __.PropertiesUsedAsSutParameter _ = ["input_min"; "input_max"]
+    override __.PropertiesUsedAsSutParameter _ = ["min"; "max"]
 
 type PascalsTriangle() =
     inherit GeneratorExercise()
@@ -790,7 +793,7 @@ type PigLatin() =
 type Poker() = 
     inherit GeneratorExercise()
 
-    override __.PropertiesWithIdentifier _ = ["input"; "expected"]
+    override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
 
 type Pov() = 
     inherit GeneratorExercise()
@@ -841,7 +844,6 @@ type Pov() =
         }
         |> Seq.toList
 
-
     override __.RenderSut canonicalDataCase = 
         match canonicalDataCase.Property with
         | "fromPov" -> 
@@ -890,7 +892,7 @@ type ProteinTranslation() =
 type Proverb() =
     inherit GeneratorExercise()
 
-    override __.PropertiesWithIdentifier _ = ["input"; "expected"]
+    override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
 
     override __.RenderExpected (_, _, value) =
         value :?> JArray
@@ -1010,31 +1012,13 @@ type React() =
 type Rectangles() = 
     inherit GeneratorExercise()
 
-    member private __.GetPadding n = 
-        String.replicate n " "
-
-    member private this.FormatList (list: List<string>) = 
-        let separator = "; \n" + (this.GetPadding 8)
-        let value = 
-            list 
-            |> String.concat separator
-
-        if list.Length < 2 then 
-            sprintf "[%s]" value
-        else
-            sprintf "\n%s[ %s ]" (this.GetPadding 6) value
-
-    override __.PropertiesWithIdentifier _ = ["input"]
-    override __.RenderSutProperty _ = "rectangles"
+    override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
 
-    override this.RenderValueWithoutIdentifier (canonicalDataCase, key, value) = 
-        match key with
-        | "input" ->
-            (value :?> JToken).ToObject<List<string>>() 
-            |> List.map formatString 
-            |> this.FormatList
-        | _ -> 
-            base.RenderValueWithoutIdentifier (canonicalDataCase, key, value)
+    override __.RenderInput (_, _, value) =
+        value :?> JArray
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
 
 type ReverseString() =
     inherit GeneratorExercise()
@@ -1067,10 +1051,10 @@ type RobotSimulator() =
 
     override __.PropertiesWithIdentifier canonicalDataCase =
         match parseInput canonicalDataCase.Expected with
-        | None,   Some _ -> ["robot"; "sut"] 
-        | Some _, None   -> ["robot"; "sut"]
-        | Some _, Some _ -> ["robot"; "expected"]
-        | None,   None   -> ["robot"; "sut"; "expected"]
+        | None,   Some _ -> ["sut"] 
+        | Some _, None   -> ["sut"]
+        | Some _, Some _ -> ["expected"]
+        | None,   None   -> ["sut"; "expected"]
 
     override __.ToTestMethodBodyAssert canonicalDataCase =
         let testMethodBodyAssert = base.ToTestMethodBodyAssert(canonicalDataCase)
@@ -1080,15 +1064,17 @@ type RobotSimulator() =
         | Some _, None -> { testMethodBodyAssert with Sut = sprintf "%s.direction" testMethodBodyAssert.Sut }
         | _ -> testMethodBodyAssert
 
-    override __.RenderValueWithoutIdentifier (canonicalDataCase, key, value) = 
-        match key with
-        | "robot"    -> value |> parseInput |> renderInput
-        | "expected" -> value |> parseInput |> renderInput
-        | _ -> base.RenderValueWithoutIdentifier (canonicalDataCase, key, value)
+    override __.RenderArrange canonicalDataCase =
+        sprintf "let robot = %s" (canonicalDataCase.Properties.["input"] |> parseInput |> renderInput) :: base.RenderArrange canonicalDataCase
+
+    override __.RenderExpected (_, _, value) = 
+        value |> parseInput |> renderInput
 
     override __.RenderSut canonicalDataCase = 
         match canonicalDataCase.Property with
         | "create" -> "robot"
+        | "turnLeft" | "turnRight" | "advance" -> sprintf "%s robot" canonicalDataCase.Property
+        | "instructions" -> sprintf "instructions %s robot" (formatValue canonicalDataCase.Input.["instructions"])
         | _ -> base.RenderSut canonicalDataCase
 
     override __.RenderTestMethodName canonicalDataCase =