trackler 2.0.8.22 → 2.0.8.23

data/tracks/ocaml/exercises/beer-song/test.ml

@@ -25,22 +25,30 @@ let zip s1 s2 =
 
 let verse_tests = [
    "first generic verse" >::
-     ae "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" (verse 99);
+     ae "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" 
+     (verse 99);
    "last generic verse" >::
-     ae "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" (verse 3);
+     ae "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" 
+     (verse 3);
    "verse 2" >::
-     ae "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" (verse 2);
+     ae "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" 
+     (verse 2);
    "verse 1" >::
-     ae "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" (verse 1);
+     ae "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" 
+     (verse 1);
    "verse 0" >::
-     ae "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" (verse 0);
+     ae "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" 
+     (verse 0);
 ]
 
+
 let lyrics_tests = [
    "first two verses" >::
-     ae "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" (lyrics ~from:99 ~until:98);
+     ae "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" 
+     (lyrics ~from:99 ~until:98);
    "last three verses" >::
-     ae "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" (lyrics ~from:2 ~until:0);
+     ae "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" 
+     (lyrics ~from:2 ~until:0);
    "all verses" >::
      ae "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" 
      (lyrics ~from:99 ~until:0);

data/tracks/ocaml/exercises/phone-number/test.ml

@@ -18,11 +18,11 @@ let tests = [
     ae (Some "1234567890") (number "123 456   7890   ");
   "invalid when 9 digits" >::
     ae None (number "123456789");
-  "invalid when 11 digits" >::
+  "invalid when 11 digits does not start with a 1" >::
     ae None (number "21234567890");
   "valid when 11 digits and starting with 1" >::
     ae (Some "1234567890") (number "11234567890");
-  "invalid when 12 digits" >::
+  "invalid when more than 11 digits" >::
     ae None (number "321234567890");
   "invalid with letters" >::
     ae None (number "123-abc-7890");

data/tracks/ocaml/exercises/prime-factors/test.ml

@@ -1,31 +1,35 @@
 open Core.Std
 open OUnit2
+open Prime_factors
 
 (* Assert Equals *)
 let ae exp got _test_ctxt =
   let printer = List.to_string ~f:Int64.to_string in
   assert_equal exp got ~printer
 
+let to_int64s = List.map ~f:Int64.of_int
+
 (* 64 bits integers are needed for the last number.
  *
  * If you happen to use a 64 bits machine normal ints would do as well, but this
  * works for everybody.
  *)
-let test_pairs =
-    [([],                    1L);
-     ([2L],                  2L);
-     ([3L],                  3L);
-     ([2L; 2L],              4L);
-     ([2L; 2L; 2L],          8L);
-     ([3L; 3L],              9L);
-     ([3L; 3L; 3L],          27L);
-     ([5L; 5L; 5L; 5L],      625L);
-     ([5L; 17L; 23L; 461L],  901255L);
-     ([11L; 9539L; 894119L], 93819012551L)]
-
-let tests =
-  let f (l, n) = (Int64.to_string n) >:: ae l (Prime_factors.factors_of n) in
-  List.map ~f test_pairs
+let tests = [
+   "no factors" >::
+      ae (to_int64s []) (factors_of 1L);
+   "prime number" >::
+      ae (to_int64s [2]) (factors_of 2L);
+   "square of a prime" >::
+      ae (to_int64s [3; 3]) (factors_of 9L);
+   "cube of a prime" >::
+      ae (to_int64s [2; 2; 2]) (factors_of 8L);
+   "product of primes and non-primes" >::
+      ae (to_int64s [2; 2; 3]) (factors_of 12L);
+   "product of primes" >::
+      ae (to_int64s [5; 17; 23; 461]) (factors_of 901255L);
+   "factors include a large prime" >::
+      ae (to_int64s [11; 9539; 894119]) (factors_of 93819012551L);
+]
 
 let () =
-  run_test_tt_main ("prime-factors tests" >::: tests)
+  run_test_tt_main ("prime-factors tests" >::: tests)

data/tracks/ocaml/exercises/roman-numerals/test.ml

@@ -2,28 +2,46 @@ open Core.Std
 open OUnit2
 open Roman_numerals
 
-let checks exp inp _ctx = assert_equal ~printer:Fn.id  exp (to_roman inp)
+let ae expected actual _ctx = assert_equal ~printer:Fn.id expected actual
 
-let tests =   
-    [ "1 to I"         >:: checks "I"   1
-    ; "2 to II"        >:: checks "II"  2
-    ; "3 to III"       >:: checks "III" 3
-    ; "4 to IV"        >:: checks "IV"  4
-    ; "5 to V"         >:: checks "V"   5
-    ; "6 to VI"        >:: checks "VI"  6
-    ; "9 to IX"        >:: checks "IX"  9
-    ; "27 to XXVII"    >:: checks "XXVII"  27
-    ; "48 to XLVIII"   >:: checks "XLVIII" 48
-    ; "59 to LIX"      >:: checks "LIX"    59
-    ; "93 to XCIII"    >:: checks "XCIII"  93
-    ; "141 to CXLI"    >:: checks "CXLI"   141
-    ; "163 to CLXIII"  >:: checks "CLXIII" 163
-    ; "402 to CDII"    >:: checks "CDII"   402
-    ; "575 to DLXXV"   >:: checks "DLXXV"  575
-    ; "911 to CMXI"    >:: checks "CMXI"   911
-    ; "1024 to MXXIV"  >:: checks "MXXIV"  1024
-    ; "3000 to MMM"    >:: checks "MMM"    3000
-    ]
+let tests = [
+   "1 is a single I" >::
+      ae "I" (to_roman 1);
+   "2 is two I's" >::
+      ae "II" (to_roman 2);
+   "3 is three I's" >::
+      ae "III" (to_roman 3);
+   "4, being 5 - 1, is IV" >::
+      ae "IV" (to_roman 4);
+   "5 is a single V" >::
+      ae "V" (to_roman 5);
+   "6, being 5 + 1, is VI" >::
+      ae "VI" (to_roman 6);
+   "9, being 10 - 1, is IX" >::
+      ae "IX" (to_roman 9);
+   "20 is two X's" >::
+      ae "XXVII" (to_roman 27);
+   "48 is not 50 - 2 but rather 40 + 8" >::
+      ae "XLVIII" (to_roman 48);
+   "50 is a single L" >::
+      ae "LIX" (to_roman 59);
+   "90, being 100 - 10, is XC" >::
+      ae "XCIII" (to_roman 93);
+   "100 is a single C" >::
+      ae "CXLI" (to_roman 141);
+   "60, being 50 + 10, is LX" >::
+      ae "CLXIII" (to_roman 163);
+   "400, being 500 - 100, is CD" >::
+      ae "CDII" (to_roman 402);
+   "500 is a single D" >::
+      ae "DLXXV" (to_roman 575);
+   "900, being 1000 - 100, is CM" >::
+      ae "CMXI" (to_roman 911);
+   "1000 is a single M" >::
+      ae "MXXIV" (to_roman 1024);
+   "3000 is three M's" >::
+      ae "MMM" (to_roman 3000);
+]
 
 let () =
-    run_test_tt_main ("roman-numerals test" >::: tests) 
+    run_test_tt_main ("roman-numerals test" >::: tests) 

data/tracks/ocaml/exercises/run-length-encoding/test.ml

@@ -4,7 +4,7 @@ open Run_length_encoding
 
 let ae exp got _test_ctxt = assert_equal exp got ~printer:Fn.id
 
-let run_length_encode_a_string_tests = [
+let encode_tests = [
    "empty string" >::
      ae "" (encode "");
    "single characters only are encoded without count" >::
@@ -19,7 +19,8 @@ let run_length_encode_a_string_tests = [
      ae "2a3b4c" (encode "aabbbcccc");
 ]
 
-let run_length_decode_a_string_tests = [
+
+let decode_tests = [
    "empty string" >::
      ae "" (decode "");
    "single characters only" >::
@@ -34,13 +35,14 @@ let run_length_decode_a_string_tests = [
      ae "aabbbcccc" (decode "2a3b4c");
 ]
 
+
 let encode_and_then_decode_tests = [
    "encode followed by decode gives original string" >::
-     ae "zzz ZZ  zZ" (decode @@ encode "zzz ZZ  zZ");
+     ae "zzz ZZ  zZ" (encode "zzz ZZ  zZ" |> decode);
 ]
 
 let () =
   run_test_tt_main (
     "run length encoding tests" >:::
-      List.concat [run_length_encode_a_string_tests; run_length_decode_a_string_tests; encode_and_then_decode_tests]
+      List.concat [encode_tests; decode_tests; encode_and_then_decode_tests]
   )

data/tracks/ocaml/exercises/space-age/test.ml

@@ -3,44 +3,29 @@ open OUnit2
 open Space_age
 
 (* Assert In Delta *)
-let aid ~d:delta exp got =
+let ae ~delta:delta exp got _ctxt =
   let msg = sprintf "Expected %f got %f, difference is greater than %f"
                     exp got delta in
   assert_bool msg (cmp_float ~epsilon:delta exp got)
 
-let tests =
-  ["age in Earth years">:: (fun _ ->
-    let input = 1_000_000_000 in
-    aid ~d:0.005 31.69 (age_on Earth input));
-   "age in Mercury years">:: (fun _ ->
-    let input = 2_134_835_688 in
-    aid ~d:0.005 67.65 (age_on Earth input);
-    aid ~d:0.005 280.88 (age_on Mercury input));
-   "age in Venus years">:: (fun _ -> 
-    let input = 189_839_836 in
-    aid ~d:0.005 6.02 (age_on Earth input);
-    aid ~d:0.005 9.78 (age_on Venus input));
-   "age in Mars years">:: (fun _ ->
-    let input = 2_329_871_239 in
-    aid ~d:0.005 73.83 (age_on Earth input);
-    aid ~d:0.005 39.25 (age_on Mars input));
-   "age in Jupiter years">:: (fun _ ->
-    let input = 901_876_382 in
-    aid ~d:0.005 28.58 (age_on Earth input);
-    aid ~d:0.005 2.41 (age_on Jupiter input));
-   "age in Saturn years">:: (fun _ ->
-    let input = 3_000_000_000 in
-    aid ~d:0.005 95.06 (age_on Earth input);
-    aid ~d:0.005 3.23 (age_on Saturn input));
-   "age in Neptune years">:: (fun _ ->
-    let input = 8_210_123_456 in
-    aid ~d:0.005 260.16 (age_on Earth input);
-    aid ~d:0.005 1.58 (age_on Neptune input));
-   "age in Uranus years">:: (fun _ ->
-    let input = 3_210_123_456 in
-    aid ~d:0.005 101.72 (age_on Earth input);
-    aid ~d:0.005 1.21 (age_on Uranus input))
-  ]
+let tests = [
+   "age on Earth" >::
+      ae ~delta:0.005 31.69 (age_on Earth 1000000000);
+   "age on Mercury" >::
+      ae ~delta:0.005 280.88 (age_on Mercury 2134835688);
+   "age on Venus" >::
+      ae ~delta:0.005 9.78 (age_on Venus 189839836);
+   "age on Mars" >::
+      ae ~delta:0.005 39.25 (age_on Mars 2329871239);
+   "age on Jupiter" >::
+      ae ~delta:0.005 2.41 (age_on Jupiter 901876382);
+   "age on Saturn" >::
+      ae ~delta:0.005 3.23 (age_on Saturn 3000000000);
+   "age on Uranus" >::
+      ae ~delta:0.005 1.21 (age_on Uranus 3210123456);
+   "age on Neptune" >::
+      ae ~delta:0.005 1.58 (age_on Neptune 8210123456);
+]
 
 let () =
-  run_test_tt_main ("space-age tests" >::: tests)
+  run_test_tt_main ("space-age tests" >::: tests)

data/tracks/ocaml/exercises/triangle/.merlin

@@ -0,0 +1,5 @@
+PKG findlib
+PKG core
+PKG ounit
+S *
+B *

data/tracks/ocaml/exercises/triangle/Makefile

@@ -0,0 +1,11 @@
+test: test.native
+	@./test.native
+
+test.native: *.ml *.mli
+	@corebuild -r -quiet -pkg oUnit test.native
+
+clean:
+	rm -rf _build
+	rm -f test.native
+
+.PHONY: clean

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

@@ -0,0 +1,17 @@
+open Core.Std
+
+let sort_sides = function
+| [_; _; _] as sides ->
+    let side = List.nth_exn (List.sort sides ~cmp:Int.compare) in
+    (side 0, side 1, side 2)
+| _ -> failwith "not at triangle"
+
+let is_triangle f sides = 
+  let (a, b, c) = sort_sides sides in
+  c > 0 && c <= a + b && f a b c
+
+let is_equilateral = is_triangle (fun a b c -> a = b && b = c)
+
+let is_isoceles = is_triangle (fun a b c -> a = b || b = c)
+
+let is_scalene = is_triangle (fun a b c -> a <> b && b <> c)

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

@@ -0,0 +1,48 @@
+open Core.Std
+open OUnit2
+open Triangle
+
+let ae exp got _test_ctxt = assert_equal exp got ~printer:Bool.to_string
+
+let equilateral_tests = [
+   "true if all sides are equal" >::
+     ae true (is_equilateral [2; 2; 2]);
+   "false if any side is unequal" >::
+     ae false (is_equilateral [2; 3; 2]);
+   "false if no sides are equal" >::
+     ae false (is_equilateral [5; 4; 6]);
+   "All zero sides are illegal, so the triangle is not equilateral" >::
+     ae false (is_equilateral [0; 0; 0]);
+]
+
+let isoceles_tests = [
+   "true if last two sides are equal" >::
+     ae true (is_isoceles [3; 4; 4]);
+   "true if first two sides are equal" >::
+     ae true (is_isoceles [4; 4; 3]);
+   "true if first and last sides are equal" >::
+     ae true (is_isoceles [4; 3; 4]);
+   "equilateral triangles are also isosceles" >::
+     ae true (is_isoceles [4; 4; 4]);
+   "false if no sides are equal" >::
+     ae false (is_isoceles [2; 3; 4]);
+   "Sides that violate triangle inequality are not isosceles, even if two are equal" >::
+     ae false (is_isoceles [1; 1; 3]);
+]
+
+let scalene_tests = [
+   "true if no sides are equal" >::
+     ae true (is_scalene [5; 4; 6]);
+   "false if all sides are equal" >::
+     ae false (is_scalene [4; 4; 4]);
+   "false if two sides are equal" >::
+     ae false (is_scalene [4; 4; 3]);
+   "Sides that violate triangle inequality are not scalene, even if they are all different" >::
+     ae false (is_scalene [7; 3; 2]);
+]
+
+let () =
+  run_test_tt_main (
+    "triangle tests" >:::
+      List.concat [equilateral_tests; isoceles_tests; scalene_tests]
+  )

data/tracks/ocaml/exercises/triangle/triangle.mli

@@ -0,0 +1,5 @@
+val is_equilateral : (int list) -> bool
+
+val is_isoceles : (int list) -> bool
+
+val is_scalene : (int list) -> bool

data/tracks/ocaml/tools/test-generator/.merlin

@@ -1,5 +1,4 @@
 S src/**
-S interfaces/**
 S test/**
 B _build/src
 B _build/test

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

@@ -13,6 +13,9 @@ test_gen.native: all_tests.native src/*.ml test/*.ml
 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
+
 clean:
 	rm -rf _build
 	rm -f test_gen.native

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

@@ -26,5 +26,5 @@ let rec replace_keys (f: edit_expected_function) (ed: edit_parameters_function)
   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 suite_name cases =
+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)

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

@@ -15,7 +15,10 @@ let find_nested_files (name: string) (base: string): (string * content) list =
   |> List.filter ~f:(fun slug -> Sys.file_exists_exn (base ^ "/" ^ slug ^ "/" ^ name))
   |> List.map ~f:(fun slug -> (slug, In_channel.read_all (base ^ "/" ^ slug ^ "/" ^ name)))
 
-let find_template_files = find_nested_files "template.ml"
+let find_template_files base filter = 
+  let all_files = find_nested_files "template.ml" base in
+  let filter = Option.value filter ~default:"" in
+  List.filter all_files ~f:(fun (slug,_) -> String.is_substring slug ~substring:filter)
 
 let find_canonical_data_files = find_nested_files "canonical-data.json"
 
@@ -24,26 +27,35 @@ let combine_files (template_files: (string * content) list) (canonical_data_file
 
 (* pangram in the canonical data is a suite but it does not really need to be as there's only one group. Convert a Suite to
    a Single test in this case, to simplify the template. *)
-let simplify_single_test_suite tests = match tests with
+let simplify_single_test_suite (tests: tests): tests = match tests with
 | Suite [{name = name; cases = cases}] -> Single cases
 | x -> x
 
 let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_file: content): (content, content) Result.t =
-  let template = find_template template_file in
+  let open Result.Monad_infix in
+  Result.of_option ~error:("cannot recognize file for " ^ slug ^ " as a template") @@ find_template template_file >>= fun template ->
   let edit_expected = 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 open Result.Monad_infix in
-  Result.of_option template ("cannot recognize file for " ^ slug ^ " as a template") >>= fun template ->
+  let file_text = template.file_text in
+  let file_lines = String.split_lines file_text |> List.to_array in
   parse_json_text canonical_data_file (expected_key_name slug) (cases_name slug)
   |> Result.map_error ~f:show_error >>| simplify_single_test_suite >>= (function
       | Single cases ->
+        let template = to_single template.template in
         fill_in_template template.template slug cases
-        |> fill_tests template
+        |> fill_tests file_text template
         |> Result.return
       | Suite tests ->
-        List.map tests ~f:(fun {name;cases} -> (name, fill_in_template template.template name cases))
-        |> fill_suite template
+        let suites = to_multi template.template in
+        let suites_by_line = List.map suites ~f:(fun s -> (file_lines.(s.suite_name_line), s)) in
+        let find_suite name = List.find suites_by_line ~f:(fun (l,s) -> String.is_substring l ~substring:name) |> Option.map ~f:snd in
+        let fill_suite_tests {name; cases} = 
+          let suite = Result.of_option ~error:("cannot find template for suite " ^ name) (find_suite name) in
+          Result.map suite ~f:(fun suite -> (name, fill_in_template suite.template_part.template name cases))
+        in
+        List.map tests ~f:fill_suite_tests |> sequence >>=
+        fill_suite template
     )
 
 let output_tests (files: (string * content * content) list) (output_folder: string) ~(generated_folder: string): unit =
@@ -57,8 +69,8 @@ let output_tests (files: (string * content * content) list) (output_folder: stri
     | Error e -> print_endline ("Failed when generating " ^ slug ^ ", error: " ^ e) in
   List.iter files ~f:output1
 
-let run ~(templates_folder: string) ~(canonical_data_folder: string) ~(output_folder: string) ~(generated_folder: string) =
-  let template_files = find_template_files templates_folder in
+let run ~(templates_folder: string) ~(canonical_data_folder: string) ~(output_folder: string) ~(generated_folder: string) (filter: string option) =
+  let template_files = find_template_files templates_folder filter in
   let canonical_data_files = find_canonical_data_files canonical_data_folder in
   let combined = combine_files template_files canonical_data_files in
   output_tests combined output_folder generated_folder

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

@@ -0,0 +1,12 @@
+open Core.Std
+open Controller
+
+let home_dir = Option.value_exn (Sys.getenv "HOME")
+
+let () =
+  Controller.run
+    ~templates_folder:"./templates"
+    ~canonical_data_folder:"../../../x-common/exercises"
+    ~output_folder:"../../exercises"
+    ~generated_folder:(home_dir ^ "/.xocaml-generated")
+    (Some "beer-song")

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

@@ -77,12 +77,20 @@ let edit_dominoes (ps: (string * json) list): (string * string) list =
   | ("input", `List j) -> ("input", "[" ^ (List.map ~f:two_elt_list_to_tuple j |> String.concat ~sep:"; ") ^ "]")
   | (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 strip_quotes s = String.drop_prefix s 1 |> Fn.flip String.drop_suffix 1 in
+  let edit = function
+  | ("planet", v) -> ("planet", json_to_string v |> strip_quotes) 
+  | (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
 | ("all-your-base", ps) -> edit_all_your_base ps
 | ("dominoes", ps) -> edit_dominoes ps
+| ("space-age", ps) -> edit_space_age ps
 | (_, ps) -> map_elements json_to_string ps
 
 let expected_key_name slug = match slug with