trackler 2.2.1.134 → 2.2.1.135

data/tracks/fsharp/generators/Exercise.fs

@@ -17,58 +17,26 @@ let private exerciseNameFromType (exerciseType: Type) = exerciseType.Name.Kebabe
 [<AbstractClass>]
 type GeneratorExercise() =
 
-    // Allow changes in canonical data
-    abstract member MapCanonicalData : CanonicalData -> CanonicalData
-    abstract member MapCanonicalDataCase : CanonicalDataCase -> CanonicalDataCase
-    abstract member MapCanonicalDataCaseInput : CanonicalDataCase * Map<string, obj> -> Map<string, obj>
-    abstract member MapCanonicalDataCaseInputProperty : CanonicalDataCase * string * obj -> obj
-    abstract member MapCanonicalDataCaseExpected : CanonicalDataCase * string * obj -> obj
-
-    // Convert canonical data to representation used when rendering
-    abstract member ToTestFile : CanonicalData -> TestFile
-    abstract member ToTestMethod : int * CanonicalDataCase -> TestMethod
-    abstract member ToTestMethodBody : CanonicalDataCase -> TestMethodBody  
-    abstract member ToTestMethodBodyAssert : CanonicalDataCase -> TestMethodBodyAssert  
-
-    // Determine the templates to use when rendering
-    abstract member TestFileTemplate : string
-    abstract member TestMethodTemplate : int * CanonicalDataCase -> string
-    abstract member TestMethodBodyTemplate : CanonicalDataCase -> string
-    abstract member TestMethodBodyAssertTemplate : CanonicalDataCase -> string
-    abstract member TestFileFormat: TestFileFormat
-
-    // Rendering of canonical data
-    abstract member Render : CanonicalData -> string
-    abstract member RenderTestMethod : int * CanonicalDataCase -> string
-    abstract member RenderTestMethodBody : CanonicalDataCase -> string
-    abstract member RenderTestMethodName : CanonicalDataCase -> string
-    abstract member RenderSetup : CanonicalData -> string
-
-    // Generic value/identifier rendering methods
-    abstract member RenderValue : CanonicalDataCase * string * obj -> string
-    abstract member RenderValueOrIdentifier: CanonicalDataCase * string * obj -> string
-    abstract member RenderValueWithoutIdentifier: CanonicalDataCase * string * obj -> string
-    abstract member RenderValueWithIdentifier: CanonicalDataCase * string * obj -> string
-    abstract member RenderIdentifier: CanonicalDataCase * string * obj -> string
-    abstract member RenderIdentifierWithTypeAnnotation: CanonicalDataCase * string * obj -> string
-
-    // Canonical-data specific rendering methods
+    // Customize rendered output
     abstract member RenderExpected : CanonicalDataCase * string * obj -> string
     abstract member RenderInput : CanonicalDataCase * string * obj -> string
     abstract member RenderArrange : CanonicalDataCase -> string list
     abstract member RenderAssert : CanonicalDataCase -> string list
     abstract member RenderSut : CanonicalDataCase -> string
-    abstract member RenderSutParameters : CanonicalDataCase -> string list
-    abstract member RenderSutParameter : CanonicalDataCase * string * obj -> string
-    abstract member RenderSutProperty : CanonicalDataCase -> string
+    abstract member RenderSetup : CanonicalData -> string
+    abstract member RenderValue : CanonicalDataCase * string * obj -> string
     
     // Utility methods to customize rendered output
-    abstract member Properties : CanonicalDataCase -> string list
+    abstract member MapCanonicalDataCase : CanonicalDataCase -> CanonicalDataCase
     abstract member PropertiesUsedAsSutParameter : CanonicalDataCase -> string list
     abstract member PropertiesWithIdentifier : CanonicalDataCase -> string list
-    abstract member IdentifierTypeAnnotation: CanonicalDataCase * string * obj -> string option
+    abstract member IdentifierTypeAnnotation: CanonicalDataCase * string * obj -> string option    
+    abstract member AdditionalNamespaces : string list    
+    abstract member AssertTemplate : CanonicalDataCase -> string    
+    abstract member TestFileFormat: TestFileFormat
+    abstract member TestMethodName : CanonicalDataCase -> string
     abstract member UseFullMethodName : CanonicalDataCase -> bool
