trackler 2.2.1.64 → 2.2.1.65

data/tracks/fsharp/generators/Generators.fsproj

@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />    
-    <PackageReference Include="DotLiquid" Version="2.0.183" />
+    <PackageReference Include="DotLiquid" Version="2.0.200" />
     <PackageReference Include="Humanizer" Version="2.2.0" />
     <PackageReference Include="LibGit2Sharp.Portable" Version="0.24.10" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />

data/tracks/go/exercises/book-store/.meta/gen.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"log"
+	"text/template"
+
+	"../../../gen"
+)
+
+func main() {
+	t, err := template.New("").Parse(tmpl)
+	if err != nil {
+		log.Fatal(err)
+	}
+	var j js
+	if err := gen.Gen("book-store", &j, t); err != nil {
+		log.Fatal(err)
+	}
+}
+
+// The JSON structure we expect to be able to unmarshal into
+type js struct {
+	Cases  []OneCase
+	Groups []TestGroup `json:"cases"`
+}
+
+type TestGroup struct {
+	Description string
+	Cases       []OneCase
+}
+
+type OneCase struct {
+	Description string
+	Basket      []int
+	Expected    float64
+}
+
+// template applied to above data structure generates the Go test cases
+var tmpl = `package bookstore
+
+{{.Header}}
+
+var testCases = []struct {
+	description string
+	basket      []int
+	expected    float64
+}{{range .J.Groups}}{
+{{range .Cases}} {
+	description: "{{.Description}}",
+	basket:      {{printf "%#v" .Basket}},
+	expected:    {{printf "%.2f" .Expected}},
+},
+{{end}}}{{end}}
+`

data/tracks/go/exercises/book-store/book_store_test.go

@@ -4,73 +4,6 @@ import (
 	"testing"
 )
 
-var testCases = []struct {
-	description string
-	basket      []int
-	expected    float64
-}{
-	{
-		description: "only a single book",
-		basket:      []int{1},
-		expected:    8.00,
-	},
-	{
-		description: "two of the same book",
-		basket:      []int{2, 2},
-		expected:    16.00,
-	},
-	{
-		description: "empty basket",
-		basket:      []int{},
-		expected:    0.00,
-	},
-	{
-		description: "two different books",
-		basket:      []int{1, 2},
-		expected:    15.20,
-	},
-	{
-		description: "four different books",
-		basket:      []int{1, 2, 3, 4},
-		expected:    25.60,
-	},
-	{
-		description: "five different books",
-		basket:      []int{1, 2, 3, 4, 5},
-		expected:    30.00,
-	},
-	{
-		description: "two groups of four is cheaper than group of five plus group of three",
-		basket:      []int{1, 1, 2, 2, 3, 3, 4, 5},
-		expected:    51.20,
-	},
-	{
-		description: "groups of four plus group of two is is cheaper than two groups of three",
-		basket:      []int{1, 1, 2, 2, 3, 4},
-		expected:    40.80,
-	},
-	{
-		description: "two each of first 4 books and 1 copy of each of rest",
-		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5},
-		expected:    55.60,
-	},
-	{
-		description: "two copies of each book",
-		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5},
-		expected:    60.00,
-	},
-	{
-		description: "three copies of first book and 2 each fo remaining",
-		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1},
-		expected:    68.00,
-	},
-	{
-		description: "three each of first 2 books and 2 each of remaining books",
-		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2},
-		expected:    75.20,
-	},
-}
-
 func TestCost(t *testing.T) {
 	for _, testCase := range testCases {
 		cost := Cost(testCase.basket)

data/tracks/go/exercises/book-store/cases_test.go

@@ -0,0 +1,77 @@
+package bookstore
+
+// Source: exercism/problem-specifications
+// Commit: 087ad69 book-store: Add missing trailing zero
+// Problem Specifications Version: 1.0.1
+
+var testCases = []struct {
+	description string
+	basket      []int
+	expected    float64
+}{
+	{
+		description: "Only a single book",
+		basket:      []int{1},
+		expected:    8.00,
+	},
+	{
+		description: "Two of the same book",
+		basket:      []int{2, 2},
+		expected:    16.00,
+	},
+	{
+		description: "Empty basket",
+		basket:      []int{},
+		expected:    0.00,
+	},
+	{
+		description: "Two different books",
+		basket:      []int{1, 2},
+		expected:    15.20,
+	},
+	{
+		description: "Three different books",
+		basket:      []int{1, 2, 3},
+		expected:    21.60,
+	},
+	{
+		description: "Four different books",
+		basket:      []int{1, 2, 3, 4},
+		expected:    25.60,
+	},
+	{
+		description: "Five different books",
+		basket:      []int{1, 2, 3, 4, 5},
+		expected:    30.00,
+	},
+	{
+		description: "Two groups of four is cheaper than group of five plus group of three",
+		basket:      []int{1, 1, 2, 2, 3, 3, 4, 5},
+		expected:    51.20,
+	},
+	{
+		description: "Group of four plus group of two is cheaper than two groups of three",
+		basket:      []int{1, 1, 2, 2, 3, 4},
+		expected:    40.80,
+	},
+	{
+		description: "Two each of first 4 books and 1 copy each of rest",
+		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5},
+		expected:    55.60,
+	},
+	{
+		description: "Two copies of each book",
+		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5},
+		expected:    60.00,
+	},
+	{
+		description: "Three copies of first book and 2 each of remaining",
+		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1},
+		expected:    68.00,
+	},
+	{
+		description: "Three each of first 2 books and 2 each of remaining books",
+		basket:      []int{1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2},
+		expected:    75.20,
+	},
+}

