trackler 2.2.1.42 → 2.2.1.43

data/tracks/sml/exercises/accumulate/accumulate.sml

@@ -6,5 +6,5 @@
    Caveats: an empty list cannot be transformed
             do not use List.map from the standard basis
 *)
-fun accumulate (f: 'a -> 'b) (xs: 'a list): 'b list =
+fun accumulate (f: 'a -> 'b, xs: 'a list) : 'b list =
   raise Fail "'accumulate' has not been implemented"

data/tracks/sml/exercises/accumulate/example.sml

@@ -1,2 +1,2 @@
-fun accumulate  _ []     = []
-  | accumulate f (x::xs) = f x :: accumulate f xs
+fun accumulate (_, [])     = []
+  | accumulate (f, x::xs) = f x :: accumulate (f, xs)

data/tracks/sml/exercises/accumulate/test.sml

@@ -1,58 +1,28 @@
 use "accumulate.sml";
+use "testlib.sml";
 
-val test_cases = [
-    {
-      description = "Applying a function the empty-list ([]) does nothing",
-      input       = [],
-      function    = fn x => x,
-      expected    = []
-    },
-    {
-      description = "Applying a square function to [1,2,3] produces [1,4,9]",
-      input       = [1, 2, 3],
-      function    = fn x => x*x,
-      expected    = [1, 4, 9]
-    },
-    {
-      description = "Applying a cube function to[1,2,3] produces [1,8,27]",
-      input       = [1, 2, 3],
-      function    = fn x => x*x*x,
-      expected    = [1, 8, 27]
-    },
-    {
-      description = "Applying an increment function to [1,2,3] produces [2,3,4]",
-      input       = [1, 2, 3],
-      function    = fn x => x+1,
-      expected    = [2, 3, 4]
-    },
-    {
-      description = "Applying an decrement function to [1,2,3] produces [0,1,2]",
-      input       = [1, 2, 3],
-      function    = fn x => x-1,
-      expected    = [0, 1, 2]
-    }
-];
-
-fun run_tests _ [] = []
-  | run_tests f (x :: xs) =
-      let
-        fun aux { description, input, function, expected } =
-          let
-            val output = f function input
-            val is_correct = output = expected
-            val expl = description ^ ": " ^
-              (if is_correct then "PASSED" else "FAILED") ^ "\n"
-          in
-            (print (expl); is_correct)
-          end
-      in
-        (aux x) :: run_tests f xs
-      end
-
-val testResults = run_tests accumulate test_cases;
-val passedTests = List.filter (fn x => x) testResults;
-val failedTests = List.filter (fn x => not x) testResults;
-
-if (List.length testResults) = (List.length passedTests)
-then (print "ALL TESTS PASSED")
-else (print (Int.toString (List.length failedTests) ^ " TEST(S) FAILED"));
+infixr |>
+fun x |> f = f x
+
+val testsuite =
+  describe "accumulate" [
+    test "applying a function to the empty-list does nothing"
+      (fn _ => accumulate (fn x => x, []) |> Expect.equalTo []),
+
+    test "applying an identify function to any list returns the source list"
+      (fn _ => accumulate (fn x => x, [1,2,3]) |> Expect.equalTo [1,2,3]),
+
+    test "applying a square function to [1,2,3] produces [1,4,9]"
+      (fn _ => accumulate (fn x => x * x, [1,2,3]) |> Expect.equalTo [1,4,9]),
+
+    test "applying a cube function to [1,2,3] produces [1,8,27]"
+      (fn _ => accumulate (fn x => x * x * x, [1,2,3]) |> Expect.equalTo [1,8,27]),
+
+    test "applying an increment function to [1,2,3] produces [2,3,4]"
+      (fn _ => accumulate (fn x => x + 1, [1,2,3]) |> Expect.equalTo [2,3,4]),
+
+    test "applying an decrement function to [1,2,3] produces [0,1,2]"
+      (fn _ => accumulate (fn x => x - 1, [1,2,3]) |> Expect.equalTo [0,1,2])
+  ]
+
+val _ = Test.run testsuite

data/tracks/sml/exercises/accumulate/testlib.sml

@@ -0,0 +1,159 @@
+structure Expect =
+struct
+  datatype expectation = Pass | Fail of string * string
+
+  local
+    fun failEq b a =
+      Fail ("Expected: " ^ b, "Got: " ^ a)
+    
+    fun failExn b a =
+      Fail ("Expected: " ^ b, "Raised: " ^ a)
+
+    fun exnName (e: exn): string = General.exnName e
+  in
+    fun truthy a =
+      if a
+      then Pass
+      else failEq "true" "false"
+
+    fun falsy a =
+      if a
+      then failEq "false" "true"
+      else Pass
+
+    fun equalTo b a = 
+      if a = b
+      then Pass
+      else failEq (PolyML.makestring b) (PolyML.makestring a)
+
+    fun nearTo b a =
+      if Real.== (a, b)
+      then Pass
+      else failEq (Real.toString b) (Real.toString a)
+
+    fun anyError f =
+      (
+        f ();
+        failExn "an exception" "Nothing"
+      ) handle _ => Pass
+
+    fun error e f =
+      (
+        f ();
+        failExn (exnName e) "Nothing"
+      ) handle e' => if exnMessage e' = exnMessage e
+                     then Pass
+                     else failExn (exnMessage e) (exnMessage e')
+  end
+end
+
+structure TermColor =
+struct
+  datatype color = Red | Green | Yellow | Normal
+
+  fun f Red    = "\027[31m"
+    | f Green  = "\027[32m"
+    | f Yellow = "\027[33m"
+    | f Normal = "\027[0m"
+
+  fun colorize color s = (f color) ^ s ^ (f Normal)
+
+  val redit = colorize Red
+
+  val greenit = colorize Green
+
+  val yellowit = colorize Yellow
+end
+
+structure Test =
+struct
+  datatype testnode = TestGroup of string * testnode list
+                    | Test of string * (unit -> Expect.expectation)
+
+  local
+    datatype evaluation = Success of string
+                        | Failure of string * string * string
+                        | Error of string * string
+
+    fun indent n s = (implode (List.tabulate (n, fn _ => #" "))) ^ s
+
+    fun fmt indentlvl ev =
+      let
+        val check = TermColor.greenit "\226\156\148 " (* ✔ *)
+        val cross = TermColor.redit "\226\156\150 "   (* ✖ *)
+        val indentlvl = indentlvl * 2
+      in
+      case ev of
+        Success descr => indent indentlvl (check ^ descr)
+      | Failure (descr, exp, got) =>
+          String.concatWith "\n" [indent indentlvl (cross ^ descr),
+                                  indent (indentlvl + 2) exp,
+                                  indent (indentlvl + 2) got]
+      | Error (descr, reason) =>
+          String.concatWith "\n" [indent indentlvl (cross ^ descr),
+                                  indent (indentlvl + 2) (TermColor.redit reason)]
+      end
+
+    fun eval (TestGroup _) = raise Fail "Only a 'Test' can be evaluated"
+      | eval (Test (descr, thunk)) =
+          (
+            case thunk () of
+              Expect.Pass   => ((1, 0, 0), Success descr)
+            | Expect.Fail (s, s') => ((0, 1, 0), Failure (descr, s, s'))
+          )
+          handle e => ((0, 0, 1), Error (descr, "Unexpected error: " ^ exnMessage e))
+
+    fun flatten depth testnode =
+      let
+        fun sum (x, y, z) (a, b, c) = (x + a, y + b, z + c)
+
+        fun aux (t, (counter, acc)) =
+          let
+            val (counter', texts) = flatten (depth + 1) t
+          in
+            (sum counter' counter, texts :: acc)
+          end
+      in
+        case testnode of
+          TestGroup (descr, ts) =>
+            let
+              val (counter, texts) = foldr aux ((0, 0, 0), []) ts
+            in
+              (counter, (indent (depth * 2) descr) :: List.concat texts)
+            end
+        | Test _ =>
+            let
+              val (counter, evaluation) = eval testnode
+            in
+              (counter, [fmt depth evaluation])
+            end
+      end
+    
+    fun println s = print (s ^ "\n")
+  in
+    fun run suite =
+      let
+        val ((succeeded, failed, errored), texts) = flatten 0 suite
+
+        val summary = String.concatWith ", " [
+          TermColor.greenit ((Int.toString succeeded) ^ " passed"),
+          TermColor.redit ((Int.toString failed) ^ " failed"),
+          TermColor.redit ((Int.toString errored) ^ " errored"),
+          (Int.toString (succeeded + failed + errored)) ^ " total"
+        ]
+        
+        val status = if failed = 0 andalso errored = 0
+                     then OS.Process.success
+                     else OS.Process.failure
+
+      in
+        List.app println texts;
+        println "";
+        println ("Tests: " ^ summary);
+        OS.Process.exit status
+      end
+  end
+end
+
+fun describe description tests = Test.TestGroup (description, tests)
+fun test description thunk = Test.Test (description, thunk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.42
+  version: 2.2.1.43
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -2940,6 +2940,7 @@ files:
 - tracks/dart/LICENSE
 - tracks/dart/README.md
 - tracks/dart/analysis_options.yaml
+- tracks/dart/bin/check_formatting
 - tracks/dart/bin/fetch-configlet
 - tracks/dart/config.json
 - tracks/dart/config/exercise_readme.go.tmpl
@@ -4489,6 +4490,13 @@ files:
 - tracks/erlang/exercises/triangle/src/triangle.app.src
 - tracks/erlang/exercises/triangle/src/triangle.erl
 - tracks/erlang/exercises/triangle/test/triangle_tests.erl
+- tracks/erlang/exercises/two-fer/README.md
+- tracks/erlang/exercises/two-fer/include/exercism.hrl
+- tracks/erlang/exercises/two-fer/rebar.config
+- tracks/erlang/exercises/two-fer/src/example.erl
+- tracks/erlang/exercises/two-fer/src/two_fer.app.src
+- tracks/erlang/exercises/two-fer/src/two_fer.erl
+- tracks/erlang/exercises/two-fer/test/two_fer_tests.erl
 - tracks/erlang/exercises/word-count/README.md
 - tracks/erlang/exercises/word-count/include/exercism.hrl
 - tracks/erlang/exercises/word-count/rebar.config
@@ -7085,6 +7093,9 @@ files:
 - tracks/javascript/exercises/difference-of-squares/README.md
 - tracks/javascript/exercises/difference-of-squares/difference-of-squares.spec.js
 - tracks/javascript/exercises/difference-of-squares/example.js
+- tracks/javascript/exercises/diffie-hellman/README.md
+- tracks/javascript/exercises/diffie-hellman/diffie-hellman.spec.js
+- tracks/javascript/exercises/diffie-hellman/example.js
 - tracks/javascript/exercises/etl/README.md
 - tracks/javascript/exercises/etl/etl.spec.js
 - tracks/javascript/exercises/etl/example.js
@@ -9974,6 +9985,7 @@ files:
 - tracks/python/exercises/grains/grains_test.py
 - tracks/python/exercises/grep/README.md
 - tracks/python/exercises/grep/example.py
+- tracks/python/exercises/grep/grep.py
 - tracks/python/exercises/grep/grep_test.py
 - tracks/python/exercises/hamming/README.md
 - tracks/python/exercises/hamming/example.py
@@ -12071,6 +12083,7 @@ files:
 - tracks/sml/exercises/accumulate/accumulate.sml
 - tracks/sml/exercises/accumulate/example.sml
 - tracks/sml/exercises/accumulate/test.sml
+- tracks/sml/exercises/accumulate/testlib.sml
 - tracks/sml/exercises/all-your-base/README.md
 - tracks/sml/exercises/all-your-base/all-your-base.sml
 - tracks/sml/exercises/all-your-base/example.sml