trackler 2.2.1.19 → 2.2.1.20

data/tracks/objective-c/exercises/rna-transcription/RNATranscriptionExample.m

@@ -8,39 +8,18 @@
                                     @"C" : @"G",
                                     @"T" : @"A",
                                     @"A" : @"U" };
-    
-    NSArray *dnaKeys = [dnaToRNADict allKeys];
-    NSString *dnaKeyString = [dnaKeys componentsJoinedByString:@""];
-    NSCharacterSet *invertedSet = [[NSCharacterSet characterSetWithCharactersInString:dnaKeyString] invertedSet];
-    NSRange invertedSetRange = [dnaStrand rangeOfCharacterFromSet:invertedSet];
-    if (invertedSetRange.location != NSNotFound) {
-        return nil;
+
+    NSMutableString *rnaStrand = [NSMutableString stringWithString:dnaStrand];
+
+    for (NSUInteger i = 0; i < [dnaStrand length]; i++) {
+        NSRange charRange = [dnaStrand rangeOfComposedCharacterSequenceAtIndex:i];
+        NSString *dnaNucleotide = [dnaStrand substringWithRange:charRange];
+        NSString *rnaNucleotide = dnaToRNADict[dnaNucleotide];
+        if (!rnaNucleotide) return nil;
+        [rnaStrand replaceCharactersInRange:charRange withString:rnaNucleotide];
     }
-    
-    NSMutableString *rna = [NSMutableString stringWithString:dnaStrand];
-    NSMutableDictionary *dnaToRnaRanges = [NSMutableDictionary dictionary];
-    
-    [[dnaToRNADict allKeys] enumerateObjectsUsingBlock:^(NSString *dnaKey, NSUInteger idx, BOOL * _Nonnull stop) {
-        NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:dnaKey options:0 error:NULL];
-        NSMutableArray *ranges = [NSMutableArray array];
-        
-        [regex enumerateMatchesInString:dnaStrand options:0 range:NSMakeRange(0, [dnaStrand length]) usingBlock:^(NSTextCheckingResult * _Nullable match, NSMatchingFlags flags, BOOL * _Nonnull stop) {
-            NSRange range = [match rangeAtIndex:0];
-            [ranges addObject:[NSValue valueWithRange:range]];
-        }];
-        
-        dnaToRnaRanges[dnaKey] = [ranges copy];
-    }];
-    
-    [dnaToRNADict enumerateKeysAndObjectsUsingBlock:^(NSString *dnaKey, NSString *rnaValue, BOOL * _Nonnull stop) {
-        NSArray *dnaRanges = dnaToRnaRanges[dnaKey];
-        
-        [dnaRanges enumerateObjectsUsingBlock:^(NSValue *dnaRangeValue, NSUInteger idx, BOOL * _Nonnull stop) {
-            [rna replaceOccurrencesOfString:dnaKey withString:rnaValue options:NSLiteralSearch range:[dnaRangeValue rangeValue]];
-        }];
-    }];
-    
-    return [rna copy];
+
+    return [rnaStrand copy];
 }
 
 @end

data/tracks/ocaml/.travis-ci.sh

@@ -2,7 +2,7 @@
 OPAM_DEPENDS="ocamlfind core ounit react"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
-    4.04.1,1.2.2) ppa=avsm/ocaml42+opam12 ;;
+    4.05.0,1.2.2) ppa=avsm/ocaml42+opam12 ;;
     *) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
 esac
 

data/tracks/ocaml/.travis.yml

@@ -6,4 +6,4 @@ script:
   - bin/configlet lint .
 
 env:
-  - OCAML_VERSION=4.04.1 OPAM_VERSION=1.2.2
+  - OCAML_VERSION=4.05.0 OPAM_VERSION=1.2.2

data/tracks/ocaml/README.md

@@ -11,7 +11,7 @@ notes contain a few details specific to Ocaml.
 
 ## Prerequisites
 
