trackler 2.0.8.34 → 2.0.8.35

data/tracks/objective-c/exercises/sublist/SublistExample.h

@@ -1,7 +1,14 @@
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSInteger, SublistKind) {
+    SublistKindSublist,
+    SublistKindSuperlist,
+    SublistKindEqual,
+    SublistKindUnequal
+};
+
 @interface SublistExample : NSObject
 
-+(NSString*)classifierForFirstList:(NSArray*)firstArray andSecondList:(NSArray*)secondArray;
++ (SublistKind)classifierForFirstList:(NSArray *)firstArray andSecondList:(NSArray *)secondArray;
 
 @end

data/tracks/objective-c/exercises/sublist/SublistExample.m

@@ -2,66 +2,51 @@
 
 @implementation SublistExample
 
-+(NSString*)classifierForFirstList:(NSArray *)firstArray andSecondList:(NSArray *)secondArray{
++ (SublistKind)classifierForFirstList:(NSArray *)firstArray andSecondList:(NSArray *)secondArray { //!OCLint
     
-    if([firstArray isEqualToArray:secondArray]){
-        
-        return @"equal";
-    
-    }else if(firstArray.count == 0 || secondArray.count == 0){
-        
-        if(firstArray.count == 0){
-            
-            return @"sublist";
+    if ([firstArray isEqualToArray:secondArray]){
+        return SublistKindEqual;
+    } else if (firstArray.count == 0 || secondArray.count == 0) {
+        if (firstArray.count == 0) {
+            return SublistKindSublist;
         }
         
-        return @"superlist";
-    
-    }else if(firstArray.count != secondArray.count){
-        
-        int i = 0;
+        return SublistKindSuperlist;
+    } else if (firstArray.count != secondArray.count) {
+        int i = 0; //!OCLint
         int count = 0;
         NSMutableArray *smallerArray = [NSMutableArray array];
         
-        int iterations = 0;
-        iterations = MAX((int)firstArray.count, (int)secondArray.count) - ((MIN((int)firstArray.count, (int)secondArray.count)-1));
+        unsigned long iterations = 0;
+        iterations = MAX(firstArray.count, secondArray.count) - ((MIN(firstArray.count, secondArray.count) - 1));
         
-        while(iterations > 0){
+        while (iterations > 0) {
+            int j = i; //!OCLint
             
-            int j = i;
-            while(count <= (MIN(firstArray.count, secondArray.count) - 1)){
-                
-                if(firstArray.count > secondArray.count){
-                    
-                    [smallerArray addObject:[firstArray objectAtIndex:j]];
-                }else{
-                    
-                    [smallerArray addObject:[secondArray objectAtIndex:j]];
+            while (count <= (MIN(firstArray.count, secondArray.count) - 1)) {
+                if (firstArray.count > secondArray.count) {
+                    [smallerArray addObject:firstArray[j]];
+                } else {
+                    [smallerArray addObject:secondArray[j]];
                 }
+                
                 j++;
                 count++;
             }
             
-            if([smallerArray isEqualToArray:firstArray]){
-                
-                return @"sublist";
-            
-            }else if([smallerArray isEqualToArray:secondArray]){
-                
-                return @"superlist";
-            }else{
-                
-                [smallerArray removeAllObjects];
-                i++;
-                count=0;
+            if ([smallerArray isEqualToArray:firstArray]) {
+                return SublistKindSublist;
+            } else if ([smallerArray isEqualToArray:secondArray]) {
+                return SublistKindSuperlist;
             }
             
-            
+            [smallerArray removeAllObjects];
+            i++;
+            count = 0;
             iterations--;
         }
-        
     }
     
-        return @"unequal";
+    return SublistKindUnequal;
 }
 @end

data/tracks/objective-c/exercises/sublist/SublistTest.m

@@ -10,107 +10,104 @@
 
 @end
 
-
 @implementation SublistTest
 
 - (void)testEmptyLists {
-    XCTAssertEqualObjects(@"equal", [SublistExample classifierForFirstList:@[] andSecondList:@[]]);
+    XCTAssertEqual(SublistKindEqual, [SublistExample classifierForFirstList:@[] andSecondList:@[]]);
 }
     
 - (void)testEmptyListWithinNonEmptyList {
     NSArray *secondList = @[@1, @2, @3];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:@[] andSecondList:secondList]);
-
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:@[] andSecondList:secondList]);
 }
     
 - (void)testNonEmptyListContainsEmptyList {
     NSArray *firstList = @[@1, @2, @3];
-    XCTAssertEqualObjects(@"superlist", [SublistExample classifierForFirstList:firstList andSecondList:@[]]);
+    XCTAssertEqual(SublistKindSuperlist, [SublistExample classifierForFirstList:firstList andSecondList:@[]]);
 }
     
 - (void)testListEqualsItself {
     NSArray *firstList = @[@1, @2, @3];
     NSArray *secondList = @[@1, @2, @3];
-    XCTAssertEqualObjects(@"equal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindEqual, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testDifferentLists {
     NSArray *firstList = @[@1, @2, @3];
     NSArray *secondList = @[@2, @3, @4];
-    XCTAssertEqualObjects(@"unequal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindUnequal, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testFalseStart {
     NSArray *firstList = @[@1, @2, @5];
     NSArray *secondList = @[@0, @1, @2, @3, @1, @2, @5, @6];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testConsecutive {
     NSArray *firstList = @[@1, @1, @2];
     NSArray *secondList = @[@0, @1, @1, @1, @2, @1, @2];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testSublistAtStart {
     NSArray *firstList = @[@0, @1, @2];
     NSArray *secondList = @[@0, @1, @2, @3, @4, @5];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testSublistInMiddle{
-    
     NSArray *firstList = @[@2, @3, @4];
     NSArray *secondList = @[@0, @1, @2, @3, @4, @5];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testSublistAtEnd {
     NSArray *firstList = @[@3, @4, @5];
     NSArray *secondList = @[@0, @1, @2, @3, @4, @5];
-    XCTAssertEqualObjects(@"sublist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSublist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testAtStartOfSuperlist {
     NSArray *firstList = @[@0, @1, @2, @3, @4, @5];
     NSArray *secondList = @[@0, @1, @2];
-    XCTAssertEqualObjects(@"superlist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSuperlist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testAtMiddleOfSuperlist {
     NSArray *firstList = @[@0, @1, @2, @3, @4, @5];
     NSArray *secondList = @[@2, @3];
-    XCTAssertEqualObjects(@"superlist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSuperlist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
 
 - (void)testAtEndOfSuperlist {
     NSArray *firstList = @[@0, @1, @2, @3, @4, @5];
     NSArray *secondList = @[@3, @4, @5];
-    XCTAssertEqualObjects(@"superlist", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindSuperlist, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testFirstListMissingElementFromSecondList {
     NSArray *firstList = @[@1, @3];
     NSArray *secondList = @[@1, @2, @3];
-    XCTAssertEqualObjects(@"unequal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindUnequal, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testSecondListMissingOneElementFromFirstList {
     NSArray *firstList = @[@1, @2, @3];
     NSArray *secondList = @[@1, @3];
-    XCTAssertEqualObjects(@"unequal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindUnequal, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testOrderMattersToAList {
     NSArray *firstList = @[@1, @2, @3];
     NSArray *secondList = @[@3, @2, @1];
-    XCTAssertEqualObjects(@"unequal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindUnequal, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
     
 - (void)testSameDigitsButDifferentNumbers {
     NSArray *firstList = @[@1, @0, @1];
     NSArray *secondList = @[@10, @1];
-    XCTAssertEqualObjects(@"unequal", [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
+    XCTAssertEqual(SublistKindUnequal, [SublistExample classifierForFirstList:firstList andSecondList:secondList]);
 }
 
 @end

data/tracks/python/exercises/say/say_test.py

@@ -3,7 +3,12 @@ import unittest
 from say import say
 
 
+# test cases adapted from `x-common//canonical-data.json` @ version: 1.0.0
+
 class SayTest(unittest.TestCase):
+    def test_zero(self):
+        self.assertEqual(say(0), "zero")
+
     def test_one(self):
         self.assertEqual(say(1), "one")
 
@@ -19,6 +24,7 @@ class SayTest(unittest.TestCase):
     def test_one_hundred(self):
         self.assertEqual(say(100), "one hundred")
 
+    # additional track specific test
     def test_one_hundred_twenty(self):
         self.assertEqual(say(120), "one hundred and twenty")
 
@@ -31,12 +37,14 @@ class SayTest(unittest.TestCase):
     def test_one_thousand_two_hundred_thirty_four(self):
         self.assertEqual(say(1234), "one thousand two hundred and thirty-four")
 
+    # additional track specific test
     def test_eight_hundred_and_ten_thousand(self):
         self.assertEqual(say(810000), "eight hundred and ten thousand")
 
     def test_one_million(self):
         self.assertEqual(say(1e6), "one million")
 
+    # additional track specific test
     def test_one_million_two(self):
         self.assertEqual(say(1000002), "one million and two")
 
@@ -48,17 +56,6 @@ class SayTest(unittest.TestCase):
     def test_one_billion(self):
         self.assertEqual(say(1e9), "one billion")
 
-    def test_number_to_large(self):
-        with self.assertRaises(AttributeError):
-            say(1e12)
-
-    def test_number_negative(self):
-        with self.assertRaises(AttributeError):
-            say(-42)
-
-    def test_zero(self):
-        self.assertEqual(say(0), "zero")
-
     def test_987654321123(self):
         self.assertEqual(
             say(987654321123), ("nine hundred and eighty-seven billion "
@@ -66,6 +63,14 @@ class SayTest(unittest.TestCase):
                                 "three hundred and twenty-one thousand "
                                 "one hundred and twenty-three"))
 
+    def test_number_to_large(self):
+        with self.assertRaises(AttributeError):
+            say(1e12)
+
+    def test_number_negative(self):
+        with self.assertRaises(AttributeError):
+            say(-1)
+
 
 if __name__ == '__main__':
     unittest.main()

data/tracks/scala/exercises/pangram/src/test/scala/PangramTest.scala

@@ -1,6 +1,8 @@
-import org.scalatest.{FunSuite, Matchers}
+import org.scalatest.{Matchers, FunSuite}
+
+/** @version 1.0.0 */
+class PangramTest extends FunSuite with Matchers {
 
-class PangramsTest extends FunSuite with Matchers {
   test("sentence empty") {
     Pangrams.isPangram("") should be (false)
   }
@@ -40,9 +42,8 @@ class PangramsTest extends FunSuite with Matchers {
     Pangrams.isPangram("\"Five quacking Zephyrs jolt my wax bed.\"") should be (true)
   }
 
-  test("pangram with non ascii characters") {
+  test("upper and lower case versions of the same character should not be counted separately") {
     pending
-    Pangrams.isPangram("Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich.") should be (true)
+    Pangrams.isPangram("the quick brown fox jumped over the lazy FOX") should be (false)
   }
-
 }

data/tracks/swift/exercises/bob/Sources/BobExample.swift

@@ -59,9 +59,9 @@ private extension String {
 struct Bob {
     static func hey(_ input: String) -> String {
         if input.trimWhiteSpace().isEmpty {
-            return "Fine, be that way."
+            return "Fine. Be that way!"
         } else if input.isShouting {
-            return "Woah, chill out!"
+            return "Whoa, chill out!"
         } else if input.isQuestion {
             return "Sure."
         } else {

data/tracks/swift/exercises/bob/Tests/BobTests/BobTests.swift

@@ -12,7 +12,7 @@ class BobTests: XCTestCase {
 
     func testShouting() {
         let input = "WATCH OUT!"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
@@ -40,14 +40,14 @@ class BobTests: XCTestCase {
 
     func testForcefulQuestions() {
         let input = "WHAT THE HELL WERE YOU THINKING?"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
 
     func testShoutingNumbers() {
         let input = "1, 2, 3 GO!"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
@@ -68,14 +68,14 @@ class BobTests: XCTestCase {
 
     func testShoutingWithSpecialCharacters() {
         let input = "ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
 
     func testShoutingWithUmlautsCharacters() {
         let input = "ÄMLÄTS!"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
@@ -89,7 +89,7 @@ class BobTests: XCTestCase {
 
     func testShoutingWithNoExclamationmark() {
         let input = "I HATE YOU"
-        let expected = "Woah, chill out!"
+        let expected = "Whoa, chill out!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
@@ -110,14 +110,14 @@ class BobTests: XCTestCase {
 
     func testSilence() {
         let input = ""
-        let expected = "Fine, be that way."
+        let expected = "Fine. Be that way!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }
 
     func testProlongedSilence() {
         let input = "     "
-        let expected = "Fine, be that way."
+        let expected = "Fine. Be that way!"
         let result = Bob.hey(input)
         XCTAssertEqual(expected, result)
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.34
+  version: 2.0.8.35
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1423,7 +1423,7 @@ files:
 - tracks/csharp/exercises/bank-account/HINTS.md
 - tracks/csharp/exercises/beer-song/BeerSong.cs
 - tracks/csharp/exercises/beer-song/BeerSong.csproj
-- tracks/csharp/exercises/beer-song/BeerTest.cs
+- tracks/csharp/exercises/beer-song/BeerSongTest.cs
 - tracks/csharp/exercises/beer-song/Example.cs
 - tracks/csharp/exercises/beer-song/HINTS.md
 - tracks/csharp/exercises/binary-search-tree/BinarySearchTree.cs
@@ -1841,10 +1841,12 @@ files:
 - tracks/csharp/generators/Data/ExerciseCollection.cs
 - tracks/csharp/generators/Exercises/AcronymExercise.cs
 - tracks/csharp/generators/Exercises/AtbashCipherExercise.cs
+- tracks/csharp/generators/Exercises/BeerSongExercise.cs
 - tracks/csharp/generators/Exercises/BooleanExercise.cs
 - tracks/csharp/generators/Exercises/EqualityExercise.cs
 - tracks/csharp/generators/Exercises/Exercise.cs
 - tracks/csharp/generators/Exercises/FoodChainExercise.cs
+- tracks/csharp/generators/Exercises/HelloWorldExercise.cs
 - tracks/csharp/generators/Exercises/IsogramExercise.cs
 - tracks/csharp/generators/Exercises/LeapExercise.cs
 - tracks/csharp/generators/Exercises/LuhnExercise.cs
@@ -1853,6 +1855,7 @@ files:
 - tracks/csharp/generators/Exercises/PigLatinExercise.cs
 - tracks/csharp/generators/Exercises/RaindropsExercise.cs
 - tracks/csharp/generators/Exercises/RomanNumeralsExercise.cs
+- tracks/csharp/generators/Exercises/WordyExercise.cs
 - tracks/csharp/generators/Generators.csproj
 - tracks/csharp/generators/Generators.csproj.user
 - tracks/csharp/generators/Generators.sln
@@ -3303,6 +3306,7 @@ files:
 - tracks/go/docs/RESOURCES.md
 - tracks/go/docs/TESTS.md
 - tracks/go/exercises/TRACK_HINTS.md
+- tracks/go/exercises/accumulate/accumulate.go
 - tracks/go/exercises/accumulate/accumulate_test.go
 - tracks/go/exercises/accumulate/example.go
 - tracks/go/exercises/acronym/acronym.go
@@ -3333,6 +3337,10 @@ files:
 - tracks/go/exercises/bob/example_gen.go
 - tracks/go/exercises/bracket-push/bracket_push_test.go
 - tracks/go/exercises/bracket-push/example.go
+- tracks/go/exercises/change/cases_test.go
+- tracks/go/exercises/change/change_test.go
+- tracks/go/exercises/change/example.go
+- tracks/go/exercises/change/example_gen.go
 - tracks/go/exercises/circular-buffer/circular_buffer_test.go
 - tracks/go/exercises/circular-buffer/example.go
 - tracks/go/exercises/clock/cases_test.go