trackler 2.2.1.100 → 2.2.1.101

data/tracks/objective-c/xcodeProject/ObjectiveC.xcodeproj/xcshareddata/xcschemes/OCLint.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

data/tracks/objective-c/xcodeProject/ObjectiveC.xcodeproj/xcshareddata/xcschemes/xobjectivecTest.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,6 +10,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -30,6 +31,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

data/tracks/ocaml/exercises/forth/example.ml

@@ -20,14 +20,14 @@ let handle_binary_op f = function
 
 let std_vocabulary: vocabulary =
   String.Map.empty 
-  |> Map.add ~key:"+" ~data:(handle_binary_op (+))
-  |> Map.add ~key:"-" ~data:(handle_binary_op (-))
-  |> Map.add ~key:"*" ~data:(handle_binary_op ( * ))
-  |> Map.add ~key:"/" ~data:(function | x :: y :: xs -> if x = 0 then None else Some ((y/x) :: xs) | _ -> None)
-  |> Map.add ~key:"DUP" ~data:(function | x :: xs -> Some (x :: x :: xs) | _ -> None)
-  |> Map.add ~key:"DROP" ~data:(function | _ :: xs -> Some xs | _ -> None)
-  |> Map.add ~key:"SWAP" ~data:(function | x :: y :: xs -> Some (y :: x :: xs) | _ -> None)
-  |> Map.add ~key:"OVER" ~data:(function | x :: y :: xs -> Some (y :: x :: y :: xs) | _ -> None)
+  |> Map.set ~key:"+" ~data:(handle_binary_op (+))
+  |> Map.set ~key:"-" ~data:(handle_binary_op (-))
+  |> Map.set ~key:"*" ~data:(handle_binary_op ( * ))
+  |> Map.set ~key:"/" ~data:(function | x :: y :: xs -> if x = 0 then None else Some ((y/x) :: xs) | _ -> None)
+  |> Map.set ~key:"DUP" ~data:(function | x :: xs -> Some (x :: x :: xs) | _ -> None)
+  |> Map.set ~key:"DROP" ~data:(function | _ :: xs -> Some xs | _ -> None)
+  |> Map.set ~key:"SWAP" ~data:(function | x :: y :: xs -> Some (y :: x :: xs) | _ -> None)
+  |> Map.set ~key:"OVER" ~data:(function | x :: y :: xs -> Some (y :: x :: y :: xs) | _ -> None)
 
 let (<|>) o1 o2 = match o1 with
 | None -> o2
@@ -71,7 +71,7 @@ let rec handle_def vocabulary stack words: (vocabulary * stack) option =
     then None
     else
       let def = List.drop words 1 in
-      let vocabulary = Map.add vocabulary ~key:new_vocab ~data:(fun stack -> Option.map ~f:(snd >|> List.rev) @@ evaluate_stack stack vocabulary def) in
+      let vocabulary = Map.set vocabulary ~key:new_vocab ~data:(fun stack -> Option.map ~f:(snd >|> List.rev) @@ evaluate_stack stack vocabulary def) in
       Some (vocabulary, stack)
 
 and evaluate_sentence_or_fail (vocabulary: vocabulary) (stack: stack) (sentence: sentence): (vocabulary * stack) option = match sentence with

data/tracks/ocaml/tools/test-generator/Makefile

