trackler 2.0.8.17 → 2.0.8.18

data/tracks/ocaml/tools/test-generator/test/beer-song.json

@@ -0,0 +1,77 @@
+{
+  "exercise": "beer-song",
+  "version": "1.0.0",
+  "cases": [
+    {
+      "description": "verse",
+      "cases": [
+        {
+          "description": "single verse",
+          "cases": [
+            {
+              "description": "first generic verse",
+              "property": "verse",
+              "number": 99,
+              "expected": "99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n"
+            },
+            {
+              "description": "last generic verse",
+              "property": "verse",
+              "number": 3,
+              "expected": "3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n"
+            },
+            {
+              "description": "verse 2",
+              "property": "verse",
+              "number": 2,
+              "expected": "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n"
+            },
+            {
+              "description": "verse 1",
+              "property": "verse",
+              "number": 1,
+              "expected": "1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n"
+            },
+            {
+              "description": "verse 0",
+              "property": "verse",
+              "number": 0,
+              "expected": "No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "lyrics",
+      "cases": [
+        {
+          "description": "multiple verses",
+          "cases": [
+            {
+              "description": "first two verses",
+              "property": "verses",
+              "beginning": 99,
+              "end": 98,
+              "expected": "99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n\n98 bottles of beer on the wall, 98 bottles of beer.\nTake one down and pass it around, 97 bottles of beer on the wall.\n"
+            },
+            {
+              "description": "last three verses",
+              "property": "verses",
+              "beginning": 2,
+              "end": 0,
+              "expected": "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"
+            },
+            {
+              "description": "all verses",
+              "property": "verses",
+              "beginning": 99,
+              "end": 0,
+              "expected": "99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n\n98 bottles of beer on the wall, 98 bottles of beer.\nTake one down and pass it around, 97 bottles of beer on the wall.\n\n97 bottles of beer on the wall, 97 bottles of beer.\nTake one down and pass it around, 96 bottles of beer on the wall.\n\n96 bottles of beer on the wall, 96 bottles of beer.\nTake one down and pass it around, 95 bottles of beer on the wall.\n\n95 bottles of beer on the wall, 95 bottles of beer.\nTake one down and pass it around, 94 bottles of beer on the wall.\n\n94 bottles of beer on the wall, 94 bottles of beer.\nTake one down and pass it around, 93 bottles of beer on the wall.\n\n93 bottles of beer on the wall, 93 bottles of beer.\nTake one down and pass it around, 92 bottles of beer on the wall.\n\n92 bottles of beer on the wall, 92 bottles of beer.\nTake one down and pass it around, 91 bottles of beer on the wall.\n\n91 bottles of beer on the wall, 91 bottles of beer.\nTake one down and pass it around, 90 bottles of beer on the wall.\n\n90 bottles of beer on the wall, 90 bottles of beer.\nTake one down and pass it around, 89 bottles of beer on the wall.\n\n89 bottles of beer on the wall, 89 bottles of beer.\nTake one down and pass it around, 88 bottles of beer on the wall.\n\n88 bottles of beer on the wall, 88 bottles of beer.\nTake one down and pass it around, 87 bottles of beer on the wall.\n\n87 bottles of beer on the wall, 87 bottles of beer.\nTake one down and pass it around, 86 bottles of beer on the wall.\n\n86 bottles of beer on the wall, 86 bottles of beer.\nTake one down and pass it around, 85 bottles of beer on the wall.\n\n85 bottles of beer on the wall, 85 bottles of beer.\nTake one down and pass it around, 84 bottles of beer on the wall.\n\n84 bottles of beer on the wall, 84 bottles of beer.\nTake one down and pass it around, 83 bottles of beer on the wall.\n\n83 bottles of beer on the wall, 83 bottles of beer.\nTake one down and pass it around, 82 bottles of beer on the wall.\n\n82 bottles of beer on the wall, 82 bottles of beer.\nTake one down and pass it around, 81 bottles of beer on the wall.\n\n81 bottles of beer on the wall, 81 bottles of beer.\nTake one down and pass it around, 80 bottles of beer on the wall.\n\n80 bottles of beer on the wall, 80 bottles of beer.\nTake one down and pass it around, 79 bottles of beer on the wall.\n\n79 bottles of beer on the wall, 79 bottles of beer.\nTake one down and pass it around, 78 bottles of beer on the wall.\n\n78 bottles of beer on the wall, 78 bottles of beer.\nTake one down and pass it around, 77 bottles of beer on the wall.\n\n77 bottles of beer on the wall, 77 bottles of beer.\nTake one down and pass it around, 76 bottles of beer on the wall.\n\n76 bottles of beer on the wall, 76 bottles of beer.\nTake one down and pass it around, 75 bottles of beer on the wall.\n\n75 bottles of beer on the wall, 75 bottles of beer.\nTake one down and pass it around, 74 bottles of beer on the wall.\n\n74 bottles of beer on the wall, 74 bottles of beer.\nTake one down and pass it around, 73 bottles of beer on the wall.\n\n73 bottles of beer on the wall, 73 bottles of beer.\nTake one down and pass it around, 72 bottles of beer on the wall.\n\n72 bottles of beer on the wall, 72 bottles of beer.\nTake one down and pass it around, 71 bottles of beer on the wall.\n\n71 bottles of beer on the wall, 71 bottles of beer.\nTake one down and pass it around, 70 bottles of beer on the wall.\n\n70 bottles of beer on the wall, 70 bottles of beer.\nTake one down and pass it around, 69 bottles of beer on the wall.\n\n69 bottles of beer on the wall, 69 bottles of beer.\nTake one down and pass it around, 68 bottles of beer on the wall.\n\n68 bottles of beer on the wall, 68 bottles of beer.\nTake one down and pass it around, 67 bottles of beer on the wall.\n\n67 bottles of beer on the wall, 67 bottles of beer.\nTake one down and pass it around, 66 bottles of beer on the wall.\n\n66 bottles of beer on the wall, 66 bottles of beer.\nTake one down and pass it around, 65 bottles of beer on the wall.\n\n65 bottles of beer on the wall, 65 bottles of beer.\nTake one down and pass it around, 64 bottles of beer on the wall.\n\n64 bottles of beer on the wall, 64 bottles of beer.\nTake one down and pass it around, 63 bottles of beer on the wall.\n\n63 bottles of beer on the wall, 63 bottles of beer.\nTake one down and pass it around, 62 bottles of beer on the wall.\n\n62 bottles of beer on the wall, 62 bottles of beer.\nTake one down and pass it around, 61 bottles of beer on the wall.\n\n61 bottles of beer on the wall, 61 bottles of beer.\nTake one down and pass it around, 60 bottles of beer on the wall.\n\n60 bottles of beer on the wall, 60 bottles of beer.\nTake one down and pass it around, 59 bottles of beer on the wall.\n\n59 bottles of beer on the wall, 59 bottles of beer.\nTake one down and pass it around, 58 bottles of beer on the wall.\n\n58 bottles of beer on the wall, 58 bottles of beer.\nTake one down and pass it around, 57 bottles of beer on the wall.\n\n57 bottles of beer on the wall, 57 bottles of beer.\nTake one down and pass it around, 56 bottles of beer on the wall.\n\n56 bottles of beer on the wall, 56 bottles of beer.\nTake one down and pass it around, 55 bottles of beer on the wall.\n\n55 bottles of beer on the wall, 55 bottles of beer.\nTake one down and pass it around, 54 bottles of beer on the wall.\n\n54 bottles of beer on the wall, 54 bottles of beer.\nTake one down and pass it around, 53 bottles of beer on the wall.\n\n53 bottles of beer on the wall, 53 bottles of beer.\nTake one down and pass it around, 52 bottles of beer on the wall.\n\n52 bottles of beer on the wall, 52 bottles of beer.\nTake one down and pass it around, 51 bottles of beer on the wall.\n\n51 bottles of beer on the wall, 51 bottles of beer.\nTake one down and pass it around, 50 bottles of beer on the wall.\n\n50 bottles of beer on the wall, 50 bottles of beer.\nTake one down and pass it around, 49 bottles of beer on the wall.\n\n49 bottles of beer on the wall, 49 bottles of beer.\nTake one down and pass it around, 48 bottles of beer on the wall.\n\n48 bottles of beer on the wall, 48 bottles of beer.\nTake one down and pass it around, 47 bottles of beer on the wall.\n\n47 bottles of beer on the wall, 47 bottles of beer.\nTake one down and pass it around, 46 bottles of beer on the wall.\n\n46 bottles of beer on the wall, 46 bottles of beer.\nTake one down and pass it around, 45 bottles of beer on the wall.\n\n45 bottles of beer on the wall, 45 bottles of beer.\nTake one down and pass it around, 44 bottles of beer on the wall.\n\n44 bottles of beer on the wall, 44 bottles of beer.\nTake one down and pass it around, 43 bottles of beer on the wall.\n\n43 bottles of beer on the wall, 43 bottles of beer.\nTake one down and pass it around, 42 bottles of beer on the wall.\n\n42 bottles of beer on the wall, 42 bottles of beer.\nTake one down and pass it around, 41 bottles of beer on the wall.\n\n41 bottles of beer on the wall, 41 bottles of beer.\nTake one down and pass it around, 40 bottles of beer on the wall.\n\n40 bottles of beer on the wall, 40 bottles of beer.\nTake one down and pass it around, 39 bottles of beer on the wall.\n\n39 bottles of beer on the wall, 39 bottles of beer.\nTake one down and pass it around, 38 bottles of beer on the wall.\n\n38 bottles of beer on the wall, 38 bottles of beer.\nTake one down and pass it around, 37 bottles of beer on the wall.\n\n37 bottles of beer on the wall, 37 bottles of beer.\nTake one down and pass it around, 36 bottles of beer on the wall.\n\n36 bottles of beer on the wall, 36 bottles of beer.\nTake one down and pass it around, 35 bottles of beer on the wall.\n\n35 bottles of beer on the wall, 35 bottles of beer.\nTake one down and pass it around, 34 bottles of beer on the wall.\n\n34 bottles of beer on the wall, 34 bottles of beer.\nTake one down and pass it around, 33 bottles of beer on the wall.\n\n33 bottles of beer on the wall, 33 bottles of beer.\nTake one down and pass it around, 32 bottles of beer on the wall.\n\n32 bottles of beer on the wall, 32 bottles of beer.\nTake one down and pass it around, 31 bottles of beer on the wall.\n\n31 bottles of beer on the wall, 31 bottles of beer.\nTake one down and pass it around, 30 bottles of beer on the wall.\n\n30 bottles of beer on the wall, 30 bottles of beer.\nTake one down and pass it around, 29 bottles of beer on the wall.\n\n29 bottles of beer on the wall, 29 bottles of beer.\nTake one down and pass it around, 28 bottles of beer on the wall.\n\n28 bottles of beer on the wall, 28 bottles of beer.\nTake one down and pass it around, 27 bottles of beer on the wall.\n\n27 bottles of beer on the wall, 27 bottles of beer.\nTake one down and pass it around, 26 bottles of beer on the wall.\n\n26 bottles of beer on the wall, 26 bottles of beer.\nTake one down and pass it around, 25 bottles of beer on the wall.\n\n25 bottles of beer on the wall, 25 bottles of beer.\nTake one down and pass it around, 24 bottles of beer on the wall.\n\n24 bottles of beer on the wall, 24 bottles of beer.\nTake one down and pass it around, 23 bottles of beer on the wall.\n\n23 bottles of beer on the wall, 23 bottles of beer.\nTake one down and pass it around, 22 bottles of beer on the wall.\n\n22 bottles of beer on the wall, 22 bottles of beer.\nTake one down and pass it around, 21 bottles of beer on the wall.\n\n21 bottles of beer on the wall, 21 bottles of beer.\nTake one down and pass it around, 20 bottles of beer on the wall.\n\n20 bottles of beer on the wall, 20 bottles of beer.\nTake one down and pass it around, 19 bottles of beer on the wall.\n\n19 bottles of beer on the wall, 19 bottles of beer.\nTake one down and pass it around, 18 bottles of beer on the wall.\n\n18 bottles of beer on the wall, 18 bottles of beer.\nTake one down and pass it around, 17 bottles of beer on the wall.\n\n17 bottles of beer on the wall, 17 bottles of beer.\nTake one down and pass it around, 16 bottles of beer on the wall.\n\n16 bottles of beer on the wall, 16 bottles of beer.\nTake one down and pass it around, 15 bottles of beer on the wall.\n\n15 bottles of beer on the wall, 15 bottles of beer.\nTake one down and pass it around, 14 bottles of beer on the wall.\n\n14 bottles of beer on the wall, 14 bottles of beer.\nTake one down and pass it around, 13 bottles of beer on the wall.\n\n13 bottles of beer on the wall, 13 bottles of beer.\nTake one down and pass it around, 12 bottles of beer on the wall.\n\n12 bottles of beer on the wall, 12 bottles of beer.\nTake one down and pass it around, 11 bottles of beer on the wall.\n\n11 bottles of beer on the wall, 11 bottles of beer.\nTake one down and pass it around, 10 bottles of beer on the wall.\n\n10 bottles of beer on the wall, 10 bottles of beer.\nTake one down and pass it around, 9 bottles of beer on the wall.\n\n9 bottles of beer on the wall, 9 bottles of beer.\nTake one down and pass it around, 8 bottles of beer on the wall.\n\n8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n\n7 bottles of beer on the wall, 7 bottles of beer.\nTake one down and pass it around, 6 bottles of beer on the wall.\n\n6 bottles of beer on the wall, 6 bottles of beer.\nTake one down and pass it around, 5 bottles of beer on the wall.\n\n5 bottles of beer on the wall, 5 bottles of beer.\nTake one down and pass it around, 4 bottles of beer on the wall.\n\n4 bottles of beer on the wall, 4 bottles of beer.\nTake one down and pass it around, 3 bottles of beer on the wall.\n\n3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n\n2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/tracks/ocaml/tools/test-generator/test/difference_of_squares.json

@@ -1,67 +1,81 @@
 {
-    "square_of_sum": {
-        "description": ["Square the sum of the numbers up to the given number"],
-        "cases": [
-            {
-                "description": "square of sum 5",
-                "number": 5,
-                "expected": 225
-            },
-            {
-                "description": "square of sum 10",
-                "number": 10,
-                "expected": 3025
-            },
-            {
-                "description": "square of sum 100",
-                "number": 100,
-                "expected": 25502500
-            }
-        ]
+  "exercise": "difference-of-squares",
+  "version": "1.0.0",
+  "cases": [
+    {
+      "description": "Square the sum of the numbers up to the given number",
+      "cases": [
+        {
+          "description": "square of sum 5",
+          "property": "squareOfSum",
+          "number": 5,
+          "expected": 225
+        },
+        {
+          "description": "square of sum 10",
+          "property": "squareOfSum",
+          "number": 10,
+          "expected": 3025
+        },
+        {
+          "description": "square of sum 100",
+          "property": "squareOfSum",
+          "number": 100,
+          "expected": 25502500
+        }
+      ]
     },
-    "sum_of_squares": {
-        "description": ["Sum the squares of the numbers up to the given number"],
-        "cases": [
-            {
-                "description": "sum of squares 5",
-                "number": 5,
-                "expected": 55
-            },
-            {
-                "description": "sum of squares 10",
-                "number": 10,
-                "expected": 385
-            },
-            {
-                "description": "sum of squares 100",
-                "number": 100,
-                "expected": 338350
-            }
-        ]
+    {
+      "description": "Sum the squares of the numbers up to the given number",
+      "cases": [
+        {
+          "description": "sum of squares 5",
+          "property": "sumOfSquares",
+          "number": 5,
+          "expected": 55
+        },
+        {
+          "description": "sum of squares 10",
+          "property": "sumOfSquares",
+          "number": 10,
+          "expected": 385
+        },
+        {
+          "description": "sum of squares 100",
+          "property": "sumOfSquares",
+          "number": 100,
+          "expected": 338350
+        }
+      ]
     },
-    "difference_of_squares": {
-        "description": ["Subtract sum of squares from square of sums"],
-        "cases": [
-            {
-                "description": "difference of squares 0",
-                "number": 0,
-                "expected": 0
-            },
-            {
-                "description": "difference of squares 5",
-                "number": 5,
-                "expected": 170
-            },
-            {
-                "description": "difference of squares 10",
-                "number": 10,
-                "expected": 2640
-            },
-            {
-                "description": "difference of squares 100",
-                "number": 100,
-                "expected": 25164150
-            }
-        ]
+    {
+      "description": "Subtract sum of squares from square of sums",
+      "cases": [
+        {
+          "description": "difference of squares 0",
+          "property": "differenceOfSquares",
+          "number": 0,
+          "expected": 0
+        },
+        {
+          "description": "difference of squares 5",
+          "property": "differenceOfSquares",
+          "number": 5,
+          "expected": 170
+        },
+        {
+          "description": "difference of squares 10",
+          "property": "differenceOfSquares",
+          "number": 10,
+          "expected": 2640
+        },
+        {
+          "description": "difference of squares 100",
+          "property": "differenceOfSquares",
+          "number": 100,
+          "expected": 25164150
+        }
+      ]
     }
+  ]
 }

data/tracks/ocaml/tools/test-generator/test/parser_test.ml

@@ -10,11 +10,8 @@ let single x = Ok (Single x)
 let call_parser json = parse_json_text json "expected" "cases"
 
 let parser_tests = [
-  "parses empty json as empty list" >::
-    ae (single []) (parse_json_text "{\"test-cases\" : []}" "expected" "test-cases");
-
   "gives an error with a json map that does not have the key cases in" >::
-    ae (Error (TestMustHaveKeyCalledCases "case"))
+    ae (Error (TestMustHaveKeyCalledCases "cases"))
        (call_parser "{\"case\" : [{\"description\" : \"d1\", \"expected\" : 100}]}");
 
   "gives an error with cases that is not a json list" >::
@@ -90,16 +87,21 @@ let parser_tests = [
 
   "parses difference_of_squares.json" >::(fun ctxt ->
       match call_parser @@ In_channel.read_all "test/difference_of_squares.json" with
-      | Ok (Suite p) -> assert_equal ["square_of_sum"; "sum_of_squares"; "difference_of_squares"] (List.map ~f:(fun x -> x.name) p)
+      | Ok (Suite p) -> assert_equal [
+        "square_the_sum_of_the_numbers_up_to_the_given_number"; 
+        "sum_the_squares_of_the_numbers_up_to_the_given_number"; 
+        "subtract_sum_of_squares_from_square_of_sums"] (List.map ~f:(fun x -> x.name) p)
       | Ok (Single p) -> assert_failure "was single"
       | Error e -> assert_failure ("failed to parse difference_of_squares.json: " ^ show_error e)
     );
 
-  "parses clock.json" >::(fun ctxt ->
-      match call_parser @@ In_channel.read_all "test/clock.json" with
-      | Ok (Suite p) -> assert_equal ["create"; "add"; "equal"] (List.map ~f:(fun x -> x.name) p)
+  "parses nested json in beer-song by dropping intermediate nesting levels" >::(fun ctxt ->
+      match call_parser @@ In_channel.read_all "test/beer-song.json" with
+      | Ok (Suite p) -> assert_equal [
+        "verse"; 
+        "lyrics"] (List.map ~f:(fun x -> x.name) p)
       | Ok (Single p) -> assert_failure "was single"
-      | Error e -> assert_failure ("failed to parse clock.json: " ^ show_error e)
+      | Error e -> assert_failure ("failed to parse beer-song.json: " ^ show_error e)
     );
 
   "parses json with a methods key for dynamic languages" >::(fun ctxt ->

data/tracks/ocaml/tools/test-generator/test/template_test.ml

@@ -51,10 +51,10 @@ let template_tests = [
       let template = {start=7; finish=9; file_text=template_text;template="code";
                       suite_name_line=Some 6; suite_end = Some 14; suite_all_names_line = None} in
       let subst = ("tests1", [Subst "line1"; Subst "line2"]) in
-      let filled = fill_single_suite template subst in
+      let filled = Result.ok_or_failwith @@ fill_single_suite template subst in
       assert_equal ~printer:Bool.to_string true (String.substr_index filled ~pattern:"let tests1_tests = [" |> Option.is_some);
       assert_equal ~printer:Bool.to_string true (String.substr_index filled ~pattern:"line1" |> Option.is_some);
       assert_equal ~printer:Bool.to_string true (String.substr_index filled ~pattern:"line2" |> Option.is_some);
-      assert_equal ~printer:Int.to_string 6 (String.count ~f:(fun ch -> ch = '\n') filled);
+      assert_equal ~printer:Int.to_string 7 (String.count ~f:(fun ch -> ch = '\n') filled);
     );
 ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.17
+  version: 2.0.8.18
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1454,6 +1454,7 @@ files:
 - tracks/csharp/exercises/diamond/Diamond.csproj
 - tracks/csharp/exercises/diamond/DiamondTest.cs
 - tracks/csharp/exercises/diamond/Example.cs
+- tracks/csharp/exercises/diamond/HINTS.md
 - tracks/csharp/exercises/difference-of-squares/DifferenceOfSquares.cs
 - tracks/csharp/exercises/difference-of-squares/DifferenceOfSquares.csproj
 - tracks/csharp/exercises/difference-of-squares/DifferenceOfSquaresTest.cs
@@ -5813,6 +5814,7 @@ files:
 - tracks/ocaml/tools/test-generator/templates/say/template.ml
 - tracks/ocaml/tools/test-generator/templates/word-count/template.ml
 - tracks/ocaml/tools/test-generator/test/all_tests.ml
+- tracks/ocaml/tools/test-generator/test/beer-song.json
 - tracks/ocaml/tools/test-generator/test/clock.json
 - tracks/ocaml/tools/test-generator/test/codegen_test.ml
 - tracks/ocaml/tools/test-generator/test/difference_of_squares.json