trackler 2.2.1.108 → 2.2.1.109

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

@@ -1,26 +1,32 @@
 {
   "exercise": "difference-of-squares",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "cases": [
     {
       "description": "Square the sum of the numbers up to the given number",
       "cases": [
         {
-          "description": "square of sum 5",
+          "description": "square of sum 1",
           "property": "squareOfSum",
-          "number": 5,
-          "expected": 225
+          "input": {
+            "number": 1
+          },
+          "expected": 1
         },
         {
-          "description": "square of sum 10",
+          "description": "square of sum 5",
           "property": "squareOfSum",
-          "number": 10,
-          "expected": 3025
+          "input": {
+            "number": 5
+          },
+          "expected": 225
         },
         {
           "description": "square of sum 100",
           "property": "squareOfSum",
-          "number": 100,
+          "input": {
+            "number": 100
+          },
           "expected": 25502500
         }
       ]
@@ -29,21 +35,27 @@
       "description": "Sum the squares of the numbers up to the given number",
       "cases": [
         {
-          "description": "sum of squares 5",
+          "description": "sum of squares 1",
           "property": "sumOfSquares",
-          "number": 5,
-          "expected": 55
+          "input": {
+            "number": 1
+          },
+          "expected": 1
         },
         {
-          "description": "sum of squares 10",
+          "description": "sum of squares 5",
           "property": "sumOfSquares",
-          "number": 10,
-          "expected": 385
+          "input": {
+            "number": 5
+          },
+          "expected": 55
         },
         {
           "description": "sum of squares 100",
           "property": "sumOfSquares",
-          "number": 100,
+          "input": {
+            "number": 100
+          },
           "expected": 338350
         }
       ]
@@ -52,30 +64,30 @@
       "description": "Subtract sum of squares from square of sums",
       "cases": [
         {
-          "description": "difference of squares 0",
+          "description": "difference of squares 1",
           "property": "differenceOfSquares",
-          "number": 0,
+          "input": {
+            "number": 1
+          },
           "expected": 0
         },
         {
           "description": "difference of squares 5",
           "property": "differenceOfSquares",
-          "number": 5,
+          "input": {
+            "number": 5
+          },
           "expected": 170
         },
-        {
-          "description": "difference of squares 10",
-          "property": "differenceOfSquares",
-          "number": 10,
-          "expected": 2640
-        },
         {
           "description": "difference of squares 100",
           "property": "differenceOfSquares",
-          "number": 100,
+          "input": {
+            "number": 100
+          },
           "expected": 25164150
         }
       ]
     }
   ]
-}
+}

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

@@ -1,23 +1,17 @@
 {
-   "#": [
+  "#": [
      "Language implementations vary on the issue of missing input variables.",
      "In this set of test cases, the input variable is left out of the definition,",
      "and the generator would need to handle the language implementation."
-   ],
-   "cases": [
-      {
-         "description": "no name",
-         "expected": "Hello, World!"
-      },
-      {
-         "description": "sample name",
-         "name": "Alice",
-         "expected": "Hello, Alice!"
-      },
-      {
-         "description": "other sample name",
-         "name": "Bob",
-         "expected": "Hello, Bob!"
-      }
-   ]
+  ],
+  "exercise": "hello-world",
+  "version": "1.1.0",
+  "cases": [
+    {
+      "description": "Say Hi!",
+      "property": "hello",
+      "input": {},
+      "expected": "Hello, World!"
+    }
+  ]
 }

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

