trackler 2.2.1.46 → 2.2.1.47

data/tracks/csharp/generators/Exercises/QueenAttack.cs

@@ -48,10 +48,10 @@ private static string RenderCanAttackAssert(TestMethodBody testMethodBody)
 
         private static Tuple<int, int> GetCoordinatesFromPosition(dynamic expected)
         {
-            var coordinates = expected["position"].Split(',');
+            var coordinates = expected["position"];
 
-            var positionX = int.Parse(coordinates[0].TrimStart('('));
-            var positionY = int.Parse(coordinates[1].TrimEnd(')'));
+            var positionX = (int)coordinates["row"];
+            var positionY = (int)coordinates["column"];
 
             return Tuple.Create(positionX, positionY);
         }

data/tracks/dart/exercises/leap/test/leap_test.dart

@@ -10,7 +10,7 @@ void main() {
     });
 
     test("is introduced every 4 years to adjust about a day", () {
-      final year = new Year(2016);
+      final year = new Year(2020);
 
       expect(year.isLeap(), equals(true));
     }, skip: true);

data/tracks/delphi/exercises/hamming/uHammingTests.pas

@@ -115,12 +115,12 @@ end;
 
 procedure HammingTests.non_unique_character_in_first_strand;
 begin
-  Assert.AreEqual(1, THamming.Distance('AGA', 'AGG'));
+  Assert.AreEqual(1, THamming.Distance('AAG', 'AAA'));
 end;
 
 procedure HammingTests.non_unique_character_in_second_strand;
 begin
-  Assert.AreEqual(1, THamming.Distance('AGG', 'AGA'));
+  Assert.AreEqual(1, THamming.Distance('AAA', 'AAG'));
 end;
 
 procedure HammingTests.same_nucleotides_in_different_positions;

data/tracks/delphi/exercises/leap/uLeapTests.pas

@@ -11,67 +11,40 @@ type
   public
     [Test]
 //  [Ignore('Comment the "[Ignore]" statement to run the test')]
-    procedure test_leap_year;
+    procedure year_not_divisible_by_4_common_year;
 
     [Test]
     [Ignore]
-    procedure test_standard_and_odd_year;
+    procedure year_divisible_by_4_not_divisible_by_100_leap_year;
 
     [Test]
     [Ignore]
-    procedure test_standard_even_year;
+    procedure year_divisible_by_100_not_divisible_by_400_common_year;
 
     [Test]
     [Ignore]
-    procedure test_standard_nineteenth_century;
-
-    [Test]
-    [Ignore]
-    procedure test_standard_eighteenth_century;
-
-    [Test]
-    [Ignore]
-    procedure test_leap_twenty_fourth_century;
-
-    [Test]
-    [Ignore]
-    procedure test_leap_y2k;
+    procedure year_divisible_by_400_leap_year;
   end;
 
 implementation
 uses uLeap;
 
-procedure YearTest.test_leap_year;
-begin
-  assert.IsTrue(TYear.IsLeap(1996), 'Expected ''true'', 1996 is a leap year.');
-end;
-
-procedure YearTest.test_standard_and_odd_year;
-begin
-  assert.IsFalse(TYear.IsLeap(1997), 'Expected ''false'', 1997 is not a leap year.');
-end;
-
-procedure YearTest.test_standard_even_year;
-begin
-  assert.IsFalse(TYear.IsLeap(1998), 'Expected ''false'', 1998 is not a leap year.');
-end;
-
-procedure YearTest.test_standard_nineteenth_century;
+procedure YearTest.year_not_divisible_by_4_common_year;
 begin
-  assert.IsFalse(TYear.IsLeap(1900), 'Expected ''false'', 1900 is not a leap year.');
+  assert.IsFalse(TYear.IsLeap(2015), 'Expected ''false'', 2015 is not a leap year.');
 end;
 
-procedure YearTest.test_standard_eighteenth_century;
+procedure YearTest.year_divisible_by_4_not_divisible_by_100_leap_year;
 begin
-  assert.IsFalse(TYear.IsLeap(1800), 'Expected ''false'', 1800 is not a leap year.');
+  assert.IsTrue(TYear.IsLeap(2020), 'Expected ''true'', 2020 is a leap year.');
 end;
 
-procedure YearTest.test_leap_twenty_fourth_century;
+procedure YearTest.year_divisible_by_100_not_divisible_by_400_common_year;
 begin