-    abstract member AdditionalNamespaces : string list
+    abstract member SkipTestMethod : int * CanonicalDataCase -> bool
 
     member this.Name = this.GetType() |> exerciseNameFromType 
     member this.TestModuleName = this.GetType().Name.Pascalize() |> sprintf "%sTest"
@@ -88,25 +56,14 @@ type GeneratorExercise() =
 
     // Allow changes in canonical data    
 
-    default this.MapCanonicalData canonicalData = 
+    member this.MapCanonicalData canonicalData = 
         { canonicalData with Cases = List.map this.MapCanonicalDataCase canonicalData.Cases }
 
-    default this.MapCanonicalDataCase canonicalDataCase =
-        { canonicalDataCase with 
-            Input = this.MapCanonicalDataCaseInput (canonicalDataCase, canonicalDataCase.Input)
-            Expected = this.MapCanonicalDataCaseExpected (canonicalDataCase, "expected", canonicalDataCase.Expected) }
-
-    default this.MapCanonicalDataCaseInput (canonicalDataCase, properties) =
-        properties
-        |> Map.map (fun key value -> this.MapCanonicalDataCaseInputProperty (canonicalDataCase, key, value)) 
-
-    default __.MapCanonicalDataCaseInputProperty (_, _, value) = value
-
-    default __.MapCanonicalDataCaseExpected (_, _, value) = value
+    default __.MapCanonicalDataCase canonicalDataCase = canonicalDataCase
 
     // Convert canonical data to representation used when rendering
 
-    default this.ToTestFile canonicalData =
+    member this.ToTestFile canonicalData =
         let renderTestMethod i canonicalDataCase = this.RenderTestMethod(i, canonicalDataCase)
 
         { Version = canonicalData.Version              
@@ -117,37 +74,37 @@ type GeneratorExercise() =
           Methods = List.mapi renderTestMethod canonicalData.Cases
           Setup = this.RenderSetup canonicalData }
 