-The OCaml track assumes installation of OCaml version 4.04.1, and installation of Core, OUnit, and React (for the Hangman exercise).
+The OCaml track assumes installation of OCaml version 4.05.0, and installation of Core, OUnit, and React (for the Hangman exercise).
 Assuming you have opam, these can be installed with
 ```bash
 opam install core ounit react

data/tracks/ocaml/exercises/change/test.ml

@@ -1,4 +1,4 @@
-(* Test/exercise version: "1.0.0" *)
+(* Test/exercise version: "1.1.0" *)
 
 open Core
 open OUnit2
@@ -9,35 +9,38 @@ let ae exp got _test_ctxt = assert_equal ~printer exp got
 
 let tests = [
    "single coin change" >::
-      ae (Some [25]) 
-         (make_change ~target:25 ~coins:[1; 5; 10; 25; 100]);
+     ae (Some [25]) 
+       (make_change ~target:25 ~coins:[1; 5; 10; 25; 100]);
    "multiple coin change" >::
-      ae (Some [5; 10]) 
-         (make_change ~target:15 ~coins:[1; 5; 10; 25; 100]);
+     ae (Some [5; 10]) 
+       (make_change ~target:15 ~coins:[1; 5; 10; 25; 100]);
    "change with Lilliputian Coins" >::
-      ae (Some [4; 4; 15]) 
-         (make_change ~target:23 ~coins:[1; 4; 15; 20; 50]);
+     ae (Some [4; 4; 15]) 
+       (make_change ~target:23 ~coins:[1; 4; 15; 20; 50]);
    "change with Lower Elbonia Coins" >::
-      ae (Some [21; 21; 21]) 
-         (make_change ~target:63 ~coins:[1; 5; 10; 21; 25]);
+     ae (Some [21; 21; 21]) 
+       (make_change ~target:63 ~coins:[1; 5; 10; 21; 25]);
    "large target values" >::
-      ae (Some [2; 2; 5; 20; 20; 50; 100; 100; 100; 100; 100; 100; 100; 100; 100]) 
-         (make_change ~target:999 ~coins:[1; 2; 5; 10; 20; 50; 100]);
+     ae (Some [2; 2; 5; 20; 20; 50; 100; 100; 100; 100; 100; 100; 100; 100; 100]) 
+       (make_change ~target:999 ~coins:[1; 2; 5; 10; 20; 50; 100]);
    "possible change without unit coins available" >::
-      ae (Some [2; 2; 2; 5; 10]) 
-         (make_change ~target:21 ~coins:[2; 5; 10; 20; 50]);
+     ae (Some [2; 2; 2; 5; 10]) 
+       (make_change ~target:21 ~coins:[2; 5; 10; 20; 50]);
+   "another possible change without unit coins available" >::
+     ae (Some [4; 4; 4; 5; 5; 5]) 
+       (make_change ~target:27 ~coins:[4; 5]);
    "no coins make 0 change" >::
-      ae (Some []) 
-         (make_change ~target:0 ~coins:[1; 5; 10; 21; 25]);
+     ae (Some []) 
+       (make_change ~target:0 ~coins:[1; 5; 10; 21; 25]);
    "error testing for change smaller than the smallest of coins" >::
-      ae None 
-         (make_change ~target:3 ~coins:[5; 10]);
+     ae None 
+       (make_change ~target:3 ~coins:[5; 10]);
    "error if no combination can add up to target" >::
-      ae None 
-         (make_change ~target:94 ~coins:[5; 10]);
+     ae None 
+       (make_change ~target:94 ~coins:[5; 10]);
    "cannot find negative change values" >::
-      ae None 
-         (make_change ~target:(-5) ~coins:[1; 2; 5]);
+     ae None 
+       (make_change ~target:(-5) ~coins:[1; 2; 5]);
 ]
 
 let () =

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

@@ -3,8 +3,6 @@ open Core
 open Model
 open Yojson.Basic
 
-type edit_expected_function = value: json -> string
-
 type edit_parameters_function = (string * json) list -> (string * string) list
 
 type subst = Subst of string [@@deriving eq, show]
@@ -18,13 +16,11 @@ let replace_key (key: string) (value: string) (target: string): string =
   let replace = String.substr_replace_all ~with_:value in
   replace ~pattern:("$" ^ key) target |> replace ~pattern:("$(" ^ key ^ ")")
 
-let rec replace_keys (f: edit_expected_function) (ed: edit_parameters_function) (s: string) (suite_name: string) (c: case): subst =
+let rec replace_keys (ed: edit_parameters_function) (s: string) (suite_name: string) (c: case): subst =
   let s = replace_key "description" c.description s in
-  let expected = f ~value:c.expected in
-  let s = replace_key "expected" expected s in
   let s = replace_key "suite-name" suite_name s in
   let parameter_strings = ed @@ List.map ~f:(fun (k,p) -> (k,p)) c.parameters in
   List.fold parameter_strings ~init:(Subst s) ~f:(fun (Subst s) (k,v) -> Subst (replace_key k v s))
 
-let fill_in_template (f: edit_expected_function) (ed: edit_parameters_function) (test_template: string) (suite_name: string) (cases: case list) =
-  List.map cases ~f:(replace_keys f ed test_template suite_name)
+let fill_in_template (ed: edit_parameters_function) (test_template: string) (suite_name: string) (cases: case list) =
+  List.map cases ~f:(replace_keys ed test_template suite_name)

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

@@ -39,13 +39,12 @@ let prepend_version (version_printer: string -> string) (v: string option) (str:
 let generate_code ~(lc: language_config) ~(slug: string) ~(template_file: content) ~(canonical_data_file: content): (content, string) Result.t =
   let open Result.Monad_infix in
   Result.of_option ~error:("cannot recognize file for " ^ slug ^ " as a template") @@ find_template template_file lc.test_start_marker lc.test_end_marker >>= fun template ->
-  let edit_expected = lc.edit_expected ~stringify:json_to_string ~slug in
-  let edit_parameters = edit_parameters ~slug in
-  let fill_in_template = fill_in_template edit_expected edit_parameters in
+  let edit_parameters = lc.edit_parameters ~slug in
+  let fill_in_template = fill_in_template edit_parameters in
   let file_text = template.file_text in
   let file_lines = String.split_lines file_text |> List.to_array in
   let prepend_version = prepend_version lc.version_printer in
-  parse_json_text canonical_data_file "expected" "cases"
+  parse_json_text canonical_data_file "cases"
   |> Result.map_error ~f:show_error >>| simplify_single_test_suite >>= fun cd -> (match cd.tests with
       | Single cases ->
         let template = to_single template.template in
@@ -89,7 +88,7 @@ let check_canonical_data canonical_data_folder =
   let canonical_data_files = List.sort canonical_data_files ~cmp:(fun (s1, _) (s2, _) -> String.compare s1 s2) in
   let total_count = List.length canonical_data_files in
   List.iter canonical_data_files ~f:(fun (slug, text) ->
-    match parse_json_text text "expected" "cases" with
+    match parse_json_text text "cases" with
     | Error e -> print_endline @@ slug ^ ": " ^ (show_error e)
     | _ -> ok_count := !ok_count + 1
   );

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

@@ -1,6 +1,7 @@
 open Core
 open Yojson.Basic
 include Ocaml_special_cases 
+include Purescript_special_cases 
 
 type language_config = {
   template_file_name: string;
@@ -8,7 +9,7 @@ type language_config = {
   test_start_marker: string;
   test_end_marker: string;
   version_printer: string -> string;
-  edit_expected: stringify: (json -> string) -> slug: string -> value: json -> string;
+  edit_parameters: slug: string -> (string * json) list -> (string * string) list;
 }
 
 let default_language_config = function
@@ -18,7 +19,7 @@ let default_language_config = function
     test_start_marker = "(* TEST"; 
     test_end_marker = "END TEST";
     version_printer = (fun v -> "(* Test/exercise version: \"" ^ v ^ "\" *)\n\n");
-    edit_expected = ocaml_edit_expected;
+    edit_parameters = ocaml_edit_parameters
     }
 | "purescript" ->  {
     template_file_name = "Main.purs"; 
@@ -26,7 +27,7 @@ let default_language_config = function
     test_start_marker = "--TEST"; 
     test_end_marker = "--END TEST";
     version_printer = (fun v -> "-- Test/exercise version: \"" ^ v ^ "\"\n\n");
-    edit_expected = Purescript_special_cases.edit_expected;
+    edit_parameters = purescript_edit_parameters
     }
 | x -> failwith @@ "unknown language " ^ x
 

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

@@ -5,8 +5,7 @@ open Yojson.Basic
 
 type case = {
   description: string;
-  parameters: (string * json) list;
-  expected: json;
+  parameters: (string * json) list
 }
 
 type test = {name: string; cases: case list}

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

@@ -62,21 +62,10 @@ let edit_bowling_expected (value: json) = match value with
     if k = "error" then "(Error " ^ json_to_string v ^ ")" else failwith ("Can only handle error value but got " ^ k)
 | _ -> failwith "Bad json value in bowling"
 
-let ocaml_edit_expected ~(stringify: json -> string) ~(slug: string) ~(value: json) = match slug with
-| "hamming" -> optional_int ~none:(-1) value
-| "all-your-base" -> optional_int_list value
-| "say" -> optional_int_or_string ~none:(-1) value
-| "phone-number" -> option_of_null value
-| "connect" -> edit_connect_expected value
-| "change" -> edit_change_expected value
-| "bowling" -> edit_bowling_expected value
-| "binary-search" -> optional_int ~none:(-1) value
-| "forth" -> option_of_null value
-| _ -> stringify value
-
 let edit_say (ps: (string * json) list) =
   let edit = function
   | ("input", v) -> ("input", let v = json_to_string v in if Int.of_string v >= 0 then "(" ^ v ^ "L)" else v ^ "L")
+  | ("expected", v) -> ("expected", optional_int_or_string ~none:(-1) v)
   | (k, ps) -> (k, json_to_string ps) in
   List.map ps ~f:edit
 
@@ -84,6 +73,7 @@ let edit_all_your_base (ps: (string * json) list): (string * string) list =
   let edit = function
   | ("output_base", v) -> let v = json_to_string v in ("output_base", if Int.of_string v >= 0 then v else "(" ^ v ^ ")")
   | ("input_base", v) -> let v = json_to_string v in ("input_base", if Int.of_string v >= 0 then v else "(" ^ v ^ ")")
+  | ("expected", v) -> ("expected", optional_int_list v)
   | (k, v) -> (k, json_to_string v) in
   List.map ps ~f:edit
 
@@ -96,7 +86,6 @@ let edit_dominoes (ps: (string * json) list): (string * string) list =
   | (k, v) -> (k, json_to_string v) in
   List.map ps ~f:edit
 
-
 let edit_space_age (ps: (string * json) list): (string * string) list =
   let edit = function
   | ("planet", v) -> ("planet", json_to_string v |> strip_quotes) 
@@ -107,6 +96,7 @@ let edit_bowling (ps: (string * json) list): (string * string) list =
   let edit = function
   | ("property", v) -> ("property", json_to_string v |> strip_quotes) 
   | ("roll", `Int n) -> ("roll", let s = Int.to_string n in if n < 0 then ("(" ^ s ^ ")") else s)
