trackler 2.2.1.84 → 2.2.1.85

data/tracks/java/exercises/custom-set/.meta/version

@@ -1 +1 @@
-1.0.1
+1.1.0

data/tracks/java/exercises/custom-set/src/test/java/CustomSetTest.java

@@ -170,6 +170,14 @@ public class CustomSetTest {
         assertFalse(customSet.equals(secondCustomSet));
     }
 
+    @Ignore("Remove to run test")
+    @Test
+    public void setIsNotEqualToLargerSetWithSameElements() {
+        CustomSet<String> customSet = new CustomSet<>(Arrays.asList("1", "2", "3"));
+        CustomSet<String> secondCustomSet = new CustomSet<>(Arrays.asList("1", "2", "3", "4"));
+        assertFalse(customSet.equals(secondCustomSet));
+    }
+
     @Ignore("Remove to run test")
     @Test
     public void addToEmptySet() {

data/tracks/java/exercises/forth/.meta/version

@@ -1 +1 @@
-1.2.0
+1.4.0

data/tracks/java/exercises/forth/src/test/java/ForthEvaluatorTest.java

@@ -21,14 +21,6 @@ public class ForthEvaluatorTest {
         forthEvaluator = new ForthEvaluator();
     }
 
-    @Test
-    public void testEmptyProgramResultsInEmptyStack() {
-        assertEquals(
-                Collections.emptyList(),
-                forthEvaluator.evaluateProgram(Collections.emptyList()));
-    }
-
-    @Ignore("Remove to run test")
     @Test
     public void testNumbersAreJustPushedOntoTheStack() {
         assertEquals(
@@ -175,18 +167,18 @@ public class ForthEvaluatorTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void testDupCopiesTheTopValueOnTheStack() {
+    public void testDupCopiesAValueOnTheStack() {
         assertEquals(
                 Arrays.asList(1, 1),
-                forthEvaluator.evaluateProgram(Collections.singletonList("1 DUP")));
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 dup")));
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void testDupParsingIsCaseInsensitive() {
+    public void testDupCopiesTopValueOnTheStack() {
         assertEquals(
                 Arrays.asList(1, 2, 2),
-                forthEvaluator.evaluateProgram(Collections.singletonList("1 2 Dup")));
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 2 dup")));
     }
 
     @Ignore("Remove to run test")
@@ -349,4 +341,52 @@ public class ForthEvaluatorTest {
         forthEvaluator.evaluateProgram(Collections.singletonList("foo"));
     }
 
+    @Ignore("Remove to run test")
+    @Test
+    public void testDupIsCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(1, 1, 1, 1),
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 DUP Dup dup")));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testDropIsCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(1),
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 2 3 4 DROP Drop drop")));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testSwapIsCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(2, 3, 4, 1),
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 2 SWAP 3 Swap 4 swap")));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testOverIsCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(1, 2, 1, 2, 1),
+                forthEvaluator.evaluateProgram(Collections.singletonList("1 2 OVER Over over")));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testUserDefinedWordsAreCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(1, 1, 1, 1),
+                forthEvaluator.evaluateProgram(Arrays.asList(": foo dup ;", "1 FOO Foo foo")));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testDefinitionsAreCaseInsensitive() {
+        assertEquals(
+                Arrays.asList(1, 1, 1, 1),
+                forthEvaluator.evaluateProgram(Arrays.asList(": SWAP DUP Dup dup ;", "1 swap")));
+    }
+
 }

data/tracks/java/exercises/pascals-triangle/.meta/version

@@ -1 +1 @@
-1.0.0
+1.2.0

data/tracks/java/exercises/pascals-triangle/src/test/java/PascalsTriangleGeneratorTest.java

@@ -73,6 +73,54 @@ public class PascalsTriangleGeneratorTest {
         assertArrayEquals(expectedOutput, pascalsTriangleGenerator.generateTriangle(4));
     }
 
+    @Ignore("Remove to run test")
+    @Test
+    public void testTriangleWithFiveRows() {
+        int[][] expectedOutput = new int[][]{
+            {1},
+            {1, 1},
+            {1, 2, 1},
+            {1, 3, 3, 1},
+            {1, 4, 6, 4, 1}
+        };
+
+        assertArrayEquals(expectedOutput, pascalsTriangleGenerator.generateTriangle(5));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testTriangleWithSixRows() {
+        int[][] expectedOutput = new int[][]{
+            {1},
+            {1, 1},
+            {1, 2, 1},
+            {1, 3, 3, 1},
+            {1, 4, 6, 4, 1},
+            {1, 5, 10, 10, 5, 1}
+        };
+
+        assertArrayEquals(expectedOutput, pascalsTriangleGenerator.generateTriangle(6));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testTriangleWithTenRows() {
+        int[][] expectedOutput = new int[][]{
+            {1},
+            {1, 1},
+            {1, 2, 1},
+            {1, 3, 3, 1},
+            {1, 4, 6, 4, 1},
+            {1, 5, 10, 10, 5, 1},
+            {1, 6, 15, 20, 15, 6, 1},
+            {1, 7, 21, 35, 35, 21, 7, 1},
+            {1, 8, 28, 56, 70, 56, 28, 8, 1},
+            {1, 9, 36, 84, 126, 126, 84, 36, 9, 1}
+        };
+
+        assertArrayEquals(expectedOutput, pascalsTriangleGenerator.generateTriangle(10));
+    }
+
     @Ignore("Remove to run test")
     @Test
     public void testValidatesNotNegativeRows() {

data/tracks/java/exercises/prime-factors/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/java/exercises/prime-factors/src/test/java/PrimeFactorsCalculatorTest.java

@@ -21,13 +21,9 @@ public class PrimeFactorsCalculatorTest {
         return Arrays.asList(new Object[][]{
                 {1L, Collections.emptyList()},
                 {2L, Collections.singletonList(2L)},
-                {3L, Collections.singletonList(3L)},
-                {4L, Arrays.asList(2L, 2L)},
-                {6L, Arrays.asList(2L, 3L)},
-                {8L, Arrays.asList(2L, 2L, 2L)},
                 {9L, Arrays.asList(3L, 3L)},
-                {27L, Arrays.asList(3L, 3L, 3L)},
-                {625L, Arrays.asList(5L, 5L, 5L, 5L)},
+                {8L, Arrays.asList(2L, 2L, 2L)},
+                {12L, Arrays.asList(2L, 2L, 3L)},
                 {901255L, Arrays.asList(5L, 17L, 23L, 461L)},
                 {93819012551L, Arrays.asList(11L, 9539L, 894119L)}
         });

data/tracks/java/exercises/protein-translation/.meta/version

@@ -1 +1 @@
-1.0.0
+1.0.1

data/tracks/java/exercises/roman-numerals/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/java/exercises/roman-numerals/src/test/java/RomanNumeralsTest.java

@@ -18,7 +18,6 @@ public class RomanNumeralsTest {
     @Parameters(name = "{index}: expected arabic numeral {0} to be converted to roman numeral \"{1}\".")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
-                {0, ""},
                 {1, "I"},
                 {2, "II"},
                 {3, "III"},

data/tracks/java/exercises/rotational-cipher/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/java/exercises/rotational-cipher/src/test/java/RotationalCipherTest.java

@@ -6,6 +6,13 @@ public class RotationalCipherTest {
 
     private RotationalCipher rotationalCipher;
 
+    @Test
+    public void rotateSingleCharacterBy0() {
+        rotationalCipher = new RotationalCipher(0);
+        Assert.assertEquals("a", rotationalCipher.rotate("a"));
+    }
+
+    @Ignore("Remove to run test")
     @Test
     public void rotateSingleCharacterBy1() {
         rotationalCipher = new RotationalCipher(1);
@@ -19,13 +26,6 @@ public class RotationalCipherTest {
         Assert.assertEquals("a", rotationalCipher.rotate("a"));
     }
 
-    @Ignore("Remove to run test")
-    @Test
-    public void rotateSingleCharacterBy0() {
-        rotationalCipher = new RotationalCipher(0);
-        Assert.assertEquals("a", rotationalCipher.rotate("a"));
-    }
-
     @Ignore("Remove to run test")
     @Test
     public void rotateSingleCharacterBy13() {

data/tracks/javascript/.eslintignore

@@ -4,7 +4,6 @@ exercises/binary-search
 exercises/binary-search-tree
 exercises/bowling
 exercises/bracket-push
-exercises/clock
 exercises/custom-set
 exercises/flatten-array
 exercises/grade-school

data/tracks/javascript/README.md

@@ -1,4 +1,4 @@
-# JavaScript [![Build Status](https://travis-ci.org/exercism/javascript.svg?branch=master)](https://travis-ci.org/exercism/javascript)
+# JavaScript [![Build Status](https://travis-ci.org/exercism/javascript.svg?branch=master)](https://travis-ci.org/exercism/javascript)[![Join the chat at https://gitter.im/exercism/xecmascript](https://badges.gitter.im/exercism/xecmascript.svg)](https://gitter.im/exercism/xecmascript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Exercism exercises in JavaScript
 

data/tracks/javascript/exercises/clock/example.js

@@ -8,15 +8,12 @@ var MILLIS_IN_AN_HOUR = MINUTES_IN_AN_HOUR * MILLIS_IN_A_MINUTE;
 var MILLIS_IN_A_DAY = HOURS_IN_A_DAY * MILLIS_IN_AN_HOUR;
 
 function makePositive(time, maxValue) {
-  time %= maxValue;
-  time += maxValue;
-  return time;
+  return time % maxValue + maxValue;
 }
 
-function at(hours, minutes) {
-  minutes = minutes || 0;
-  hours = makePositive(hours, HOURS_IN_A_DAY);
-  minutes = makePositive(minutes, MINUTES_IN_A_DAY);
+function at(inputHours, inputMinutes) {
+  var minutes = makePositive(inputMinutes || 0, MINUTES_IN_A_DAY);
+  var hours = makePositive(inputHours, HOURS_IN_A_DAY);
 
   var clock = {};
   var value = (hours * MILLIS_IN_AN_HOUR) + (minutes * MILLIS_IN_A_MINUTE);
@@ -31,13 +28,13 @@ function at(hours, minutes) {
     return time[0] + ':' + time[1];
   };
 
-  clock.plus = function (minutes) {
-    value += minutes * MILLIS_IN_A_MINUTE;
+  clock.plus = function (addMinutes) {
+    value += addMinutes * MILLIS_IN_A_MINUTE;
     return clock;
   };
 
-  clock.minus = function (minutes) {
-    value -= minutes * MILLIS_IN_A_MINUTE;
+  clock.minus = function (subMinutes) {
+    value -= subMinutes * MILLIS_IN_A_MINUTE;
     return clock;
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.84
+  version: 2.2.1.85
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -7066,6 +7066,13 @@ files:
 - tracks/haskell/exercises/trinary/src/Trinary.hs
 - tracks/haskell/exercises/trinary/stack.yaml
 - tracks/haskell/exercises/trinary/test/Tests.hs
+- tracks/haskell/exercises/twelve-days/README.md
+- tracks/haskell/exercises/twelve-days/examples/success-standard/package.yaml
+- tracks/haskell/exercises/twelve-days/examples/success-standard/src/TwelveDays.hs
+- tracks/haskell/exercises/twelve-days/package.yaml
+- tracks/haskell/exercises/twelve-days/src/TwelveDays.hs
+- tracks/haskell/exercises/twelve-days/stack.yaml
+- tracks/haskell/exercises/twelve-days/test/Tests.hs
 - tracks/haskell/exercises/word-count/HINTS.md
 - tracks/haskell/exercises/word-count/README.md
 - tracks/haskell/exercises/word-count/examples/success-newtype/package.yaml
@@ -7234,11 +7241,13 @@ files:
 - tracks/java/exercises/all-your-base/src/test/java/BaseConverterTest.java
 - tracks/java/exercises/allergies/.meta/src/reference/java/Allergen.java
 - tracks/java/exercises/allergies/.meta/src/reference/java/Allergies.java
+- tracks/java/exercises/allergies/.meta/version
 - tracks/java/exercises/allergies/README.md
 - tracks/java/exercises/allergies/build.gradle
 - tracks/java/exercises/allergies/src/main/java/Allergen.java
 - tracks/java/exercises/allergies/src/test/java/AllergiesTest.java
 - tracks/java/exercises/anagram/.meta/src/reference/java/Anagram.java
+- tracks/java/exercises/anagram/.meta/version
 - tracks/java/exercises/anagram/README.md
 - tracks/java/exercises/anagram/build.gradle
 - tracks/java/exercises/anagram/src/main/java/.keep
@@ -7250,6 +7259,7 @@ files:
 - tracks/java/exercises/armstrong-numbers/src/main/java/ArmstrongNumbers.java
 - tracks/java/exercises/armstrong-numbers/src/test/java/ArmstrongNumbersTest.java
 - tracks/java/exercises/atbash-cipher/.meta/src/reference/java/Atbash.java
+- tracks/java/exercises/atbash-cipher/.meta/version
 - tracks/java/exercises/atbash-cipher/README.md
 - tracks/java/exercises/atbash-cipher/build.gradle
 - tracks/java/exercises/atbash-cipher/src/main/java/.keep
@@ -7283,6 +7293,7 @@ files:
 - tracks/java/exercises/binary/src/main/java/.keep
 - tracks/java/exercises/binary/src/test/java/BinaryTest.java
 - tracks/java/exercises/bob/.meta/src/reference/java/Bob.java
+- tracks/java/exercises/bob/.meta/version
 - tracks/java/exercises/bob/README.md
 - tracks/java/exercises/bob/build.gradle
 - tracks/java/exercises/bob/src/main/java/.keep
@@ -7337,7 +7348,8 @@ files:
 - tracks/java/exercises/complex-numbers/build.gradle
 - tracks/java/exercises/complex-numbers/src/main/java/.keep
 - tracks/java/exercises/complex-numbers/src/test/java/ComplexNumberTest.java
-- tracks/java/exercises/crypto-square/.meta/src/reference/java/Crypto.java
+- tracks/java/exercises/crypto-square/.meta/src/reference/java/CryptoSquare.java
+- tracks/java/exercises/crypto-square/.meta/version
 - tracks/java/exercises/crypto-square/README.md
 - tracks/java/exercises/crypto-square/build.gradle
 - tracks/java/exercises/crypto-square/src/main/java/.keep
@@ -7556,6 +7568,7 @@ files:
 - tracks/java/exercises/poker/src/main/java/.keep
 - tracks/java/exercises/poker/src/test/java/PokerTest.java
 - tracks/java/exercises/prime-factors/.meta/src/reference/java/PrimeFactorsCalculator.java
+- tracks/java/exercises/prime-factors/.meta/version
 - tracks/java/exercises/prime-factors/README.md
 - tracks/java/exercises/prime-factors/build.gradle
 - tracks/java/exercises/prime-factors/src/main/java/.keep
@@ -7626,11 +7639,13 @@ files:
 - tracks/java/exercises/robot-simulator/src/main/java/Orientation.java
 - tracks/java/exercises/robot-simulator/src/test/java/RobotTest.java
 - tracks/java/exercises/roman-numerals/.meta/src/reference/java/RomanNumeral.java
+- tracks/java/exercises/roman-numerals/.meta/version
 - tracks/java/exercises/roman-numerals/README.md
 - tracks/java/exercises/roman-numerals/build.gradle
 - tracks/java/exercises/roman-numerals/src/main/java/.keep
 - tracks/java/exercises/roman-numerals/src/test/java/RomanNumeralsTest.java
 - tracks/java/exercises/rotational-cipher/.meta/src/reference/java/RotationalCipher.java
+- tracks/java/exercises/rotational-cipher/.meta/version
 - tracks/java/exercises/rotational-cipher/README.md
 - tracks/java/exercises/rotational-cipher/build.gradle
 - tracks/java/exercises/rotational-cipher/src/main/java/RotationalCipher.java

data/tracks/java/exercises/crypto-square/.meta/src/reference/java/Crypto.java

@@ -1,74 +0,0 @@
-import java.util.ArrayList;
-import java.util.List;
-
-class Crypto {
-
-    private String normalizedPlaintext;
-    private int squareSize;
-
-    Crypto(String text) {
-        this.normalizedPlaintext = normalizeText(text);
-        this.squareSize = calculateSquareSize(normalizedPlaintext);
-    }
-
-    String getNormalizedPlaintext() {
-        return normalizedPlaintext;
-    }
-
-    int getSquareSize() {
-        return squareSize;
-    }
-
-    private static String normalizeText(String text) {
-        return text.toLowerCase().codePoints()
-                .filter(x -> Character.isLetterOrDigit(x))
-                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
-                .toString();
-    }
-
-    private static int calculateSquareSize(String text) {
-        return (int) Math.ceil(Math.sqrt(text.length()));
-    }
-
-    List<String> getPlaintextSegments() {
-        return getSegmentText(normalizedPlaintext, squareSize);
-    }
-
-    private static List<String> getSegmentText(String text, int squareSize) {
-        List<String> segments = new ArrayList<>();
-        int index = 0;
-
-        while (index < text.length()) {
-            if (index + squareSize < text.length()) {
-                segments.add(text.substring(index, index + squareSize));
-            } else {
-                segments.add(text.substring(index));
-            }
-            index += squareSize;
-        }
-
-        return segments;
-    }
-
-    String getCipherText() {
-        return getNormalizedCipherText().replaceAll("\\s", "");
-    }
-
-    String getNormalizedCipherText() {
-        StringBuilder cipherText = new StringBuilder(normalizedPlaintext.length());
-
-        for (int index = 0; index < squareSize; index++) {
-            for (String segment : getPlaintextSegments()) {
-                if (index < segment.length()) {
-                    cipherText.append(segment.charAt(index));
-                }
-            }
-
-            if (index < squareSize - 1) {
-                cipherText.append(" ");
-            }
-        }
-
-        return cipherText.toString();
-    }
-}