trackler 2.0.7.0 → 2.0.8.1

data/tracks/erlang/exercises/hello-world/src/example.erl

@@ -1,8 +1,8 @@
 -module(example).
--export([greet/0, greet/1, test_version/0]).
+-export([hello/0, test_version/0]).
 
-greet() -> "Hello, World!".
-greet(Name) -> "Hello, " ++ Name ++ "!".
+hello() ->
+  "Hello, World!".
 
 test_version() ->
-    1.
+  2.

data/tracks/erlang/exercises/hello-world/test/hello_world_tests.erl

@@ -1,18 +1,9 @@
 -module(hello_world_tests).
 
 -define(TESTED_MODULE, (sut(hello_world))).
--define(TEST_VERSION, 1).
+-define(TEST_VERSION, 2).
 -include("exercism.hrl").
 
 
-no_name_test() ->
-  ?assertEqual("Hello, World!", ?TESTED_MODULE:greet()).
-
-alice_test() ->
-  ?assertEqual("Hello, Alice!", ?TESTED_MODULE:greet("Alice")).
-
-bob_test() ->
-  ?assertEqual("Hello, Bob!", ?TESTED_MODULE:greet("Bob")).
-
-strange_test() ->
-  ?assertEqual("Hello, !", ?TESTED_MODULE:greet("")).
+say_hi_test() ->
+  ?assertEqual("Hello, World!", ?TESTED_MODULE:hello()).

data/tracks/erlang/exercises/{trinary → rotational-cipher}/rebar.config

@@ -1,7 +1,12 @@
 %% Erlang compiler options
 {erl_opts, [debug_info]}.
 