-    default this.ToTestMethod (index, canonicalDataCase) =
-        { Skip = index > 0
-          Name = this.RenderTestMethodName canonicalDataCase
+    member this.ToTestMethod (index, canonicalDataCase) =
+        { Skip = this.SkipTestMethod (index, canonicalDataCase)
+          Name = this.TestMethodName canonicalDataCase
           Body = this.RenderTestMethodBody canonicalDataCase }
 
-    default this.ToTestMethodBody canonicalDataCase =         
+    member this.ToTestMethodBody canonicalDataCase =         
         { Arrange = this.RenderArrange canonicalDataCase
           Assert = this.RenderAssert canonicalDataCase }
 
-    default this.ToTestMethodBodyAssert canonicalDataCase =         
+    member this.ToTestMethodBodyAssert canonicalDataCase =         
         { Sut = this.RenderValueOrIdentifier (canonicalDataCase, "sut", canonicalDataCase.Expected)
           Expected = this.RenderValueOrIdentifier (canonicalDataCase, "expected", canonicalDataCase.Expected) }
 
     // Determine the templates to use when rendering
 
-    default this.TestFileTemplate = 
+    member this.TestFileTemplate = 
         match this.TestFileFormat with
         | Module -> "TestModule"
         | Class  -> "TestClass"
     
-    default this.TestMethodTemplate (_, _) =
+    member this.TestMethodTemplate (_, _) =
         match this.TestFileFormat with
         | Module -> "TestFunction"
         | Class  -> "TestMember"
 
-    default this.TestMethodBodyTemplate _ =
+    member this.TestMethodBodyTemplate _ =
         match this.TestFileFormat with
         | Module -> "TestFunctionBody"
         | Class  -> "TestMemberBody"
 
-    default this.TestMethodBodyAssertTemplate canonicalDataCase =
+    default this.AssertTemplate canonicalDataCase =
         match canonicalDataCase.Expected with
         | :? JArray as jArray when jArray.Count = 0 && not (List.contains "expected" (this.PropertiesWithIdentifier canonicalDataCase)) -> "AssertEmpty"
         | _ -> "AssertEqual"
@@ -156,26 +113,26 @@ type GeneratorExercise() =
 
     // Rendering of canonical data
 
-    default this.Render canonicalData =
+    member this.Render canonicalData =
         canonicalData
         |> this.ToTestFile
         |> renderPartialTemplate this.TestFileTemplate
 
-    default this.RenderTestMethod (index, canonicalDataCase) = 
+    member this.RenderTestMethod (index, canonicalDataCase) = 
         let template = this.TestMethodTemplate (index, canonicalDataCase)
 
         (index, canonicalDataCase)
         |> this.ToTestMethod 
         |> renderPartialTemplate template
 
-    default this.RenderTestMethodBody canonicalDataCase = 
+    member this.RenderTestMethodBody canonicalDataCase = 
         let template = this.TestMethodBodyTemplate canonicalDataCase
 
         canonicalDataCase
         |> this.ToTestMethodBody
         |> renderPartialTemplate template
 
-    default this.RenderTestMethodName canonicalDataCase = 
+    default this.TestMethodName canonicalDataCase = 
         match this.UseFullMethodName canonicalDataCase with
         | false ->
             String.upperCaseFirst canonicalDataCase.Description
@@ -190,27 +147,27 @@ type GeneratorExercise() =
 
     default __.RenderValue (_, _, value) = formatValue value
 
-    default this.RenderValueOrIdentifier (canonicalDataCase, key, value) =
+    member this.RenderValueOrIdentifier (canonicalDataCase, key, value) =
         let properties = this.PropertiesWithIdentifier canonicalDataCase
 
         match List.contains key properties with
         | true  -> this.RenderIdentifier (canonicalDataCase, key, value)
         | false -> this.RenderValueWithoutIdentifier (canonicalDataCase, key, value)
 
-    default this.RenderValueWithoutIdentifier (canonicalDataCase, key, value) = 
+    member this.RenderValueWithoutIdentifier (canonicalDataCase, key, value) = 
         match key with
         | "expected" -> this.RenderExpected (canonicalDataCase, key, value)
         | "sut" -> this.RenderSut canonicalDataCase
         | _  -> this.RenderInput (canonicalDataCase, key, value)
 
-    default this.RenderValueWithIdentifier (canonicalDataCase, key, value) = 
+    member this.RenderValueWithIdentifier (canonicalDataCase, key, value) = 
         let identifier = this.RenderIdentifierWithTypeAnnotation (canonicalDataCase, key, value)
         let value = this.RenderValueWithoutIdentifier (canonicalDataCase, key, value)
         sprintf "let %s = %s" identifier value  
 
-    default __.RenderIdentifier (_, key, _) = String.camelize key
+    member __.RenderIdentifier (_, key, _) = String.camelize key
 
-    default this.RenderIdentifierWithTypeAnnotation (canonicalDataCase, key, value) = 
+    member this.RenderIdentifierWithTypeAnnotation (canonicalDataCase, key, value) = 
         let identifier = this.RenderIdentifier (canonicalDataCase, key, value)
     
         match this.IdentifierTypeAnnotation (canonicalDataCase, key, value) with
@@ -248,31 +205,31 @@ type GeneratorExercise() =
         |> List.choose renderArrangeProperty
 
     default this.RenderAssert canonicalDataCase = 
-        let template = this.TestMethodBodyAssertTemplate canonicalDataCase                
+        let template = this.AssertTemplate canonicalDataCase                
 
         canonicalDataCase
         |> this.ToTestMethodBodyAssert
         |> renderPartialTemplate template
         |> List.singleton
 
-    default this.RenderSut canonicalDataCase = 
+    default this.RenderSut canonicalDataCase =
         let parameters = this.RenderSutParameters canonicalDataCase
         let prop = this.RenderSutProperty canonicalDataCase
         prop :: parameters |> String.concat " "
 
-    default this.RenderSutParameters canonicalDataCase =
+    member this.RenderSutParameters canonicalDataCase =
         let sutParameterProperties = this.PropertiesUsedAsSutParameter canonicalDataCase
         let renderSutParameter key = this.RenderSutParameter (canonicalDataCase, key, Map.find key canonicalDataCase.Input)
 
         sutParameterProperties
         |> List.map renderSutParameter
     
-    default this.RenderSutParameter (canonicalDataCase, key, value) =
+    member this.RenderSutParameter (canonicalDataCase, key, value) =
         this.RenderValueOrIdentifier (canonicalDataCase, key, value) 
 
-    default __.RenderSutProperty canonicalDataCase = string canonicalDataCase.Property
+    member __.RenderSutProperty canonicalDataCase = string canonicalDataCase.Property
 
-    default this.Properties canonicalDataCase =
+    member this.Properties canonicalDataCase =
         List.append (this.PropertiesUsedAsSutParameter canonicalDataCase) ["expected"]
 
     default __.PropertiesUsedAsSutParameter canonicalDataCase = 
@@ -289,6 +246,8 @@ type GeneratorExercise() =
     default __.UseFullMethodName _ = false
 
     default __.AdditionalNamespaces = []
+
+    default __.SkipTestMethod (index, _) = index > 0
     
 type CustomExercise() =
 

data/tracks/fsharp/generators/Generators.fs

@@ -106,7 +106,7 @@ type BinarySearch() =
 
     override __.PropertiesWithIdentifier _ = ["array"; "value"; "expected"]
 
-    override __.RenderValueWithoutIdentifier (canonicalDataCase, key, value) =
+    override __.RenderValue (canonicalDataCase, key, value) =
         match key with
         | "array" -> 
             (value :?> JToken).ToObject<string []>() |> formatArray
@@ -115,7 +115,7 @@ type BinarySearch() =
             | "-1" -> None |> formatOption
             | x -> Some x |> formatOption
         | _ ->
-            base.RenderValueWithoutIdentifier (canonicalDataCase, key, value)
+            base.RenderValue (canonicalDataCase, key, value)
 
 type BinarySearchTree() =
     inherit GeneratorExercise()
@@ -281,21 +281,21 @@ type CircularBuffer() =
 type Clock() =
     inherit GeneratorExercise()
 
-    let createClock (value:obj) clockId =
+    let createClock (value:obj) =
         let clock = value :?> JObject
         let hour = clock.["hour"].ToObject<string>()
         let minute = clock.["minute"].ToObject<string>()
-        sprintf "let %s = create %s %s" clockId hour minute
+        sprintf "create %s %s" hour minute
 
     member private this.RenderPropertyValue canonicalDataCase property =
         this.RenderSutParameter (canonicalDataCase, property, Map.find property canonicalDataCase.Input)
 
     override __.PropertiesWithIdentifier _ = ["clock1"; "clock2"]
 
-    override __.RenderValueWithIdentifier (canonicalDataCase, key, value) =
+    override __.RenderValue (canonicalDataCase, key, value) =
         match key with
-        | "clock1" | "clock2" -> createClock value key
-        | _ -> base.RenderValueWithIdentifier (canonicalDataCase, key, value)
+        | "clock1" | "clock2" -> createClock value
+        | _ -> base.RenderValue (canonicalDataCase, key, value)
     
     override this.RenderArrange canonicalDataCase =
         match canonicalDataCase.Property with
@@ -396,7 +396,7 @@ type CustomSet() =
 
     member __.SutName = "actual"
 
-    override __.TestMethodBodyAssertTemplate _ = "AssertEqual"
+    override __.AssertTemplate _ = "AssertEqual"
 
     member __.RenderSet (jToken: obj) =
         (jToken :?> JToken).ToObject<seq<string>>()
@@ -492,8 +492,8 @@ type Etl() =
 
     override this.RenderExpected (_, _, value) = this.FormatMap<char, int> value
 
-    override __.MapCanonicalDataCaseInput (canonicalDataCase, _) = 
-        Map.empty |> Map.add "lettersByScore" (canonicalDataCase.Properties.["input"])
+    override __.MapCanonicalDataCase canonicalDataCase = 
+        { canonicalDataCase with Input = Map.empty |> Map.add "lettersByScore" (canonicalDataCase.Properties.["input"]) }
 
     override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
 
@@ -586,10 +586,10 @@ type GoCounting() =
         |> Map.remove "y"
         |> Map.add "position" (territoryPosition input)
 
-    override __.MapCanonicalDataCaseInput (canonicalDataCase, input) =
+    override __.MapCanonicalDataCase canonicalDataCase =
         match canonicalDataCase.Property with
-        | "territory" -> mapTerritoryInput input
-        | _ -> base.MapCanonicalDataCaseInput(canonicalDataCase, input)
+        | "territory" -> { canonicalDataCase with Input = mapTerritoryInput canonicalDataCase.Input }
+        | _ -> canonicalDataCase
 
     override __.RenderInput (canonicalDataCase, key, value) =
         match key with
@@ -736,7 +736,7 @@ type ListOps() =
         | "function" -> renderFunction value
         | _ -> base.RenderInput (canonicalDataCase, key, value)
 
-    override __.RenderTestMethodName canonicalDataCase =
+    override __.TestMethodName canonicalDataCase =
         sprintf "%s %s" canonicalDataCase.Property canonicalDataCase.Description
 
 type Luhn() =
@@ -745,8 +745,7 @@ type Luhn() =
 type Markdown() =
     inherit GeneratorExercise()
 
-    override __.ToTestMethod (index, canonicalDataCase) =
-        { base.ToTestMethod (index, canonicalDataCase) with Skip = false }
+    override __.SkipTestMethod (_, _) = false
 
     override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
 
@@ -901,7 +900,7 @@ type PascalsTriangle() =
             | false -> None    
         | _ -> base.IdentifierTypeAnnotation (canonicalDataCase, key, value)       
 
-    override __.TestMethodBodyAssertTemplate _ = "AssertEqual"
+    override __.AssertTemplate _ = "AssertEqual"
     
 type PerfectNumbers() =
     inherit GeneratorExercise()
@@ -1044,10 +1043,10 @@ type Proverb() =
 type QueenAttack() =
     inherit GeneratorExercise()
 
-    override __.MapCanonicalDataCaseExpected (canonicalDataCase, key, value) =
+    override __.RenderExpected (canonicalDataCase, key, value) =
         match canonicalDataCase.Property with
-        | "create" -> value :?> int64 <> -1L |> box
-        | _ -> base.MapCanonicalDataCaseInputProperty (canonicalDataCase, key, value)
+        | "create" -> value :?> int64 <> -1L |> formatValue
+        | _ -> base.RenderExpected (canonicalDataCase, key, value)
 
     override __.RenderInput (canonicalDataCase, key, value) =
         let parsePositionTuple (tupleValue: obj) =
@@ -1078,10 +1077,10 @@ type RationalNumbers() =
         | :? JArray as jArray -> sprintf "(create %d %d)" (jArray.[0].Value<int>()) (jArray.[1].Value<int>())
         | _ -> base.RenderValue (canonicalDataCase, key, value)
 
-    override __.TestMethodBodyAssertTemplate canonicalDataCase =
+    override __.AssertTemplate canonicalDataCase =
         match canonicalDataCase.Expected with
         | :? double -> "AssertEqualWithin"
-        | _ -> base.TestMethodBodyAssertTemplate(canonicalDataCase)
+        | _ -> base.AssertTemplate(canonicalDataCase)
 
 type React() = 
     inherit GeneratorExercise()
@@ -1208,13 +1207,17 @@ type RobotSimulator() =
         | Some _, Some _ -> ["expected"]
         | None,   None   -> ["sut"; "expected"]
 
-    override __.ToTestMethodBodyAssert canonicalDataCase =
-        let testMethodBodyAssert = base.ToTestMethodBodyAssert(canonicalDataCase)
+    override this.RenderAssert canonicalDataCase = 
+        let renderAssertWithProperty prop =
+            let expected = this.RenderExpected (canonicalDataCase, "expected", canonicalDataCase.Expected)
+
+            { Sut = sprintf "sut.%s" prop; Expected = expected }
+            |> renderPartialTemplate "AssertEqual"
 
         match parseInput canonicalDataCase.Expected with
-        | None, Some _ -> { testMethodBodyAssert with Sut = sprintf "%s.position" testMethodBodyAssert.Sut }
-        | Some _, None -> { testMethodBodyAssert with Sut = sprintf "%s.direction" testMethodBodyAssert.Sut }
-        | _ -> testMethodBodyAssert
+        | None, Some _ -> [renderAssertWithProperty "position"]
+        | Some _, None -> [renderAssertWithProperty "direction"]
+        | _ -> base.RenderAssert canonicalDataCase
 
     override __.RenderArrange canonicalDataCase =
         sprintf "let robot = %s" (canonicalDataCase.Properties.["input"] |> parseInput |> renderInput) :: base.RenderArrange canonicalDataCase
@@ -1229,8 +1232,8 @@ type RobotSimulator() =
         | "instructions" -> sprintf "instructions %s robot" (formatValue canonicalDataCase.Input.["instructions"])
         | _ -> base.RenderSut canonicalDataCase
 
-    override __.RenderTestMethodName canonicalDataCase =
-        let testMethodName = base.RenderTestMethodName canonicalDataCase
+    override __.TestMethodName canonicalDataCase =
+        let testMethodName = base.TestMethodName canonicalDataCase
 
         match canonicalDataCase.Property with
         | "create" | "instructions" -> testMethodName
@@ -1256,10 +1259,10 @@ type RunLengthEncoding() =
         | _ -> 
             base.RenderSut canonicalDataCase
 
-    override __.RenderTestMethodName canonicalDataCase =
+    override __.TestMethodName canonicalDataCase =
         match canonicalDataCase.Property with
         | "consistency" -> 
-            base.RenderTestMethodName canonicalDataCase
+            base.TestMethodName canonicalDataCase
         | _ -> 
             sprintf "%s %s" canonicalDataCase.Property canonicalDataCase.Description |> String.upperCaseFirst
 
@@ -1299,11 +1302,11 @@ type Say() =
 type ScaleGenerator() =
     inherit GeneratorExercise()
 
-    override __.MapCanonicalDataCaseInput (canonicalDataCase, properties) =
-        let input = base.MapCanonicalDataCaseInput (canonicalDataCase, properties)
+    override __.MapCanonicalDataCase canonicalDataCase =
+        let input = canonicalDataCase.Input
         match Map.tryFind "intervals" input with
-        | Some _ -> input
-        | None   -> Map.add "intervals" null input
+        | Some _ -> canonicalDataCase
+        | None   -> { canonicalDataCase with Input = Map.add "intervals" null input }
 
     override __.RenderInput (canonicalDataCase, key, value) =
         match key with 
@@ -1407,9 +1410,9 @@ type Triangle() =
         canonicalDataCase.Description.Contains "isosceles" ||
         canonicalDataCase.Description.Contains "scalene"
 
-    override __.RenderTestMethodName canonicalDataCase =
+    override __.TestMethodName canonicalDataCase =
         match hasUniqueTestMethodName canonicalDataCase with
-        | true  -> base.RenderTestMethodName canonicalDataCase
+        | true  -> base.TestMethodName canonicalDataCase
         | false -> sprintf "%s returns %s" (String.upperCaseFirst canonicalDataCase.Property) canonicalDataCase.Description
 
     override __.RenderInput (_, _, value) =
@@ -1640,6 +1643,5 @@ type Zipper() =
         let expected = canonicalDataCase.Expected :?> JObject |> renderExpected
         [tree; sut; expected]
 
-    override __.RenderTestMethodName canonicalDataCase = 
-        let testMethodName = base.RenderTestMethodName canonicalDataCase
-        testMethodName.Replace("Set_", "Set ")
+    override __.TestMethodName canonicalDataCase = 
+        base.TestMethodName canonicalDataCase |> String.replace "Set_" "Set "