@@ -1,39 +1,38 @@
 {
-   "cases": [
-      {
-         "description": "leap year",
-         "input": 1996,
-         "expected": true
+  "exercise": "leap",
+  "version": "1.3.0",
+  "cases": [
+    {
+      "description": "year not divisible by 4: common year",
+      "property": "leapYear",
+      "input": {
+        "year": 2015
       },
-      {
-         "description": "standard and odd year",
-         "input": 1997,
-         "expected": false
+      "expected": false
+    },
+    {
+      "description": "year divisible by 4, not divisible by 100: leap year",
+      "property": "leapYear",
+      "input": {
+        "year": 1996
       },
-      {
-         "description": "standard even year",
-         "input": 1998,
-         "expected": false
+      "expected": true
+    },
+    {
+      "description": "year divisible by 100, not divisible by 400: common year",
+      "property": "leapYear",
+      "input": {
+        "year": 2100
       },
-      {
-         "description": "standard nineteenth century",
-         "input": 1900,
-         "expected": false
+      "expected": false
+    },
+    {
+      "description": "year divisible by 400: leap year",
+      "property": "leapYear",
+      "input": {
+        "year": 2000
       },
-      {
-         "description": "standard eighteenth century",
-         "input": 1800,
-         "expected": false
-      },
-      {
-         "description": "leap twenty fourth century",
-         "input": 2400,
-         "expected": true
-      },
-      {
-         "description": "leap y2k",
-         "input": 2000,
-         "expected": true
-      }
-   ]
-}
+      "expected": true
+    }
+  ]
+}

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

@@ -3,7 +3,11 @@ open OUnit2
 open Parser
 open Model
 
-let ae exp got _test_ctxt = assert_equal exp got
+let printer (r: (Model.tests, Parser.error) Result.t): string = match r with
+| Ok tests -> tests_to_string tests
+| Error e -> "error"
+
+let ae (exp: (Model.tests, Parser.error) Result.t) (got: (Model.tests, Parser.error) Result.t) _test_ctxt = assert_equal exp got ~printer
 
 let single x = Ok (Single x)
 
@@ -24,35 +28,35 @@ let parser_tests = [
 
   "parses a single element with a description and expected string output" >::
     ae (single [{description = "d1"; parameters = [("expected", `String "value")]}])
-       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : \"value\"}]}");
+       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : \"value\"}]}");
 
   "parses a single element with a description and expected float output" >::
     ae (single [{description = "d1"; parameters = [("expected", `Float 100.)]}])
-       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : 100.0}]}");
+       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : 100.0}]}");
 
   "parses a single element with a description and expected bool output" >::
     ae (single [{description = "d1"; parameters = [("expected", `Bool true)];}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : true}]}");
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : true}]}");
 
   "parses a single element with a description and expected int list output" >::
     ae (single [{description = "d1"; parameters = [("expected", `List [`Int 1;`Int 2;`Int 3])]}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : [1, 2, 3]}]}");
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : [1, 2, 3]}]}");
 
   "parses a single element with a description and expected null output" >::
     ae (single [{description = "d1"; parameters = [("expected", `Null)]}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : null}]}");
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : null}]}");
 
   "parses a single element with an int key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `Int 1996); ("expected", `Bool true)]}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : 1996, \"expected\" : true}]}");
+    ae (single [{description = "d1"; parameters = [("expected", `Bool true); ("year", `Int 1996)]}])
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\": { \"year\" : 1996 }, \"expected\" : true}]}");
 
   "parses a single element with a string key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `String "some-string"); ("expected", `Int 85)]}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : \"some-string\", \"expected\" : 85}]}");
+    ae (single [{description = "d1"; parameters = [("expected", `Int 85); ("string", `String "some-string")]}])
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\": { \"string\" : \"some-string\" }, \"expected\" : 85}]}");
 
   "parses a single element with a string list key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `List [`String "s1"; `String "s2"]); ("expected", `Int 85)]}])