+  | ("expected", v) -> ("expected", edit_bowling_expected v)
   | (k, v) -> (k, json_to_string v) in
   List.map ps ~f:edit
 
@@ -117,15 +107,26 @@ let edit_binary_search (ps: (string * json) list): (string * string) list =
     "[|" ^ String.concat ~sep:"; " xs ^ "|]" in
   let edit = function
   | ("array", v) -> ("array", as_array_string v) 
+  | ("expected", v) -> ("expected", optional_int ~none:(-1) v)
   | (k, v) -> (k, json_to_string v) in
   List.map ps ~f:edit
 
-let edit_parameters ~(slug: string) (parameters: (string * json) list) = match (slug, parameters) with
-| ("hello-world", ps) -> default_value ~key:"name" ~value:"None" (optional_strings ~f:(fun _x -> true) parameters)
-| ("say", ps) -> edit_say ps
+let rec edit_expected ~(f: json -> string) (parameters: (string * json) list) = match parameters with
+  | [] -> []
+  | ("expected", v) :: rest -> ("expected", f v) :: edit_expected f rest
+  | (k, v) :: rest -> (k, json_to_string v) :: edit_expected f rest
+
+let ocaml_edit_parameters ~(slug: string) (parameters: (string * json) list) = match (slug, parameters) with
 | ("all-your-base", ps) -> edit_all_your_base ps
