trackler 2.1.0.0 → 2.1.0.1

data/tracks/cpp/exercises/series/series_test.cpp

@@ -2,9 +2,9 @@
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <stdexcept>
-#include "require_equal_containers.h"
 
 using namespace std;
+namespace tt = boost::test_tools;
 
 BOOST_AUTO_TEST_CASE(short_digits)
 {
@@ -12,7 +12,7 @@ BOOST_AUTO_TEST_CASE(short_digits)
 
     const vector<int> actual{series::digits("012345")};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual, tt::per_element());
 }
 
 #if defined(EXERCISM_RUN_ALL_TESTS)
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(long_digits)
 
     const vector<int> actual{series::digits("0123456789")};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual, tt::per_element());
 }
 
 BOOST_AUTO_TEST_CASE(keeps_the_digit_order_if_reversed)
@@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE(keeps_the_digit_order_if_reversed)
 
     const vector<int> actual{series::digits("9876543210")};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual, tt::per_element());
 }
 
 BOOST_AUTO_TEST_CASE(keeps_arbitrary_digit_order)
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(keeps_arbitrary_digit_order)
 
     const vector<int> actual{series::digits("936923468")};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual, tt::per_element());
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_1)
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_1)
 
     const vector<vector<int>> actual{series::slice("01234", 1)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_2)
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_2)
 
     const vector<vector<int>> actual{series::slice("98273463", 2)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_3)
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_3)
 
     const vector<vector<int>> actual{series::slice("01234", 3)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_3_with_duplicate_digits)
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_3_with_duplicate_digits)
 
     const vector<vector<int>> actual{series::slice("31001", 3)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_4)
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_4)
 
     const vector<vector<int>> actual{series::slice("31001", 3)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(can_slice_by_5)
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(can_slice_by_5)
 
     const vector<vector<int>> actual{series::slice("81228", 5)};
 
-    BOOST_REQUIRE_EQUAL_COLLECTIONS(expected.begin(), expected.end(), actual.begin(), actual.end());
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(domain_error_if_not_enough_digits_to_slice)

data/tracks/cpp/exercises/sieve/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/space-age/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/sum-of-multiples/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/triangle/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/trinary/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/word-count/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/word-count/word_count_test.cpp

@@ -2,7 +2,6 @@
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <map>
-#include "require_equal_containers.h"
 
 using namespace std;
 
@@ -12,7 +11,7 @@ BOOST_AUTO_TEST_CASE(counts_one_word)
 
     const auto actual = word_count::words("word");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 #if defined(EXERCISM_RUN_ALL_TESTS)
@@ -22,7 +21,7 @@ BOOST_AUTO_TEST_CASE(counts_one_of_each)
 
     const auto actual = word_count::words("one of each");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(counts_multiple_occurrences)
@@ -31,7 +30,7 @@ BOOST_AUTO_TEST_CASE(counts_multiple_occurrences)
 
     const auto actual = word_count::words("one fish two fish red fish blue fish");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(ignores_punctuation)
@@ -40,7 +39,7 @@ BOOST_AUTO_TEST_CASE(ignores_punctuation)
 
     const auto actual = word_count::words("car : carpet as java : javascript!!&@$%^&");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(includes_numbers)
@@ -49,7 +48,7 @@ BOOST_AUTO_TEST_CASE(includes_numbers)
 
     const auto actual = word_count::words("testing, 1, 2 testing");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(normalizes_case)
@@ -58,7 +57,7 @@ BOOST_AUTO_TEST_CASE(normalizes_case)
 
     const auto actual = word_count::words("go Go GO");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(counts_constructor)
@@ -67,7 +66,7 @@ BOOST_AUTO_TEST_CASE(counts_constructor)
 
     const auto actual = word_count::words("constructor Constructor");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(counts_multiline)
@@ -76,15 +75,15 @@ BOOST_AUTO_TEST_CASE(counts_multiline)
 
     const auto actual = word_count::words("hello\nworld");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(count_everything_just_once)
 {
     const map<string, int> expected{{"all", 2}, {"the", 2}, {"kings", 2}, {"horses", 1}, {"and", 1}, {"men", 1}};
     const auto actual = word_count::words("all the kings horses and all the kings men");
-    
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(handles_cramped_list)
@@ -92,7 +91,7 @@ BOOST_AUTO_TEST_CASE(handles_cramped_list)
     const map<string, int> expected{{"one", 1}, {"two", 1}, {"three", 1}};
     const auto actual = word_count::words("one,two,three");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(with_apostrophes)
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE(with_apostrophes)
     const map<string, int> expected{{"first", 1}, {"don't", 2}, {"laugh", 1}, {"then", 1}, {"cry", 1}};
     const auto actual = word_count::words("First: don't laugh. Then: don't cry.");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(with_free_standing_apostrophes)
@@ -108,7 +107,7 @@ BOOST_AUTO_TEST_CASE(with_free_standing_apostrophes)
     const map<string, int> expected{{ "go", 3 }};
     const auto actual = word_count::words("go ' Go '' GO");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(with_apostrophes_as_quotes)
@@ -116,6 +115,6 @@ BOOST_AUTO_TEST_CASE(with_apostrophes_as_quotes)
     const map<string, int> expected{{"she", 1}, {"said", 1}, {"let's", 1}, {"meet", 1}, {"at", 1}, {"twelve", 1}, {"o'clock", 1}};
     const auto actual = word_count::words("She said, 'let's meet at twelve o'clock'");
 
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 #endif

data/tracks/go/README.md

@@ -59,28 +59,42 @@ $ tree -a
 This list of files can vary across exercises so let's quickly run through
 each file and briefly describe what it is.
 
-**cases_test.go** - This file contains [generated test cases](#generating-test-cases),
-and will only be present in some exercises.
+* **cases_test.go** - This file contains [generated test cases](#generating-test-cases),
+    and will only be present in some exercises.
 
-**example.go** - This is a reference solution for the exercise. This file is
-ignored by the `exercism fetch` command, as are any files that include the
-word *example* in the filename, or anything within the *.meta* directory.
+* **example.go** - This is a reference solution for the exercise. This file is
+    ignored by the `exercism fetch` command. See [ignored files](#ignored-files) for
+    details on which files are ignored.
 
-**leap.go** - This is a *stub file*, and will only be present in some exercises.
+* **leap.go** - This is a *stub file*, and will only be present in some exercises.
 
-**leap_test.go** - This is the main test file for the exercise.
+* **leap_test.go** - This is the main test file for the exercise.
 
-**.meta/** - The *.meta* directory is used to contain files that are not
-meant to be included when a user fetches an exercise, for instance test case
-generators.
+* **.meta/** - The *.meta* directory contains files that are not meant to be
+    included when a user fetches an exercise, for instance test case generators.
+    See [ignored files](#ignored-files) for details on which files are ignored.
 
-**gen.go** - This file, within the *.meta* directory, generates the *cases_test.go*
-file, and will only be present in some exercises. See [generating test cases](#generating-test-cases)
-for more information.
+* **gen.go** - This file, within the *.meta* directory, generates the *cases_test.go*
+    file, and will only be present in some exercises. See [generating test cases](#generating-test-cases)
+    for more information.
 
 In some exercises there can be extra files, for instance the `series` exercise
 contains extra test files.
 
+### Ignored files
+
+When a user fetches an exercise, they do not need to get all the files within an
+exercise directory. For instance; the *example.go* files that contain an
+example solution, or the *gen.go* files used to generate an exercise's test
+cases. Therefore there are certain files and directories that are ignored when
+an exercise is fetched. These are:
+
+* The *.meta* directory and anything within it.
+* Any file that matches the `ignore_pattern` defined in the [config.json file](/config.json).
+    This currently matches any filename that contains the word `example`, **unless**
+    it is followed by the word `test`, with any number of characters inbetween.
+
+
 ### Example solutions
 
 *example.go* is a reference solution. It is a valid solution that [Travis](https://travis-ci.org/exercism/xgo),

data/tracks/go/config.json

@@ -3,6 +3,7 @@
   "language": "Go",
   "repository": "https://github.com/exercism/xgo",
   "active": true,
+  "ignore_pattern": "example(?!.*test)",
   "deprecated": [
     "binary",
     "bottles",

data/tracks/go/exercises/connect/.meta/gen.go

@@ -32,9 +32,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package connect
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var testCases = []struct {
     description string