trackler 2.2.1.101 → 2.2.1.102

data/tracks/fsharp/generators/Generators.fs

@@ -609,6 +609,9 @@ type Markdown() =
         { base.ToTestMethod (index, canonicalDataCase) with Skip = false }
 
     override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
+
+type Matrix() =
+    inherit GeneratorExercise()
     
 type Meetup() =
     inherit GeneratorExercise()
@@ -1125,6 +1128,25 @@ type RunLengthEncoding() =
 type RomanNumerals() =
     inherit GeneratorExercise()
 
+type SaddlePoints() =
+    inherit GeneratorExercise()
+
+    let renderSaddlePoint (input: JObject) =
+        (input.Value<int>("row"), input.Value<int>("column")) |> formatTuple
+
+    override __.RenderInput (_, _, value) =
+        value :?> JArray
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
+    override __.RenderExpected (_, _, value) =
+        (value :?> JArray).Values<JObject>()
+        |> Seq.map renderSaddlePoint
+        |> formatList
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
+
 type Say() =
     inherit GeneratorExercise()
 
@@ -1168,9 +1190,27 @@ type SpiralMatrix() =
         |> Seq.map formatValue
         |> formatMultiLineList
 
+type Sublist() =
+    inherit GeneratorExercise()
+
+    override __.RenderExpected (_, _, value) =
+        string value |> String.upperCaseFirst
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
+
 type SumOfMultiples() =
     inherit GeneratorExercise()
 
+type Tournament() = 
+    inherit GeneratorExercise()
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
+
+    override __.RenderValue (_, _, value) =
+        value :?> JArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type TwelveDays() =
     inherit GeneratorExercise()
 
@@ -1183,6 +1223,21 @@ type TwelveDays() =
         |> Seq.map formatValue
         |> formatMultiLineList
 
+type Transpose() =
+    inherit GeneratorExercise()
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
+
+    override __.IdentifierTypeAnnotation (_, _, value) = 
+        match value :?> JArray |> Seq.isEmpty with 
+        | true  -> Some "string list"
+        | false -> None
+
+    override __.RenderValue (_, _, value) =
+        value :?> JArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type Triangle() =
     inherit GeneratorExercise()
 

data/tracks/go/exercises/clock/clock_test.go