+| ("binary-search", ps) -> edit_binary_search ps
+| ("bowling", ps) -> edit_bowling ps
+| ("change", ps) -> edit_expected ~f:edit_change_expected ps
+| ("connect", ps) -> edit_expected ~f:edit_connect_expected ps
 | ("dominoes", ps) -> edit_dominoes ps
+| ("forth", ps) -> edit_expected ~f:option_of_null ps
+| ("hamming", ps) -> edit_expected ~f:(optional_int ~none:(-1)) ps
+| ("hello-world", ps) -> default_value ~key:"name" ~value:"None" (optional_strings ~f:(fun _ -> true) parameters)
+| ("phone-number", ps) -> edit_expected ~f:option_of_null ps
+| ("say", ps) -> edit_say ps
 | ("space-age", ps) -> edit_space_age ps
-| ("bowling", ps) -> edit_bowling ps
-| ("binary-search", ps) -> edit_binary_search ps
 | (_, ps) -> map_elements json_to_string ps

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

@@ -6,20 +6,18 @@ open Model
 
 type error =
     TestMustHaveKeyCalledCases of string | ExpectingListOfCases | ExpectingMapForCase |
-    NoDescription | BadDescription | NoExpected of string | BadExpected | UnrecognizedJson [@@deriving eq, show]
+    NoDescription | BadDescription | UnrecognizedJson [@@deriving eq, show]
 