data/tracks/go/exercises/forth/cases_test.go

@@ -1,8 +1,8 @@
 package forth
 
 // Source: exercism/problem-specifications
-// Commit: 3cb5e76 forth: Remove test for empty input (#976)
-// Problem Specifications Version: 1.3.0
+// Commit: 9bf041b forth: Add tests for case-insensitivity (#979)
+// Problem Specifications Version: 1.4.0
 
 type testGroup struct {
 	group string
@@ -135,13 +135,13 @@ var testGroups = []testGroup{
 		group: "dup",
 		tests: []testCase{
 			{
-				"copies the top value on the stack",
-				[]string{"1 DUP"},
+				"copies a value on the stack",
+				[]string{"1 dup"},
 				[]int{1, 1},
 			},
 			{
-				"is case-insensitive",
-				[]string{"1 2 Dup"},
+				"copies the top value on the stack",
+				[]string{"1 2 dup"},
 				[]int{1, 2, 2},
 			},
 			{
@@ -261,4 +261,39 @@ var testGroups = []testGroup{
 			},
 		},
 	},
+	{
+		group: "case-insensitivity",
+		tests: []testCase{
+			{
+				"DUP is case-insensitive",
+				[]string{"1 DUP Dup dup"},
+				[]int{1, 1, 1, 1},
+			},
+			{
+				"DROP is case-insensitive",
+				[]string{"1 2 3 4 DROP Drop drop"},
+				[]int{1},
+			},
+			{
+				"SWAP is case-insensitive",
+				[]string{"1 2 SWAP 3 Swap 4 swap"},
+				[]int{2, 3, 4, 1},
+			},
+			{
+				"OVER is case-insensitive",
+				[]string{"1 2 OVER Over over"},
+				[]int{1, 2, 1, 2, 1},
+			},
+			{
+				"user-defined words are case-insensitive",
+				[]string{": foo dup ;", "1 FOO Foo foo"},
+				[]int{1, 1, 1, 1},
+			},
+			{
+				"definitions are case-insensitive",
+				[]string{": SWAP DUP Dup dup ;", "1 swap"},
+				[]int{1, 1, 1, 1},
+			},
+		},
+	},
 }

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

@@ -20,12 +20,22 @@ func main() {
 
 // The JSON structure we expect to be able to unmarshal into
 type js struct {
-	Cases []struct {
-		Description string
-		Strand1     string
-		Strand2     string
-		Expected    int
+	Cases []oneCase
+}
+
+type oneCase struct {
+	Description string
+	Strand1     string
+	Strand2     string
+	Expected    interface{}
+}
+
+func (o oneCase) Want() int {
+	d, ok := o.Expected.(float64)
+	if ok {
+		return int(d)
 	}
+	return -1
 }
 
 // template applied to above data structure generates the Go test cases
@@ -41,7 +51,7 @@ var testCases = []struct {
 {{range .J.Cases}}{ // {{.Description}}
 	{{printf "%q" .Strand1}},
 	{{printf "%q" .Strand2}},
-	{{.Expected}},
+	{{.Want}},
 },
 {{end}}}
 `

data/tracks/go/exercises/hamming/cases_test.go

@@ -1,8 +1,8 @@
 package hamming
 
-// Source: exercism/x-common
-// Commit: ebe9bbf fix versioning (#845)
-// x-common version: 1.1.0
+// Source: exercism/problem-specifications
+// Commit: f79dfd7 Simplify two tests so the difference is easily spotted.
+// Problem Specifications Version: 2.0.1
 
 var testCases = []struct {
 	s1   string
@@ -50,13 +50,13 @@ var testCases = []struct {
 		2,
 	},
 	{ // non-unique character in first strand
-		"AGA",
-		"AGG",
+		"AAG",
+		"AAA",
 		1,
 	},
 	{ // non-unique character in second strand
-		"AGG",
-		"AGA",
+		"AAA",
+		"AAG",
 		1,
 	},
 	{ // same nucleotides in different positions

data/tracks/go/exercises/isbn-verifier/.meta/gen.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"log"
+	"text/template"
+
+	"../../../gen"
+)
+
+func main() {
+	t, err := template.New("").Parse(tmpl)
+	if err != nil {
+		log.Fatal(err)
+	}
+	var j js
+	if err := gen.Gen("isbn-verifier", &j, t); err != nil {
+		log.Fatal(err)
+	}
+}
+
+type OneCase struct {
+	Description string
+	Input       string
+	Expected    bool
+}
+
+// The JSON structure we expect to be able to unmarshal into
+type js struct {
+	Cases []OneCase
+}
+
+// template applied to above data structure generates the Go test cases
+var tmpl = `package isbn
+
+{{.Header}}
+
+var testCases = []struct {
+	isbn string
+	expected bool
+	description string
+}{
+{{range .J.Cases}}{ "{{.Input}}", {{.Expected}}, "{{.Description}}"},
+{{end}}}
+`

data/tracks/go/exercises/isbn-verifier/cases_test.go

@@ -0,0 +1,25 @@
+package isbn
+
+// Source: exercism/problem-specifications
+// Commit: 3251fa6 Rename property for isbn-verifier exercise
+// Problem Specifications Version: 2.0.0
+
+var testCases = []struct {
+	isbn        string
+	expected    bool
+	description string
+}{
+	{"3-598-21508-8", true, "valid isbn number"},
+	{"3-598-21508-9", false, "invalid isbn check digit"},
+	{"3-598-21507-X", true, "valid isbn number with a check digit of 10"},
+	{"3-598-21507-A", false, "check digit is a character other than X"},
+	{"3-598-2K507-0", false, "invalid character in isbn"},
+	{"3-598-2X507-9", false, "X is only valid as a check digit"},
+	{"3598215088", true, "valid isbn without separating dashes"},
+	{"359821507X", true, "isbn without separating dashes and X as check digit"},
+	{"359821507", false, "isbn without check digit and dashes"},
+	{"3598215078X", false, "too long isbn and no dashes"},
+	{"3-598-21507", false, "isbn without check digit"},
+	{"3-598-21507-XX", false, "too long isbn"},
+	{"3-598-21515-X", false, "check digit of X should not be used for 0"},
+}

data/tracks/go/exercises/isbn-verifier/example.go

@@ -32,8 +32,8 @@ func dropHyphen(isbn string) string {
 
 func strToSlice(isbn string) (result []int, err error) {
 
-	for _, char := range isbn {
-		if unicode.IsLetter(char) && char != 'X' {
+	for pos, char := range isbn {
+		if unicode.IsLetter(char) && (char != 'X' || pos != 9) {
 			err = errors.New("invalid character")
 			return
 		} else if char == 'X' {

data/tracks/go/exercises/isbn-verifier/isbn_verifier_test.go

@@ -4,32 +4,13 @@ import (
 	"testing"
 )
 
-var testCases = []struct {
-	isbn        string
-	expected    bool
-	description string
-}{
-	{"3-598-21508-8", true, "valid isbn number"},
-	{"3-598-21508-9", false, "invalid isbn check digit"},
-	{"3-598-21507-X", true, "valid isbn number with a check digit of 10"},
-	{"3-598-21507-A", false, "check digit is a character other than X"},
-	{"3-598-2K507-0", false, "invalid character in isbn"},
-	{"3-598-2X507-0", false, "X is only valid as a check digit"},
-	{"3598215088", true, "valid isbn without separating dashes"},
-	{"359821507X", true, "isbn without separating dashes and X as check digit"},
-	{"359821507", false, "isbn without check digit and dashes"},
-	{"3598215078X", false, "too long isbn and no dashes"},
-	{"3-598-21507", false, "isbn without check digit"},
-	{"3-598-21507-XA", false, "too long isbn"},
-	{"3-598-21515-X", false, "check digit of X should not be used for 0"},
-}
-
 func TestIsValidISBN(t *testing.T) {
 	for _, test := range testCases {
 		observed := IsValidISBN(test.isbn)
 		if observed != test.expected {
-			t.Fatalf("got %t, want %t, %s (%s)",
-				observed, test.expected, test.description, test.isbn)
+			t.Errorf("FAIL: %s\nIsValidISBN(%q)\nExpected: %t, Actual: %t",
+				test.description, test.isbn, test.expected, observed)
 		}
+		t.Logf("PASS: %s", test.description)
 	}
 }