-  assert.IsTrue(TYear.IsLeap(2400), 'Expected ''true'', 2400 is a leap year.');
+  assert.IsFalse(TYear.IsLeap(2100), 'Expected ''false'', 2100 is not a leap year.');
 end;
 
-procedure YearTest.test_leap_y2k;
+procedure YearTest.year_divisible_by_400_leap_year;
 begin
   assert.IsTrue(TYear.IsLeap(2000), 'Expected ''true'', 2000 is a leap year.');
 end;

data/tracks/delphi/exercises/nucleotide-count/uNucleotideCountExample.pas

@@ -57,7 +57,7 @@ function TDNA.Count(aChar: Char): integer;
 begin
   result := 0;
   if not fNucleotideCounts.TryGetValue(aChar, result) then
-    raise EInvalidNucleotideException.Create('Invalid Nucleotide');
+    raise EInvalidNucleotideException.Create('Invalid nucleotide in strand');
 end;
 
 end.

data/tracks/delphi/exercises/nucleotide-count/uNucleotideCountTest.pas

@@ -6,33 +6,23 @@ uses
 
 type
 
-  [TestFixture]
+  [TestFixture('count all nucleotides in a strand')]
   NucleoTideCountTest = class(TObject)
-  private
-    procedure CompareDictionaries(Expected, Actual: TDictionary<char, integer>);
   public
     [Test]
     procedure Validate_CompareDictionaries;
 
     [Test]
 //  [Ignore('Comment the "[Ignore]" statement to run the test')]
-    procedure Has_no_nucleotides;
+    procedure empty_strand;
 
     [Test]
     [Ignore]
-    procedure Has_no_adenosine;
+    procedure strand_with_repeated_nucleotide;
 
     [Test]
     [Ignore]
-    procedure Repetitive_cytidine_gets_counts;
-
-    [Test]
-    [Ignore]
-    procedure Repetitive_sequence_has_only_guanosine;
-
-    [Test]
-    [Ignore]
-    procedure Counts_only_thymidine;
+    procedure can_count_one_nucleotide_in_single_character_input;
 
     [Test]
     [Ignore]
@@ -40,17 +30,17 @@ type
 
     [Test]
     [Ignore]
-    procedure Validates_nucleotides;
+    procedure strand_with_invalid_nucleotides;
 
     [Test]
     [Ignore]
-    procedure Counts_all_nucleotides;
+    procedure strand_with_multiple_nucleotides;
   end;
 
 implementation
 uses SysUtils, uNucleotideCount;
 
-procedure NucleoTideCountTest.CompareDictionaries(Expected, Actual: TDictionary<Char, Integer>);
+procedure CompareDictionaries(Expected, Actual: TDictionary<Char, Integer>);
 var expectedArray,
     actualArray: TArray<TPair<char, integer>>;
     i: integer;
@@ -81,7 +71,7 @@ begin
   CompareDictionaries(expected, actual);
 end;
 
-procedure NucleoTideCountTest.Has_no_nucleotides;
+procedure NucleoTideCountTest.empty_strand;
 var dna: TDNA;
     expected: TDictionary<char, integer>;
 begin
@@ -96,27 +86,7 @@ begin
   CompareDictionaries(expected, dna.NucleotideCounts);
 end;
 
-procedure NucleoTideCountTest.Has_no_adenosine;
-var dna: TDNA;
-    inStr: string;
-begin
-  inStr := '';
-  dna := TDNA.Create(inStr);
-
-  Assert.AreEqual(length(inStr), dna.Count('A'));
-end;
-
-procedure NucleoTideCountTest.Repetitive_cytidine_gets_counts;
-var dna: TDNA;
-    inStr: string;
-begin
-  inStr := 'CCCCC';
-  dna := TDNA.Create(inStr);
-
-  Assert.AreEqual(length(inStr), dna.Count('C'));
-end;
-
-procedure NucleoTideCountTest.Repetitive_sequence_has_only_guanosine;
+procedure NucleoTideCountTest.strand_with_repeated_nucleotide;
 var dna: TDNA;
     expected: TDictionary<char, integer>;
     inStr: string;
@@ -125,24 +95,14 @@ begin
   expected.Add('A',0);
   expected.Add('T',0);
   expected.Add('C',0);
-  expected.Add('G',8);
-  inStr := 'GGGGGGGG';
+  expected.Add('G',7);
+  inStr := 'GGGGGGG';
 
   dna := TDNA.Create(inStr);
 
   CompareDictionaries(expected, dna.NucleotideCounts);
 end;
 