-let parse_case_assoc (parameters: (string * json) list) (expected_key: string): (case, error) Result.t =
+let parse_case_assoc (parameters: (string * json) list): (case, error) Result.t =
   let find name e = List.Assoc.find parameters ~equal:String.equal name |> Result.of_option ~error:e in
   let test_parameters = List.Assoc.remove parameters ~equal:String.equal "description" in
-  let test_parameters = List.Assoc.remove test_parameters ~equal:String.equal expected_key in
   let open Result.Monad_infix in
   find "description" NoDescription >>=
   to_string_note BadDescription >>= fun description ->
-  find expected_key (NoExpected description) >>= fun expected ->
-  Ok {description = description; parameters = test_parameters; expected = expected}
+  Ok {description = description; parameters = test_parameters}
 
-let parse_case (expected_key: string) (s: json): (case, error) Result.t = match s with
-  | `Assoc assoc -> parse_case_assoc assoc expected_key
+let parse_case (s: json): (case, error) Result.t = match s with
+  | `Assoc assoc -> parse_case_assoc assoc
   | _ -> Error ExpectingMapForCase
 
 let parse_cases (text: string) (cases_key: string): (json, error) Result.t =
@@ -27,11 +25,11 @@ let parse_cases (text: string) (cases_key: string): (json, error) Result.t =
     | `Null -> Error (TestMustHaveKeyCalledCases cases_key)
     | json -> Ok json
 
-let parse_single (text: string) (expected_key: string) (cases_key: string): (tests, error) Result.t =
+let parse_single (text: string) (cases_key: string): (tests, error) Result.t =
   let open Result.Monad_infix in
   parse_cases text cases_key >>=
   to_list_note ExpectingListOfCases >>=
-  (sequence >> (List.map ~f:(parse_case expected_key))) >>= fun ts ->
+  (sequence >> (List.map ~f:parse_case)) >>= fun ts ->
   Result.return (Single ts)
 
 let rec to_cases case: (case list, error) Result.t = 
@@ -43,8 +41,7 @@ let rec to_cases case: (case list, error) Result.t =
       List.map cases ~f:(to_assoc_note UnrecognizedJson) |> sequence >>= fun x ->
       List.map x ~f:to_cases |> sequence |> Result.map ~f:List.concat
   | None -> 
-      find_note case "expected" (NoExpected "expected") >>= fun expected ->
-      Result.return [{description = desc; parameters = case; expected = expected}]
+      Result.return [{description = desc; parameters = case}]
 
 let convert_cases_description_to_name desc =
   String.lowercase desc |> String.substr_replace_all ~pattern:" " ~with_:"_"
@@ -63,19 +60,19 @@ let suite_cases (json: json) (cases_key: string): (test list, error) Result.t =
   (member cases_key json |> to_list_note ExpectingListOfCases) >>= fun assoc_cases ->
   List.map ~f:suite_case assoc_cases |> sequence
 
-let parse_cases_from_suite name suite expected_key cases_key =
+let parse_cases_from_suite name suite cases_key =
   let open Result.Monad_infix in
   member_note (TestMustHaveKeyCalledCases name) cases_key suite >>=
   to_list_note ExpectingListOfCases >>= fun tests ->
-  List.map tests ~f:(parse_case expected_key) |> sequence
+  List.map tests ~f:parse_case |> sequence
 
-let parse_json_text (text: string) (expected_key: string) (cases_key: string): (canonical_data, error) Result.t =
+let parse_json_text (text: string) (cases_key: string): (canonical_data, error) Result.t =
   let open Result.Monad_infix in
   let json = from_string text in
   let version = member "version" json |> to_string_option in
   match suite_cases json cases_key with
   | Ok suite_cases -> Ok {version; tests=(Suite suite_cases)}
-  | Error _ -> parse_single text expected_key cases_key >>= fun tests -> Ok {version; tests}
+  | Error _ -> parse_single text cases_key >>= fun tests -> Ok {version; tests}
                 
 let show_error = function
   | TestMustHaveKeyCalledCases name -> "Test named '" ^ name ^ "' is expected to have an object with a key: 'cases'"
@@ -83,6 +80,4 @@ let show_error = function
   | ExpectingListOfCases -> "Expected a top level map with key cases, and a list of cases as its value."
   | NoDescription -> "Case is missing a description."
   | BadDescription -> "Description is not a string."
-  | NoExpected s -> "Case '" ^ s ^ "' is missing an expected key."
-  | BadExpected -> "Do not understand type of Expected key."
   | UnrecognizedJson -> "Cannot understand this json."

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

@@ -3,11 +3,19 @@ open Core
 open Model
 open Yojson.Basic
 
+let map_elements (to_str: json -> string) (parameters: (string * json) list): (string * string) list =
+  List.map parameters ~f:(fun (k,j) -> (k,to_str j))
+
 let optional_int ~(none: int) = function
 | `Int n when n = none -> "Nothing"
 | `Int n -> "(Just " ^ Int.to_string n ^ ")"
 | x -> json_to_string x
 
-let edit_expected ~(stringify: json -> string) ~(slug: string) ~(value: json) = match slug with
-| "hamming" -> optional_int ~none:(-1) value
-| _ -> stringify value
+let rec edit_expected ~(f: json -> string) (parameters: (string * json) list) = match parameters with
+| [] -> []
+| ("expected", v) :: rest -> ("expected", f v) :: edit_expected f rest
+| (k, v) :: rest -> (k, json_to_string v) :: edit_expected f rest
+
+let purescript_edit_parameters ~(slug: string) (parameters: (string * json) list) = match (slug, parameters) with
+| ("hamming", ps) -> edit_expected ~f:(optional_int ~none:(-1)) ps
+| (_, ps) -> map_elements json_to_string ps

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

@@ -6,12 +6,11 @@ open Yojson.Basic
 
 let leap_template = "\"$description\" >:: ae $expected (leap_year $input);"
 
-let edit_expected ~value = json_to_string value
 let edit_parameters (j: (string * json) list): (string * string) list = 
     List.map ~f:(fun (k,v) -> (k,to_string v)) j
 let assert_fill_in_template exp cases = assert_equal exp
     ~printer:(fun xs -> "[" ^ (String.concat ~sep:";" xs) ^ "]")
-    (fill_in_template edit_expected edit_parameters leap_template "suite-name" cases |> List.map ~f:subst_to_string)
+    (fill_in_template edit_parameters leap_template "suite-name" cases |> List.map ~f:subst_to_string)
 let ae exp cases _test_ctxt = assert_fill_in_template exp cases
 
 let codegen_tests = [
@@ -19,7 +18,7 @@ let codegen_tests = [
   ae [] [];
 
   "generates one function based on leap year for one case" >::(fun ctxt ->
-      let c = {description = "leap_year"; parameters = [("input", `Int 1996)]; expected = `Bool true} in
+      let c = {description = "leap_year"; parameters = [("input", `Int 1996); ("expected", `Bool true)];} in
       assert_fill_in_template ["\"leap_year\" >:: ae true (leap_year 1996);"] [c]
     );
 ]