-{deps, []}.
+{plugins, [rebar3_proper, rebar_alias]}.
+{deps, [{proper, "1.1.1-beta"}]}.
+
+{alias, [
+  {test, [eunit, proper]}
+]}.
 
 {dialyzer, [
   {warnings, [underspecs, no_return]},
@@ -20,6 +25,8 @@
 %% Options for eunit:test(Tests, Opts)
 {eunit_opts, [verbose]}.
 
+{proper_opts, [{module, [rotational_cipher_tests]}]}.
+
 %% == xref ==
 
 {xref_warnings, true}.

data/tracks/erlang/exercises/rotational-cipher/src/example.erl

@@ -0,0 +1,19 @@
+-module(example).
+
+-export([encrypt/2, decrypt/2, test_version/0]).
+
+encrypt(String, N) ->
+  lists:map(fun
+    (C) when $a =< C, C =< $z ->
+      ((C - $a + N) rem 26) + $a;
+    (C) when $A =< C, C =< $Z ->
+      ((C - $A + N) rem 26) + $A;
+    (C) ->
+      C
+  end, String).
+
+decrypt(String, N) ->
+  encrypt(String, 26 - N).
+
+test_version() ->
+  1.

data/tracks/erlang/exercises/{binary/src/binary.app.src → rotational-cipher/src/rotational_cipher.app.src}

@@ -1,5 +1,5 @@
-{application, binary,
-  [{description, "exercism.io - binary"},
+{application, rotational_cipher,
+  [{description, "exercism.io - rotational-cipher"},
     {vsn, "git"},
     {modules, []},
     {registered, []},

data/tracks/erlang/exercises/rotational-cipher/test/rotational_cipher_tests.erl

@@ -0,0 +1,98 @@
+-module(rotational_cipher_tests).
+
+-define(TESTED_MODULE, (sut(rotational_cipher))).
+-define(TEST_VERSION, 1).
+-include_lib("proper/include/proper.hrl").
+-include("exercism.hrl").
+
+%%% To use this testsuite completely do run
+%%% rebar3 do eunit, proper
+
+
+%%% These tests are inspired by
+%%% https://github.com/exercism/x-common/blob/932c674a0554ad0db3645e9d2a473a515876d6eb/exercises/rotational-cipher/canonical-data.json
+%%% But don't have a generic `rotate/2` function, but split the tests into
+%%% encryption and decryption.
+%%% Also some property based tests are added into the mix.
+
+%% Encryption tests
+
+encrypt_a_by_1_test() ->
+  ?assertEqual("b", ?TESTED_MODULE:encrypt("a", 1)).
+
+encrypt_a_by_26_same_output_as_input_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:encrypt("a", 26)).
+
+encrypt_a_by_0_same_output_as_input_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:encrypt("a", 0)).
+
+encrypt_m_by_13_test() ->
+  ?assertEqual("m", ?TESTED_MODULE:encrypt("z", 13)).
+
+encrypt_wraps_alphabet_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:encrypt("z", 1)).
+
+encrypt_capital_letters_test() ->
+  ?assertEqual("TRL", ?TESTED_MODULE:encrypt("OMG", 5)).
+
+encrypt_spaces_test() ->
+  ?assertEqual("T R L", ?TESTED_MODULE:encrypt("O M G", 5)).
+
+encrypt_numbers_test() ->
+  ?assertEqual("Xiwxmrk 1 2 3 xiwxmrk", ?TESTED_MODULE:encrypt("Testing 1 2 3 testing", 4)).
+
+encrypt_punctuation_test() ->
+  ?assertEqual("Gzo'n zvo, Bmviyhv!", ?TESTED_MODULE:encrypt("Let's eat, Grandma!", 21)).
+
+encrypt_all_letters_test() ->
+  ?assertEqual("Gur dhvpx oebja sbk whzcf bire gur ynml qbt.", ?TESTED_MODULE:encrypt("The quick brown fox jumps over the lazy dog.", 13)).
+
+%% Decryption tests
+
+decrypt_b_by_1_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:decrypt("b", 1)).
+
+decrypt_a_by_26_same_output_as_input_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:decrypt("a", 26)).
+
+decrypt_a_by_0_same_output_as_input_test() ->
+  ?assertEqual("a", ?TESTED_MODULE:decrypt("a", 0)).
+
+decrypt_z_by_13_test() ->
+  ?assertEqual("z", ?TESTED_MODULE:decrypt("m", 13)).
+
+decrypt_wraps_alphabet_test() ->
+  ?assertEqual("z", ?TESTED_MODULE:decrypt("a", 1)).
+
+decrypt_capital_letters_test() ->
+  ?assertEqual("OMG", ?TESTED_MODULE:decrypt("TRL", 5)).
+
+decrypt_spaces_test() ->
+  ?assertEqual("O M G", ?TESTED_MODULE:decrypt("T R L", 5)).
+
+decrypt_numbers_test() ->
+  ?assertEqual("Testing 1 2 3 testing", ?TESTED_MODULE:decrypt("Xiwxmrk 1 2 3 xiwxmrk", 4)).
+
+decrypt_punctuation_test() ->
+  ?assertEqual("Let's eat, Grandma!", ?TESTED_MODULE:decrypt("Gzo'n zvo, Bmviyhv!", 21)).
+
+decrypt_all_letters_test() ->
+  ?assertEqual("The quick brown fox jumps over the lazy dog.", ?TESTED_MODULE:decrypt("Gur dhvpx oebja sbk whzcf bire gur ynml qbt.", 13)).
+
+%% Properties tested via `proper`
+
+prop_decrypt_encrypt_is_id() ->
+  ?FORALL({Input, N}, {string(), integer(0,26)},
+    ?TESTED_MODULE:decrypt(?TESTED_MODULE:encrypt(Input, N), N) == Input).
+
+prop_decrypt_is_encrypt_with_another_key() ->
+  ?FORALL({Input, N}, {string(), integer(0,26)},
+    ?TESTED_MODULE:decrypt(Input, 26 - N) == ?TESTED_MODULE:encrypt(Input, N)).
+
+prop_encrypt_13_twice_is_id() ->
+  ?FORALL(Input, string(),
+    ?TESTED_MODULE:encrypt(?TESTED_MODULE:encrypt(Input, 13), 13) == Input).
+
+prop_decrypt_13_twice_is_id() ->
+  ?FORALL(Input, string(),
+    ?TESTED_MODULE:decrypt(?TESTED_MODULE:decrypt(Input, 13), 13) == Input).

data/tracks/fsharp/exercises/grep/GrepTest.fs

@@ -192,6 +192,63 @@ let ``One file, several matches, inverted flag`` () =
         "That Shepherd, who first taught the chosen Seed\n"
     
     Assert.That(grep pattern flags files, Is.EqualTo(expected))
+    
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``One file, case-insensitive and entire line flags`` () =
+    let pattern = "ATREUS"
+    let files = [iliadFileName]
+    let flags = "-i -x"
+    let expected = ""
+    
+    Assert.That(grep pattern flags files, Is.EqualTo(expected))
+    
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``One file, case-insensitive and inverted flags`` () =
+    let pattern = "THE"
+    let files = [paradiseLostFileName]
+    let flags = "-i -v"
+    let expected =
+        "Of that Forbidden Tree, whose mortal tast\n" +
+        "With loss of Eden, till one greater Man\n" +
+        "Of Oreb, or of Sinai, didst inspire\n"
+
+    Assert.That(grep pattern flags files, Is.EqualTo(expected))
+    
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``One file, inverted and entire line flags`` () =
+    let pattern = "the"
+    let files = [paradiseLostFileName]
+    let flags = "-v -x"
+    let expected =
+        "Of Mans First Disobedience, and the Fruit\n" +
+        "Of that Forbidden Tree, whose mortal tast\n" +
+        "Brought Death into the World, and all our woe,\n" +
+        "With loss of Eden, till one greater Man\n" +
+        "Restore us, and regain the blissful Seat,\n" +
+        "Sing Heav'nly Muse, that on the secret top\n" +
+        "Of Oreb, or of Sinai, didst inspire\n" +
+        "That Shepherd, who first taught the chosen Seed\n"
+
+    Assert.That(grep pattern flags files, Is.EqualTo(expected))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``One file, case-insensitive, inverted and entire line flags`` () =
+    let pattern = "if i rEFuse To Wed DeMETrius."
+    let files = [midsummerNightFileName]
+    let flags = "-i -v -x"
+    let expected =
+        "I do entreat your grace to pardon me.\n" +
+        "I know not by what power I am made bold,\n" +
+        "Nor how it may concern my modesty,\n" +
+        "In such a presence here to plead my thoughts;\n" +
+        "But I beseech your grace that I may know\n" +
+        "The worst that may befall me in this case,\n"
+
+    Assert.That(grep pattern flags files, Is.EqualTo(expected))
 
 [<TestCase("", Ignore = "Remove to run test case")>]
 [<TestCase("-n", Ignore = "Remove to run test case")>]

data/tracks/fsharp/exercises/hello-world/Example.fs

@@ -1,3 +1,3 @@
 module HelloWorld
 
-let hello name = sprintf "Hello, %s!" (defaultArg name "World")
+let hello = "Hello, World!"

data/tracks/fsharp/exercises/hello-world/HelloWorldTest.fs

@@ -5,15 +5,5 @@ open NUnit.Framework
 open HelloWorld
 
 [<Test>]
-let ``No name`` () =
-    Assert.That(hello None, Is.EqualTo("Hello, World!"))
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Sample name`` () =
-    Assert.That(hello (Some "Alice"), Is.EqualTo("Hello, Alice!"))
-
-[<Test>]
-[<Ignore("Remove to run test")>]
-let ``Other sample name`` () =
-    Assert.That(hello (Some "Bob"), Is.EqualTo("Hello, Bob!"))
+let ``Say hi!`` () =
+    Assert.That(hello, Is.EqualTo("Hello, World!"))

data/tracks/go/.travis.yml

@@ -14,15 +14,12 @@ sudo: false
 # to alert us to any real upcoming change in the language that would be
 # incompatible with our existing code.
 #
-# We may choose to test additional versions as time allows,
-# as long as the number of entries in the build matrix doesn't exceed ten.
-# These additional versions will not be required, so they're advisory only.
-# Since Travis runs five jobs at a time, a limit of ten jobs makes sense.
+# We used to test additional versions beyond the last two,
+# but since Travis only runs five jobs at a time throughout all of Exercism,
+# it is better citizenship to not test the additional versions.
 go:
-  - 1.7
-  - 1.6.3
-  - 1.5.4
-  - 1.4.3
+  - 1.7.5
+  - 1.8
   - tip
 
 # Travis runs in a 64 bit environment but beginning with Go 1.5, building a
@@ -58,18 +55,13 @@ script:
   - if [ -n "$STATIC_CHECKERS" ]; then ./bin/test-without-stubs vet; fi
   - if [ -z "$STATIC_CHECKERS" ]; then ./bin/test-without-stubs; fi
 
-# special cases for the build matrix are that go 1.4.3 can't be tested 32 bit
+# special cases for the build matrix are STATIC_CHECKERS gets its own entry
 # and that tip is allowed to fail.  Broken tips are extremely rare these days
 # but anyway, it could happen and it wouldn't be our problem.
 matrix:
-  exclude:
-    - go: 1.4.3
-      env: TESTARCH=386
   include:
     # Keep this in sync with the latest version.
-    - go: 1.7
+    - go: 1.8
       env: STATIC_CHECKERS=1
   allow_failures:
     - go: tip
-    - go: 1.4.3
-    - go: 1.5.4

data/tracks/go/exercises/hello-world/example.go

@@ -1,12 +1,8 @@
 package greeting
 
-const testVersion = 3
+const testVersion = 4
 
-// HelloWorld says hello to given name.
-// If no name is passed, it greets the world.
-func HelloWorld(name string) string {
-	if name == "" {
-		name = "World"
-	}
-	return "Hello, " + name + "!"
+// HelloWorld greets the world.
+func HelloWorld() string {
+	return "Hello, World!"
 }

data/tracks/go/exercises/hello-world/hello_test.go

@@ -2,13 +2,25 @@ package greeting
 
 import "testing"
 
-// Define a function HelloWorld(string) string.
+// Define a function named HelloWorld that takes no arguments,
+// and returns a string.
+// In other words, define a function with the following signature:
+// HelloWorld() string
 //
-// Also define a testVersion with a value that matches
-// the targetTestVersion here.
-
-const targetTestVersion = 3
+// In any exercise solution using the following tests you must also define a
+// "testVersion" constant with a value that matches the targetTestVersion
+// here. See how it is done in the the ./hello_world.go file provided.
+// This is a common convention for ensuring test consistency throughout the
+// Exercism Go language track.
+//
+// See TestTestVersion function below for how this and the testVersion
+// constants are used.
+const targetTestVersion = 4
 
+// TestTestVersion is used to ensure the exercise solution is considered
+// compatible with the rest of the tests. It should be the initial testing
+// function in any test suite. If there is an incompatibility the tests can
+// be considered unreliable therefore this function will abort the testing.
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {
 		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
@@ -16,16 +28,8 @@ func TestTestVersion(t *testing.T) {
 }
 
 func TestHelloWorld(t *testing.T) {
-	tests := []struct {
-		name, expected string
-	}{
-		{"", "Hello, World!"},
-		{"Gopher", "Hello, Gopher!"},
-		{"ゴーファー", "Hello, ゴーファー!"},
-	}
-	for _, test := range tests {
-		if observed := HelloWorld(test.name); observed != test.expected {
-			t.Fatalf("HelloWorld(%s) = %v, want %v", test.name, observed, test.expected)
-		}
+	expected := "Hello, World!"
+	if observed := HelloWorld(); observed != expected {
+		t.Fatalf("HelloWorld() = %v, want %v", observed, expected)
 	}
 }

data/tracks/go/exercises/hello-world/hello_world.go

@@ -10,10 +10,20 @@ package greeting
 // after you have posted this code to the Exercism site -- reviewers
 // will see that your code can't necessarily be expected to pass the
 // current test suite because it was written to an earlier test version.
-const testVersion = 3
+//
+// This is a convention done for Exercism exercises in the Go language track,
+// it is not a requirement of the Go programming language.
+//
+// This test versioning setup will be common to all the exercises in the
+// Go language track. When crafting your own solution file from scratch you
+// will be expected to add this constant or the initial test will fail.
+// The version number you should use will be found in the constant
+// "targetTestVersion" in the test file, see ./hello_test.go for more
+// information.
+const testVersion = 4
 
 // HelloWorld needs a comment documenting it as package does.
-func HelloWorld(string) string {
+func HelloWorld() string {
 	// Write some code here to pass the test suite.
 
 	// When you have a working solution, REMOVE ALL THE STOCK COMMENTS.

data/tracks/groovy/exercises/hello-world/Example.groovy

@@ -1,7 +1,7 @@
 class HelloWorld {
 
-    def hello(name = 'World') {
-        "Hello, ${name}!"
+    def hello() {
+        'Hello, World!'
     }
 
 }

data/tracks/groovy/exercises/hello-world/HelloWorld.groovy

@@ -2,7 +2,7 @@
 
 class HelloWorld {
 
-    def hello(name) {
+    def hello() {
         // YOUR CODE HERE
     }
 

data/tracks/groovy/exercises/hello-world/HelloWorldSpec.groovy

@@ -3,21 +3,8 @@ import spock.lang.*
 
 class HelloWorldSpec extends Specification {
 
-    @Shared
-    def hello = new HelloWorld()
-
     def 'outputs "Hello, World!"'() {
-        expect: hello.hello() == 'Hello, World!'
-    }
-
-    @Ignore
-    def 'outputs "Hello, Alice!" when given the name "Alice"'() {
-        expect: hello.hello('Alice') == 'Hello, Alice!'
-    }
-
-    @Ignore
-    def 'outputs "Hello, Bob!" when given the name "Bob"'() {
-        expect: hello.hello('Bob') == 'Hello, Bob!'
+        expect: new HelloWorld().hello() == 'Hello, World!'
     }
 
 }