-procedure NucleoTideCountTest.Counts_only_thymidine;
-var dna: TDNA;
-    inStr: string;
-begin
-  inStr := 'GGGGTAACCCGG';
-  dna := TDNA.Create(inStr);
-
-  Assert.AreEqual(length('T'), dna.Count('T'));
-end;
-
 procedure NucleoTideCountTest.Counts_a_nucleotide_only_once;
 var dna: TDNA;
     inStr: string;
@@ -154,22 +114,38 @@ begin
   Assert.AreEqual(2, dna.Count('T'));
 end;
 
-procedure NucleoTideCountTest.Validates_nucleotides;
+procedure NucleoTideCountTest.strand_with_invalid_nucleotides;
 var MyProc: TTestLocalMethod;
 begin
   MyProc := procedure
             var dna: TDNA;
                 inStr: string;
             begin
-              inStr := 'GGTTGG';
+              inStr := 'AGXXACT';
               dna := TDNA.Create(inStr);
               dna.Count('X');
             end;
+  Assert.WillRaiseWithMessage(MyProc,EInvalidNucleotideException,'Invalid nucleotide in strand');
+end;
+
+procedure NucleoTideCountTest.can_count_one_nucleotide_in_single_character_input;
+var dna: TDNA;
+    expected: TDictionary<char, integer>;
+    inStr: string;
+begin
+  expected := TDictionary<char, integer>.Create;
+  expected.Add('A',0);
+  expected.Add('T',0);
+  expected.Add('C',0);
+  expected.Add('G',1);
+  inStr := 'G';
 
-  Assert.WillRaise(MyProc, EInvalidNucleotideException);
+  dna := TDNA.Create(inStr);
+
+  CompareDictionaries(expected, dna.NucleotideCounts);
 end;
 
-procedure NucleoTideCountTest.Counts_all_nucleotides;
+procedure NucleoTideCountTest.strand_with_multiple_nucleotides;
 var dna: TDNA;
     expected: TDictionary<char, integer>;
     inStr: string;

data/tracks/ecmascript/config.json

@@ -328,6 +328,22 @@
         "Arrays"
       ]
     },
+    {
+      "uuid": "0125f5a7-8883-4553-a6c1-45f19544af5e",
+      "slug": "word-search",
+      "core": false,
+      "unlocked_by": "linked-list",
+      "difficulty": 8,
+      "topics": [
+        "Control-flow (conditionals)",
+        "Control-flow (loops)",
+        "Optional values",
+        "Equality",
+        "Text formatting",
+        "Parsing",
+        "Arrays"
+      ]
+    },
     {
       "uuid": "d003975a-9045-4f03-9ad9-c15db584dc13",
       "slug": "grains",
@@ -354,6 +370,21 @@
         "Mathematics"
       ]
     },
+    {
+      "uuid": "363b8810-0bd1-c480-b23c-6b5f629975e7452b123",
+      "slug": "collatz-conjecture",
+      "core": false,
+      "unlocked_by": "leap",
+      "difficulty": 3,
+      "topics": [
+        "Control-flow (conditionals)",
+        "Control-flow (loops)",
+        "Recursion",
+        "Exception_handling",
+        "Integers",
+        "Mathematics"
+      ]
+    },
     {
       "uuid": "4e0e2c30-be33-49b6-b196-213888a93a0c",
       "slug": "clock",

data/tracks/ecmascript/config/maintainers.json

@@ -2,12 +2,12 @@
   "maintainers": [
     {
       "github_username": "rchavarria",
-      "show_on_website": false,
+      "show_on_website": true,
       "alumnus": false,
-      "name": null,
-      "bio": null,
-      "link_text": null,
-      "link_url": null,
+      "name": "Rubén Chavarría",
+      "bio": "I'm a Web Developer with a passion for taking code that is hard to maintain and cleaning, refactoring, and bringing it back into a manageable state",
+      "link_text": "Here is where I blog",
+      "link_url": "https://rchavarria.github.io/",
       "avatar_url": null
     },
     {

data/tracks/ecmascript/exercises/accumulate/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/acronym/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/all-your-base/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/allergies/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/alphametics/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/anagram/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/atbash-cipher/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/beer-song/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",

data/tracks/ecmascript/exercises/binary-search-tree/package.json

@@ -39,7 +39,7 @@
       ],
       ["transform-regenerator"]
     ]
-},
+  },
   "scripts": {
     "test": "jest --no-cache ./*",
     "watch": "jest --no-cache --watch ./*",