@@ -50,7 +50,7 @@ func TestAddMinutes(t *testing.T) {
 func TestSubtractMinutes(t *testing.T) {
 	for _, a := range subtractTests {
 		if got := New(a.h, a.m).Subtract(a.a); got.String() != a.want {
-			t.Fatalf("New(%d, %d).Add(%d) = %q, want %q",
+			t.Fatalf("New(%d, %d).Subtract(%d) = %q, want %q",
 				a.h, a.m, a.a, got, a.want)
 		}
 	}

data/tracks/go/exercises/poker/.meta/gen.go

@@ -26,8 +26,10 @@ func main() {
 type js struct {
 	Cases []struct {
 		Description string
-		Input       []string
-		Expected    []string
+		Input       struct {
+			Hands []string
+		}
+		Expected []string
 	}
 }
 
@@ -68,7 +70,7 @@ var validTestCases = []validTestCase {
 {{range .J.Cases}}{
 	name:  "{{.Description}}",
 	hands: []string{
-		{{range pokerHands .Input}} {{printf "%q" .}},
+		{{range pokerHands .Input.Hands}} {{printf "%q" .}},
 {{end}} },
 	best:  {{pokerHands .Expected | printf "%#v"}},
 },

data/tracks/go/exercises/poker/cases_test.go

@@ -1,8 +1,8 @@
 package poker
 
 // Source: exercism/problem-specifications
-// Commit: d078ba8 poker: Add canonical-data (#793)
-// Problem Specifications Version: 1.0.0
+// Commit: 8e97630 poker: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 type validTestCase struct {
 	name  string

data/tracks/go/exercises/prime-factors/.meta/gen.go

@@ -30,8 +30,10 @@ type TestGroup struct {
 
 type OneCase struct {
 	Description string
-	Input       int64
-	Expected    []int64
+	Input       struct {
+		Value int64
+	}
+	Expected []int64
 }
 
 // template applied to above data structure generates the Go test cases
@@ -47,7 +49,7 @@ var tests = []struct {
 {{range .J.Groups}}
 {{range .Cases}} {
 	"{{.Description}}",
-	{{.Input}},
+	{{.Input.Value}},
 	{{printf "%#v" .Expected}},
 },
 {{end}}{{end}}}

data/tracks/go/exercises/prime-factors/cases_test.go

@@ -1,8 +1,8 @@
 package prime
 
 // Source: exercism/problem-specifications
-// Commit: bf5bb2b prime-factors: Fix canonical-data.json formatting
-// Problem Specifications Version: 1.0.0
+// Commit: d928874 prime-factors: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 var tests = []struct {
 	description string

data/tracks/go/exercises/rail-fence-cipher/.meta/gen.go

@@ -35,9 +35,11 @@ type testGroup struct {
 type oneCase struct {
 	Description string
 	Property    string
-	Message     string `json:"msg"`
-	Rails       int
-	Expected    string
+	Input       struct {
+		Message string `json:"msg"`
+		Rails   int
+	}
+	Expected string
 }
 
 // Template to generate test cases.
@@ -59,8 +61,8 @@ type testCase struct {
 			{{- range .EncodeCases }}
 
 				{ {{.Description | printf "%q"}},
-				{{.Message | printf "%q"}},
-				{{.Rails}},
+				{{.Input.Message | printf "%q"}},
+				{{.Input.Rails}},
 				{{.Expected | printf "%q"}}},
 			{{- end }}
 		}
@@ -71,8 +73,8 @@ type testCase struct {
 			{{- range .DecodeCases }}
 
 				{ {{.Description | printf "%q"}},
-				{{.Message | printf "%q"}},
-				{{.Rails}},
+				{{.Input.Message | printf "%q"}},
+				{{.Input.Rails}},
 				{{.Expected | printf "%q"}}},
 			{{- end }}
 		}

data/tracks/go/exercises/rail-fence-cipher/cases_test.go

@@ -1,8 +1,8 @@
 package railfence
 
 // Source: exercism/problem-specifications
-// Commit: c01f9ca rail-fence-cipher 1.0.1: Remove "test to" from all descriptions
-// Problem Specifications Version: 1.0.1
+// Commit: 88db37b rail-fence-cipher: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 type testCase struct {
 	description string

data/tracks/go/exercises/raindrops/.meta/gen.go

@@ -21,7 +21,9 @@ func main() {
 // The JSON structure we expect to be able to unmarshal into
 type js struct {
 	Cases []struct {
-		Number   int
+		Input struct {
+			Number int
+		}
 		Expected string
 	}
 }
@@ -35,6 +37,6 @@ var tests = []struct {
 	input    int
 	expected string
 }{
-{{range .J.Cases}}{ {{.Number}}, "{{.Expected}}"},
+{{range .J.Cases}}{ {{.Input.Number}}, "{{.Expected}}"},
 {{end}}}
 `

data/tracks/go/exercises/raindrops/cases_test.go

@@ -1,8 +1,8 @@
 package raindrops
 
 // Source: exercism/problem-specifications
-// Commit: 9db5371 raindrops: Fix canonical-data.json formatting
-// Problem Specifications Version: 1.0.0
+// Commit: 99de15d raindrops: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 var tests = []struct {
 	input    int

data/tracks/go/exercises/reverse-string/.meta/gen.go

@@ -29,8 +29,10 @@ type js struct {
 type oneCase struct {
 	Description string
 	Property    string
-	Input       string
-	Expected    string
+	Input       struct {
+		Value string
+	}
+	Expected string
 }
 
 // Template to generate test cases.
@@ -45,7 +47,7 @@ var testCases = []struct {
 }{ {{range .J.Cases}}
 {
 	description:	{{printf "%q"  .Description}},
-	input:		{{printf "%q"  .Input}},
+	input:		{{printf "%q"  .Input.Value}},
 	expected:	{{printf "%q"  .Expected}},
 },{{end}}
 }

data/tracks/go/exercises/reverse-string/cases_test.go

@@ -1,8 +1,8 @@
 package reverse
 
 // Source: exercism/problem-specifications
-// Commit: ae82c90 More consistent reverse-string canonical data
-// Problem Specifications Version: 1.0.1
+// Commit: 2f77985 reverse-string: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 var testCases = []struct {
 	description string

data/tracks/go/exercises/rna-transcription/.meta/gen.go

@@ -22,33 +22,25 @@ func main() {
 type js struct {
 	Cases []struct {
 		Description string
-		Dna         string
-		Expected    string
+		Input       struct {
+			Dna string
+		}
+		Expected string
 	}
 }
 
 // Template applied to above data structure generates the Go test cases.
-//
-// Note x-common test cases have some test cases that are not used here.
-//
-// It has some with invalid DNA inputs indicated with null expected values.
-// The current API does not have an error or ok return.  It could be changed
-// but it's simple for now, leaving the result undefined for invalid input.
-// So these test cases are skipped here.
-//
-// Also the x-common test cases include some test cases in the reverse
-// direction, from rna to dna.  These are not called for by the exercise
-// readme and have no biological basis and so are not converted here.
 var tmpl = `package strand
 
 {{.Header}}
 
 var rnaTests = []struct {
-	input    string
-	expected string
+	description string
+	input       string
+	expected    string
 }{
-{{range .J.Cases}} {{if and .Dna .Expected}} // {{.Description}}
-	{"{{.Dna}}", "{{.Expected}}"},
-
-{{end}}{{end}}}
+{{range .J.Cases}}{ "{{.Description}}",
+	"{{.Input.Dna}}", "{{.Expected}}",
+},
+{{end}}}
 `

data/tracks/go/exercises/rna-transcription/cases_test.go

@@ -1,25 +1,27 @@
 package strand
 
 // Source: exercism/problem-specifications
-// Commit: cb1fd3a rna-transcription: rephrase negative test descriptions
-// Problem Specifications Version: 1.0.1
+// Commit: b4c24e6 rna-transcription: Apply new "input" policy
+// Problem Specifications Version: 1.2.0
 
 var rnaTests = []struct {
-	input    string
-	expected string
+	description string
+	input       string
+	expected    string
 }{
-	// RNA complement of cytosine is guanine
-	{"C", "G"},
-
-	// RNA complement of guanine is cytosine
-	{"G", "C"},
-
-	// RNA complement of thymine is adenine
-	{"T", "A"},
-
-	// RNA complement of adenine is uracil
-	{"A", "U"},
-
-	// RNA complement
-	{"ACGTGGTCTTAA", "UGCACCAGAAUU"},
+	{"RNA complement of cytosine is guanine",
+		"C", "G",
+	},
+	{"RNA complement of guanine is cytosine",
+		"G", "C",
+	},
+	{"RNA complement of thymine is adenine",
+		"T", "A",
+	},
+	{"RNA complement of adenine is uracil",
+		"A", "U",
+	},
+	{"RNA complement",
+		"ACGTGGTCTTAA", "UGCACCAGAAUU",
+	},
 }

data/tracks/go/exercises/rna-transcription/rna_transcription_test.go

@@ -5,9 +5,10 @@ import "testing"
 func TestRNATranscription(t *testing.T) {
 	for _, test := range rnaTests {
 		if actual := ToRNA(test.input); actual != test.expected {
-			t.Errorf("ToRNA(%s): %s, expected %s",
-				test.input, actual, test.expected)
+			t.Fatalf("FAIL: %s - ToRNA(%q): %q, expected %q",
+				test.description, test.input, actual, test.expected)
 		}
+		t.Logf("PASS: %s", test.description)
 	}
 }
 

data/tracks/go/exercises/run-length-encoding/.meta/gen.go

@@ -29,18 +29,24 @@ type testGroup struct {
 	Cases       []json.RawMessage `property:"RAW"`
 	EncodeCases []struct {
 		Description string
-		Input       string
-		Expected    string
+		Input       struct {
+			String string
+		}
+		Expected string
 	} `property:"encode"`
 	DecodeCases []struct {
 		Description string
-		Input       string
-		Expected    string
+		Input       struct {
+			String string
+		}
+		Expected string
 	} `property:"decode"`
 	EncodeDecodeCases []struct {
 		Description string
-		Input       string
-		Expected    string
+		Input       struct {
+			String string
+		}
+		Expected string
 	} `property:"consistency"`
 }
 
@@ -58,7 +64,7 @@ var tmpl = `package encode
 			description string
 		}{
 			{{- range .EncodeCases }}
-				{ {{.Input | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
+				{ {{.Input.String | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
 			{{- end }}
 		}
 	{{- end }}
@@ -70,7 +76,7 @@ var tmpl = `package encode
 			description string
 		}{
 			{{- range .DecodeCases }}
-				{ {{.Input | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
+				{ {{.Input.String | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
 			{{- end }}
 		}
 	{{- end }}
@@ -82,7 +88,7 @@ var tmpl = `package encode
 			description string
 		}{
 			{{- range .EncodeDecodeCases }}
-				{ {{.Input | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
+				{ {{.Input.String | printf "%q"}}, {{.Expected | printf "%q"}}, {{.Description | printf "%q"}} },
 			{{- end }}
 		}
 	{{- end }}

data/tracks/go/exercises/run-length-encoding/cases_test.go

@@ -1,8 +1,8 @@
 package encode
 
 // Source: exercism/problem-specifications
-// Commit: 503a57a run-length-encoding: Fix canonical-data.json formatting
-// Problem Specifications Version: 1.0.0
+// Commit: 1b7900e run-length-encoding: apply "input" policy
+// Problem Specifications Version: 1.1.0
 
 // run-length encode a string
 var encodeTests = []struct {