-      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : [\"s1\", \"s2\"], \"expected\" : 85}]}");
+    ae (single [{description = "d1"; parameters = [("expected", `Int 85); ("list", `List [`String "s1"; `String "s2"])]}])
+      (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : { \"list\" : [\"s1\", \"s2\"] }, \"expected\" : 85}]}");
 
   "an element without a description is an Error" >::
     ae (Error NoDescription)
@@ -68,12 +72,12 @@ let parser_tests = [
 
   "parses a map in the expected parameter" >::(fun _ctx ->
       assert_equal (single [{description = "d1"; parameters = [("expected", `Assoc [("one", `Int 1); ("two", `Int 2)])]}])
-        (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : {\"one\": 1, \"two\": 2}}]}");
+        (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : {}, \"expected\" : {\"one\": 1, \"two\": 2}}]}");
       );
 
   "parses leap.json" >::(fun ctxt ->
       match call_parser @@ In_channel.read_all "test/leap.json" with
-      | Ok (Single p) -> assert_equal 7 (List.length p)
+      | Ok (Single p) -> assert_equal 4 (List.length p)
       | Ok (Suite p) -> assert_failure "was suite"
       | Error e -> assert_failure ("failed to parse leap.json: " ^ show_error e)
   );

data/tracks/ocaml/tools/test-generator/test/with-methods-key.json

@@ -15,7 +15,7 @@
   "cases": [
     {
        "description": "parses normal text as a paragraph",
-       "input": "This will be a paragraph",
+       "input": { "input" : "This will be a paragraph" },
        "expected": "<p>This will be a paragraph</p>"
     }
   ]

data/tracks/rust/exercises/allergies/Cargo.toml

@@ -1,4 +1,4 @@
 [package]
 name = "allergies"
-version = "1.0.0"
+version = "1.1.0"
 

data/tracks/rust/exercises/atbash-cipher/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "atbash-cipher"
-version = "1.0.0"
+version = "1.1.0"

data/tracks/rust/exercises/binary-search/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "binary-search"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["<marco.stahl@mailbox.org>"]
 
 [dependencies]

data/tracks/rust/exercises/bob/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "bob"
-version = "1.1.0"
+version = "1.2.0"

data/tracks/rust/exercises/bracket-push/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "bracket-push"
-version = "1.1.0"
+version = "1.2.0"

data/tracks/rust/exercises/collatz-conjecture/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "collatz_conjecture"
-version = "1.1.1"
+version = "1.2.0"

data/tracks/rust/exercises/difference-of-squares/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "difference-of-squares"
-version = "1.1.0"
+version = "1.2.0"

data/tracks/rust/exercises/dominoes/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "dominoes"
-version = "2.0.0"
+version = "2.1.0"

data/tracks/rust/exercises/gigasecond/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gigasecond"
-version = "1.0.0"
+version = "1.1.0"
 
 [dependencies]
 chrono = "0.4"

data/tracks/rust/exercises/grains/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "grains"
-version = "1.0.0"
+version = "1.1.0"

data/tracks/rust/exercises/hello-world/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "hello-world"
-version = "1.0.0"
+version = "1.1.0"

data/tracks/rust/exercises/isogram/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "isogram"
-version = "1.2.0"
+version = "1.3.0"

data/tracks/rust/exercises/largest-series-product/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "largest-series-product"
-version = "1.0.0"
+version = "1.1.0"

data/tracks/rust/exercises/minesweeper/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "minesweeper"
-version = "1.0.0"
+version = "1.1.0"

data/tracks/rust/exercises/pascals-triangle/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "pascals-triangle"
-version = "1.2.0"
+version = "1.3.0"

data/tracks/rust/exercises/perfect-numbers/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
 name = "perfect_numbers"
-version = "1.0.1"
+version = "1.1.0"
 
 [dependencies]

data/tracks/rust/exercises/poker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "poker"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>"]
 
 [dependencies]

data/tracks/rust/exercises/prime-factors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "prime_factors"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["sacherjj <sacherjj@gmail.com>"]
 
 [dependencies]

data/tracks/rust/exercises/queen-attack/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "queen-attack"
-version = "1.0.0"
+version = "2.1.0"

data/tracks/rust/exercises/raindrops/Cargo.toml

@@ -1,3 +1,3 @@
 [package]
 name = "raindrops"
-version = "1.0.0"
+version = "1.1.0"