@@ -2,19 +2,13 @@ test: test_gen.native
 	@./all_tests.native
 
 canonical_data_checker.native: all_tests.native src/*.ml test/*.ml
-	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces canonical_data_checker.native
-
-test_gen.byte: all_tests.native src/*.ml test/*.ml
-	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces test_gen.byte
+	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_let -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces canonical_data_checker.native
 
 test_gen.native: all_tests.native src/*.ml test/*.ml
-	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces test_gen.native
+	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_let -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces test_gen.native
 
 all_tests.native: src/*.ml test/*.ml
-	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg oUnit -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,test all_tests.native
-
-debug.byte: debug.byte src/*.ml
-	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,interfaces debug.byte
+	@ocamlbuild -use-ocamlfind -tag thread -tag short_paths -cflags -strict-sequence -r -pkg core -pkg oUnit -pkg ppx_let -pkg yojson -pkg ppx_deriving -pkg ppx_deriving.eq -pkg ppx_deriving.show -Is src,test all_tests.native
 
 clean:
 	rm -rf _build

data/tracks/ocaml/tools/test-generator/src/test_gen.ml

@@ -16,24 +16,26 @@ let home_dir = Option.value_exn (Sys.getenv "HOME")
 let default_generated name = Option.value ~default:(home_dir ^ "/.x" ^ name ^ "-generated")
 
 let command =
+  let open Command.Let_syntax in
   Command.basic
     ~summary:"Generates test code from canonical data."
-    Command.Spec.(
-      empty
-      +> flag "-l" (optional string) ~doc:"language to generate tests for"
-      +> flag "-t" (optional_with_default "./templates" is_directory) ~doc:"string Directory containing templates."
-      +> flag "-c" (optional_with_default "../../../problem-specifications/exercises" is_directory) ~doc:"string Directory containing canonical data."
-      +> flag "-o" (optional string) ~doc:"string Directory to output generated tests."
-      +> flag "-g" (optional string) ~doc:"string Directory to backup generated tests."
-      +> flag "-f" (optional string) ~doc:"string Filter out files not matching this string."
-    )
-    (fun language templates_folder canonical_data_folder output_folder generated_folder filter () -> 
-      let language = Option.value language ~default:"ocaml" in
-      let lc = default_language_config language in
-      let generated_folder = default_generated language generated_folder in
-      let templates_folder = templates_folder ^ "/" ^ language in
-      let output_folder = Option.value output_folder ~default:(lc.default_base_folder ^ "/exercises") in
-      Controller.run lc templates_folder canonical_data_folder output_folder generated_folder filter)
+    ~readme: (fun () -> "Generates test code from canonical data.")
+    [%map_open
+      let language = flag "l" (optional string) ~doc:"language to generate tests for"
+      and templates_folder = flag "t" (optional_with_default "./templates" is_directory) ~doc:"string Directory containing templates."
+      and canonical_data_folder = flag "c" (optional_with_default "./templates" is_directory) ~doc:"string Directory containing templates."
+      and output_folder = flag "-o" (optional string) ~doc:"string Directory to output generated tests."
+      and generated_folder = flag "-g" (optional string) ~doc:"string Directory to backup generated tests."
+      and filter = flag "-f" (optional string) ~doc:"string Filter out files not matching this string."
+      in
+      fun () ->
+        let language = Option.value language ~default:"ocaml" in
+        let lc = default_language_config language in
+        let generated_folder = default_generated language generated_folder in
+        let templates_folder = templates_folder ^ "/" ^ language in
+        let output_folder = Option.value output_folder ~default:(lc.default_base_folder ^ "/exercises") in
+        Controller.run lc templates_folder canonical_data_folder output_folder generated_folder filter
+    ]
 
 let () =
   Command.run ~version:"0.1" command

data/tracks/perl6/exercises/acronym/.meta/exercise-data.yaml

@@ -1,6 +1,6 @@
 exercise: Acronym
 version: 2
-plan: 6
+plan: 5
 tests: |-
 
   for $c-data<cases>»<cases>».Array.flat {

data/tracks/perl6/exercises/acronym/acronym.t

@@ -4,7 +4,7 @@ use Test;
 use JSON::Fast;
 use lib $?FILE.IO.dirname;
 use Acronym;
-plan 6;
+plan 5;
 
 my Version:D $version = v2;
 
@@ -22,10 +22,9 @@ for $c-data<cases>»<cases>».Array.flat {
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "acronym",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "cases": [
     {
       "description": "Abbreviate a phrase",
@@ -55,15 +54,7 @@ for $c-data<cases>»<cases>».Array.flat {
           "expected": "FIFO"
         },
         {
-          "description": "all caps words",
-          "property": "abbreviate",
-          "input": {
-            "phrase": "PHP: Hypertext Preprocessor"
-          },
-          "expected": "PHP"
-        },
-        {
-          "description": "non-acronym all caps word",
+          "description": "all caps word",
           "property": "abbreviate",
           "input": {
             "phrase": "GNU Image Manipulation Program"
@@ -71,7 +62,7 @@ for $c-data<cases>»<cases>».Array.flat {
           "expected": "GIMP"
         },
         {
-          "description": "hyphenated",
+          "description": "punctuation without whitespace",
           "property": "abbreviate",
           "input": {
             "phrase": "Complementary metal-oxide semiconductor"
@@ -82,5 +73,4 @@ for $c-data<cases>»<cases>».Array.flat {
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/all-your-base/all-your-base.t

@@ -35,7 +35,6 @@ for $c-data<cases>.values -> $case {
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "all-your-base",
   "version": "2.1.0",
@@ -263,5 +262,4 @@ for $c-data<cases>.values -> $case {
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/allergies/allergies.t

@@ -43,7 +43,6 @@ for $c-data<cases>.values -> %case-set {
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "allergies",
   "version": "1.1.0",
@@ -217,5 +216,4 @@ for $c-data<cases>.values -> %case-set {
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/anagram/.meta/exercise-data.yaml

@@ -1,6 +1,6 @@
 exercise: Anagram
 version: 3
-plan: 16
+plan: 12
 tests: |-
   cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.Set, .<description> for $c-data<cases>.values;
 

data/tracks/perl6/exercises/anagram/anagram.t

@@ -4,7 +4,7 @@ use Test;
 use JSON::Fast;
 use lib $?FILE.IO.dirname;
 use Anagram;
-plan 16;
+plan 12;
 
 my Version:D $version = v3;
 
@@ -19,10 +19,9 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "anagram",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "comments": [
     "The string argument cases possible matches are passed in as",
     "individual arguments rather than arrays. Languages can include",
@@ -39,24 +38,6 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
       },
       "expected": []
     },
-    {
-      "description": "detects simple anagram",
-      "property": "anagrams",
-      "input": {
-        "subject": "ant",
-        "candidates": ["tan", "stand", "at"]
-      },
-      "expected": ["tan"]
-    },
-    {
-      "description": "does not detect false positives",
-      "property": "anagrams",
-      "input": {
-        "subject": "galea",
-        "candidates": ["eagle"]
-      },
-      "expected": []
-    },
     {
       "description": "detects two anagrams",
       "property": "anagrams",
@@ -100,15 +81,6 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
       },
       "expected": ["gallery", "regally", "largely"]
     },
-    {
-      "description": "does not detect identical words",
-      "property": "anagrams",
-      "input": {
-        "subject": "corn",
-        "candidates": ["corn", "dark", "Corn", "rank", "CORN", "cron", "park"]
-      },
-      "expected": ["cron"]
-    },
     {
       "description": "does not detect non-anagrams with identical checksum",
       "property": "anagrams",
@@ -145,15 +117,6 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
       },
       "expected": ["Carthorse"]
     },
-    {
-      "description": "does not detect a word as its own anagram",
-      "property": "anagrams",
-      "input": {
-        "subject": "banana",
-        "candidates": ["Banana"]
-      },
-      "expected": []
-    },
     {
       "description": "does not detect a anagram if the original word is repeated",
       "property": "anagrams",
@@ -183,5 +146,4 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/atbash-cipher/atbash-cipher.t

@@ -19,7 +19,6 @@ is .<input><phrase>.&::(.<property>), |.<expected description> for $c-data<cases
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "atbash-cipher",
   "version": "1.1.0",

data/tracks/perl6/exercises/bob/bob.t

@@ -28,7 +28,6 @@ is Bob.?hey(.<input><heyBob>), |.<expected description> for @($c-data<cases>);
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "bob",
   "version": "1.2.0",
@@ -235,5 +234,4 @@ is Bob.?hey(.<input><heyBob>), |.<expected description> for @($c-data<cases>);
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/clock/.meta/exercise-data.yaml

@@ -1,31 +1,31 @@
 exercise: Clock
-version: 2
-methods: time add-minutes
-plan: 52
+version: 3
+methods: time add-minutes subtract-minutes
+plan: 53
 tests: |-
-  for $c-data<cases>»<cases>».Array.flat -> %case {
+  for $c-data<cases>»<cases>»<>.flat -> %case {
     given %case<property> {
       when 'create' {
-        is Clock.?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
+        is Clock.?new( |%(.<input><hour minute>:p) ).?time, |.<expected description> given %case;
       }
-      when 'add' {
+      when 'add'|'subtract' {
         given %case {
-          my $clock = Clock.?new: |%(.<hour minute>:p);
-          $clock.?add-minutes: .<add>;
+          my $clock = Clock.?new: |%(.<input><hour minute>:p);
+          $clock.?add-minutes: .<input><value> if .<property> eq 'add';
+          $clock.?subtract-minutes: .<input><value> if .<property> eq 'subtract';
           is $clock.?time, |.<expected description>;
         }
       }
       when 'equal' {
         is-deeply ([eq] gather {
-          take Clock.?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
+          take Clock.?new( |%(.<hour minute>:p) ).?time for %case<input><clock1 clock2>;
         }), |%case<expected description>;
       }
-      when %*ENV<EXERCISM>.so { bail-out "no case for property '%case<property>'" }
     }
   }
 
-  todo 'optional test' unless %*ENV<EXERCISM>;
   is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
+  is Clock.?new(:0hour,:0minute).?subtract-minutes(65).?time, '22:55', 'subtract-minutes method can be chained';
 
 unit: class
 example: |-
@@ -39,6 +39,10 @@ example: |-
   method add-minutes (Int:D $min) {
     $!minute += $min and return self;
   }
+
+  method subtract-minutes (Int:D $min) {
+    self.add-minutes(-$min);
+  }
 stub: |-
   has $.hour;
   has $.minute;

data/tracks/perl6/exercises/clock/.meta/solutions/Clock.pm6

@@ -1,4 +1,4 @@
-unit class Clock:ver<2>;
+unit class Clock:ver<3>;
 
 has Int:D $.hour = 0;
 has Int:D $.minute = 0;
@@ -10,3 +10,7 @@ method time {
 method add-minutes (Int:D $min) {
   $!minute += $min and return self;
 }
+
+method subtract-minutes (Int:D $min) {
+  self.add-minutes(-$min);
+}

data/tracks/perl6/exercises/clock/Clock.pm6

@@ -1,4 +1,4 @@
-unit class Clock:ver<2>;
+unit class Clock:ver<3>;
 
 has $.hour;
 has $.minute;

data/tracks/perl6/exercises/clock/clock.t

@@ -4,9 +4,9 @@ use Test;
 use JSON::Fast;
 use lib $?FILE.IO.dirname;
 use Clock;
-plan 52;
+plan 53;
 
-my Version:D $version = v2;
+my Version:D $version = v3;
 
 if Clock.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
@@ -15,46 +15,44 @@ if Clock.^ver !~~ $version {
 }
 
 subtest 'Class methods', {
-  ok Clock.can($_), $_ for <time add-minutes>;
+  ok Clock.can($_), $_ for <time add-minutes subtract-minutes>;
 }
 
 my $c-data = from-json $=pod.pop.contents;
-for $c-data<cases>»<cases>».Array.flat -> %case {
+for $c-data<cases>»<cases>»<>.flat -> %case {
   given %case<property> {
     when 'create' {
-      is Clock.?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
+      is Clock.?new( |%(.<input><hour minute>:p) ).?time, |.<expected description> given %case;
     }
-    when 'add' {
+    when 'add'|'subtract' {
       given %case {
-        my $clock = Clock.?new: |%(.<hour minute>:p);
-        $clock.?add-minutes: .<add>;
+        my $clock = Clock.?new: |%(.<input><hour minute>:p);
+        $clock.?add-minutes: .<input><value> if .<property> eq 'add';
+        $clock.?subtract-minutes: .<input><value> if .<property> eq 'subtract';
         is $clock.?time, |.<expected description>;
       }
     }
     when 'equal' {
       is-deeply ([eq] gather {
-        take Clock.?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
+        take Clock.?new( |%(.<hour minute>:p) ).?time for %case<input><clock1 clock2>;
       }), |%case<expected description>;
     }
-    when %*ENV<EXERCISM>.so { bail-out "no case for property '%case<property>'" }
   }
 }
 
-todo 'optional test' unless %*ENV<EXERCISM>;
 is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
+is Clock.?new(:0hour,:0minute).?subtract-minutes(65).?time, '22:55', 'subtract-minutes method can be chained';
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "clock",
-  "version": "1.0.1",
+  "version": "2.2.1",
   "comments": [
     "Most languages require constructing a clock with initial values,",
-    "adding a positive or negative number of minutes, and testing equality",
-    "in some language-native way.  Some languages require separate add and",
-    "subtract functions.  Negative and out of range values are generally",
-    "expected to wrap around rather than represent errors."
+    "adding or subtracting some number of minutes, and testing equality",
+    "in some language-native way.  Negative and out of range values are",
+    "generally expected to wrap around rather than represent errors."
   ],
   "cases": [
     {
@@ -63,134 +61,172 @@ is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes met
         {
           "description": "on the hour",
           "property": "create",
-          "hour": 8,
-          "minute": 0,
+          "input": {
+            "hour": 8,
+            "minute": 0
+          },
           "expected": "08:00"
         },
         {
           "description": "past the hour",
           "property": "create",
-          "hour": 11,
-          "minute": 9,
+          "input": {
+            "hour": 11,
+            "minute": 9
+          },
           "expected": "11:09"
         },
         {
           "description": "midnight is zero hours",
           "property": "create",
-          "hour": 24,
-          "minute": 0,
+          "input": {
+            "hour": 24,
+            "minute": 0
+          },
           "expected": "00:00"
         },
         {
           "description": "hour rolls over",
           "property": "create",
-          "hour": 25,
-          "minute": 0,
+          "input": {
+            "hour": 25,
+            "minute": 0
+          },
           "expected": "01:00"
         },
         {
           "description": "hour rolls over continuously",
           "property": "create",
-          "hour": 100,
-          "minute": 0,
+          "input": {
+            "hour": 100,
+            "minute": 0
+          },
           "expected": "04:00"
         },
         {
           "description": "sixty minutes is next hour",
           "property": "create",
-          "hour": 1,
-          "minute": 60,
+          "input": {
+            "hour": 1,
+            "minute": 60
+          },
           "expected": "02:00"
         },
         {
           "description": "minutes roll over",
           "property": "create",
-          "hour": 0,
-          "minute": 160,
+          "input": {
+            "hour": 0,
+            "minute": 160
+          },
           "expected": "02:40"
         },
         {
           "description": "minutes roll over continuously",
           "property": "create",
-          "hour": 0,
-          "minute": 1723,
+          "input": {
+            "hour": 0,
+            "minute": 1723
+          },
           "expected": "04:43"
         },
         {
           "description": "hour and minutes roll over",
           "property": "create",
-          "hour": 25,
-          "minute": 160,
+          "input": {
+            "hour": 25,
+            "minute": 160
+          },
           "expected": "03:40"
         },
         {
           "description": "hour and minutes roll over continuously",
           "property": "create",
-          "hour": 201,
-          "minute": 3001,
+          "input": {
+            "hour": 201,
+            "minute": 3001
+          },
           "expected": "11:01"
         },
         {
           "description": "hour and minutes roll over to exactly midnight",
           "property": "create",
-          "hour": 72,
-          "minute": 8640,
+          "input": {
+            "hour": 72,
+            "minute": 8640
+          },
           "expected": "00:00"
         },
         {
           "description": "negative hour",
           "property": "create",
-          "hour": -1,
-          "minute": 15,
+          "input": {
+            "hour": -1,
+            "minute": 15
+          },
           "expected": "23:15"
         },
         {
           "description": "negative hour rolls over",
           "property": "create",
-          "hour": -25,
-          "minute": 0,
+          "input": {
+            "hour": -25,
+            "minute": 0
+          },
           "expected": "23:00"
         },
         {
           "description": "negative hour rolls over continuously",
           "property": "create",
-          "hour": -91,
-          "minute": 0,
+          "input": {
+            "hour": -91,
+            "minute": 0
+          },
           "expected": "05:00"
         },
         {
           "description": "negative minutes",
           "property": "create",
-          "hour": 1,
-          "minute": -40,
+          "input": {
+            "hour": 1,
+            "minute": -40
+          },
           "expected": "00:20"
         },
         {
           "description": "negative minutes roll over",
           "property": "create",
-          "hour": 1,
-          "minute": -160,
+          "input": {
+            "hour": 1,
+            "minute": -160
+          },
           "expected": "22:20"
         },
         {
           "description": "negative minutes roll over continuously",
           "property": "create",
-          "hour": 1,
-          "minute": -4820,
+          "input": {
+            "hour": 1,
+            "minute": -4820
+          },
           "expected": "16:40"
         },
         {
           "description": "negative hour and minutes both roll over",
           "property": "create",
-          "hour": -25,
-          "minute": -160,
+          "input": {
+            "hour": -25,
+            "minute": -160
+          },
           "expected": "20:20"
         },
         {
           "description": "negative hour and minutes both roll over continuously",
           "property": "create",
-          "hour": -121,
-          "minute": -5810,
+          "input": {
+            "hour": -121,
+            "minute": -5810
+          },
           "expected": "22:10"
         }
       ]
@@ -201,65 +237,81 @@ is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes met
         {
           "description": "add minutes",
           "property": "add",
-          "hour": 10,
-          "minute": 0,
-          "add": 3,
+          "input": {
+            "hour": 10,
+            "minute": 0,
+            "value": 3
+          },
           "expected": "10:03"
         },
         {
           "description": "add no minutes",
           "property": "add",
-          "hour": 6,
-          "minute": 41,
-          "add": 0,
+          "input": {
+            "hour": 6,
+            "minute": 41,
+            "value": 0
+          },
           "expected": "06:41"
         },
         {
           "description": "add to next hour",
           "property": "add",
-          "hour": 0,
-          "minute": 45,
-          "add": 40,
+          "input": {
+            "hour": 0,
+            "minute": 45,
+            "value": 40
+          },
           "expected": "01:25"
         },
         {
           "description": "add more than one hour",
           "property": "add",
-          "hour": 10,
-          "minute": 0,
-          "add": 61,
+          "input": {
+            "hour": 10,
+            "minute": 0,
+            "value": 61
+          },
           "expected": "11:01"
         },
         {
           "description": "add more than two hours with carry",
           "property": "add",
-          "hour": 0,
-          "minute": 45,
-          "add": 160,
+          "input": {
+            "hour": 0,
+            "minute": 45,
+            "value": 160
+          },
           "expected": "03:25"
         },
         {
           "description": "add across midnight",
           "property": "add",
-          "hour": 23,
-          "minute": 59,
-          "add": 2,
+          "input": {
+            "hour": 23,
+            "minute": 59,
+            "value": 2
+          },
           "expected": "00:01"
         },
         {
           "description": "add more than one day (1500 min = 25 hrs)",
           "property": "add",
-          "hour": 5,
-          "minute": 32,
-          "add": 1500,
+          "input": {
+            "hour": 5,
+            "minute": 32,
+            "value": 1500
+          },
           "expected": "06:32"
         },
         {
           "description": "add more than two days",
           "property": "add",
-          "hour": 1,
-          "minute": 1,
-          "add": 3500,
+          "input": {
+            "hour": 1,
+            "minute": 1,
+            "value": 3500
+          },
           "expected": "11:21"
         }
       ]
@@ -269,66 +321,82 @@ is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes met
       "cases": [
         {
           "description": "subtract minutes",
-          "property": "add",
-          "hour": 10,
-          "minute": 3,
-          "add": -3,
+          "property": "subtract",
+          "input": {
+            "hour": 10,
+            "minute": 3,
+            "value": 3
+          },
           "expected": "10:00"
         },
         {
           "description": "subtract to previous hour",
-          "property": "add",
-          "hour": 10,
-          "minute": 3,
-          "add": -30,
+          "property": "subtract",
+          "input": {
+            "hour": 10,
+            "minute": 3,
+            "value": 30
+          },
           "expected": "09:33"
         },
         {
           "description": "subtract more than an hour",
-          "property": "add",
-          "hour": 10,
-          "minute": 3,
-          "add": -70,
+          "property": "subtract",
+          "input": {
+            "hour": 10,
+            "minute": 3,
+            "value": 70
+          },
           "expected": "08:53"
         },
         {
           "description": "subtract across midnight",
-          "property": "add",
-          "hour": 0,
-          "minute": 3,
-          "add": -4,
+          "property": "subtract",
+          "input": {
+            "hour": 0,
+            "minute": 3,
+            "value": 4
+          },
           "expected": "23:59"
         },
         {
           "description": "subtract more than two hours",
-          "property": "add",
-          "hour": 0,
-          "minute": 0,
-          "add": -160,
+          "property": "subtract",
+          "input": {
+            "hour": 0,
+            "minute": 0,
+            "value": 160
+          },
           "expected": "21:20"
         },
         {
           "description": "subtract more than two hours with borrow",
-          "property": "add",
-          "hour": 6,
-          "minute": 15,
-          "add": -160,
+          "property": "subtract",
+          "input": {
+            "hour": 6,
+            "minute": 15,
+            "value": 160
+          },
           "expected": "03:35"
         },
         {
           "description": "subtract more than one day (1500 min = 25 hrs)",
-          "property": "add",
-          "hour": 5,
-          "minute": 32,
-          "add": -1500,
+          "property": "subtract",
+          "input": {
+            "hour": 5,
+            "minute": 32,
+            "value": 1500
+          },
           "expected": "04:32"
         },
         {
           "description": "subtract more than two days",
-          "property": "add",
-          "hour": 2,
-          "minute": 20,
-          "add": -3000,
+          "property": "subtract",
+          "input": {
+            "hour": 2,
+            "minute": 20,
+            "value": 3000
+          },
           "expected": "00:20"
         }
       ]
@@ -339,195 +407,225 @@ is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes met
         {
           "description": "clocks with same time",
           "property": "equal",
-          "clock1": {
-            "hour": 15,
-            "minute": 37
-          },
-          "clock2": {
-            "hour": 15,
-            "minute": 37
+          "input": {
+            "clock1": {
+              "hour": 15,
+              "minute": 37
+            },
+            "clock2": {
+              "hour": 15,
+              "minute": 37
+            }
           },
           "expected": true
         },
         {
           "description": "clocks a minute apart",
           "property": "equal",
-          "clock1": {
-            "hour": 15,
-            "minute": 36
-          },
-          "clock2": {
-            "hour": 15,
-            "minute": 37
+          "input": {
+            "clock1": {
+              "hour": 15,
+              "minute": 36
+            },
+            "clock2": {
+              "hour": 15,
+              "minute": 37
+            }
           },
           "expected": false
         },
         {
           "description": "clocks an hour apart",
           "property": "equal",
-          "clock1": {
-            "hour": 14,
-            "minute": 37
-          },
-          "clock2": {
-            "hour": 15,
-            "minute": 37
+          "input": {
+            "clock1": {
+              "hour": 14,
+              "minute": 37
+            },
+            "clock2": {
+              "hour": 15,
+              "minute": 37
+            }
           },
           "expected": false
         },
         {
           "description": "clocks with hour overflow",
           "property": "equal",
-          "clock1": {
-            "hour": 10,
-            "minute": 37
-          },
-          "clock2": {
-            "hour": 34,
-            "minute": 37
+          "input": {
+            "clock1": {
+              "hour": 10,
+              "minute": 37
+            },
+            "clock2": {
+              "hour": 34,
+              "minute": 37
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with hour overflow by several days",
           "property": "equal",
-          "clock1": {
-            "hour": 3,
-            "minute": 11
-          },
-          "clock2": {
-            "hour": 99,
-            "minute": 11
+          "input": {
+            "clock1": {
+              "hour": 3,
+              "minute": 11
+            },
+            "clock2": {
+              "hour": 99,
+              "minute": 11
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative hour",
           "property": "equal",
-          "clock1": {
-            "hour": 22,
-            "minute": 40
-          },
-          "clock2": {
-            "hour": -2,
-            "minute": 40
+          "input": {
+            "clock1": {
+              "hour": 22,
+              "minute": 40
+            },
+            "clock2": {
+              "hour": -2,
+              "minute": 40
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative hour that wraps",
           "property": "equal",
-          "clock1": {
-            "hour": 17,
-            "minute": 3
-          },
-          "clock2": {
-            "hour": -31,
-            "minute": 3
+          "input": {
+            "clock1": {
+              "hour": 17,
+              "minute": 3
+            },
+            "clock2": {
+              "hour": -31,
+              "minute": 3
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative hour that wraps multiple times",
           "property": "equal",
-          "clock1": {
-            "hour": 13,
-            "minute": 49
-          },
-          "clock2": {
-            "hour": -83,
-            "minute": 49
+          "input": {
+            "clock1": {
+              "hour": 13,
+              "minute": 49
+            },
+            "clock2": {
+              "hour": -83,
+              "minute": 49
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with minute overflow",
           "property": "equal",
-          "clock1": {
-            "hour": 0,
-            "minute": 1
-          },
-          "clock2": {
-            "hour": 0,
-            "minute": 1441
+          "input": {
+            "clock1": {
+              "hour": 0,
+              "minute": 1
+            },
+            "clock2": {
+              "hour": 0,
+              "minute": 1441
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with minute overflow by several days",
           "property": "equal",
-          "clock1": {
-            "hour": 2,
-            "minute": 2
-          },
-          "clock2": {
-            "hour": 2,
-            "minute": 4322
+          "input": {
+            "clock1": {
+              "hour": 2,
+              "minute": 2
+            },
+            "clock2": {
+              "hour": 2,
+              "minute": 4322
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative minute",
           "property": "equal",
-          "clock1": {
-            "hour": 2,
-            "minute": 40
-          },
-          "clock2": {
-            "hour": 3,
-            "minute": -20
+          "input": {
+            "clock1": {
+              "hour": 2,
+              "minute": 40
+            },
+            "clock2": {
+              "hour": 3,
+              "minute": -20
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative minute that wraps",
           "property": "equal",
-          "clock1": {
-            "hour": 4,
-            "minute": 10
-          },
-          "clock2": {
-            "hour": 5,
-            "minute": -1490
+          "input": {
+            "clock1": {
+              "hour": 4,
+              "minute": 10
+            },
+            "clock2": {
+              "hour": 5,
+              "minute": -1490
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative minute that wraps multiple times",
           "property": "equal",
-          "clock1": {
-            "hour": 6,
-            "minute": 15
-          },
-          "clock2": {
-            "hour": 6,
-            "minute": -4305
+          "input": {
+            "clock1": {
+              "hour": 6,
+              "minute": 15
+            },
+            "clock2": {
+              "hour": 6,
+              "minute": -4305
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative hours and minutes",
           "property": "equal",
-          "clock1": {
-            "hour": 7,
-            "minute": 32
-          },
-          "clock2": {
-            "hour": -12,
-            "minute": -268
+          "input": {
+            "clock1": {
+              "hour": 7,
+              "minute": 32
+            },
+            "clock2": {
+              "hour": -12,
+              "minute": -268
+            }
           },
           "expected": true
         },
         {
           "description": "clocks with negative hours and minutes that wrap",
           "property": "equal",
-          "clock1": {
-            "hour": 18,
-            "minute": 7
-          },
-          "clock2": {
-            "hour": -54,
-            "minute": -11513
+          "input": {
+            "clock1": {
+              "hour": 18,
+              "minute": 7
+            },
+            "clock2": {
+              "hour": -54,
+              "minute": -11513
+            }
           },
           "expected": true
         }
@@ -535,5 +633,4 @@ is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes met
     }
   ]
 }
-
 =end code