trackler 2.0.8.33 → 2.0.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378ca12e2afc9bb24632918400f6eda2a274edbe
-  data.tar.gz: 86c7fd6d6280d19c15a3e887f2bbd380442cec0d
+  metadata.gz: 467e8b1c3c1e08aa0d2a39ab3da213a0d3887255
+  data.tar.gz: 4ccd48c1a3f3cb53a0cc24d007f192237918ffa1
 SHA512:
-  metadata.gz: 9e407a254474cff7f8437b2e81e94e2e961cd744e14dd4c18636b73eba4a7b067a929e4cb258b8702f3a9ffaf0037fb710bb7da052acb2d78fe5c02a15a4a7f4
-  data.tar.gz: 837226938c97906142bb821b5917919562f475c7b0315c683a8e27b579cf7d4939fb341f188a39db94371fcb3e29adad6af0758525434f0f0017a9fd49a6230f
+  metadata.gz: 64dd3dca50f78d5bcd3986c94dad46d5f0e82769c06d1489295a5c3bae081178c1f77758e197937a704b5041345604df5cd3f2e8ea61dceded2f1f3f8414214e
+  data.tar.gz: d67de57f391f6180ddbff1fb9086ede70aa7155b51f94942d294c805af4b7bb0783a675d2c8f1cc66d82514e6e3b323d70f993f6d81565e043f8ade560dae4a2

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.8.33"
+  VERSION = "2.0.8.34"
 end

data/tracks/csharp/exercises/food-chain/Example.cs

@@ -36,10 +36,10 @@ public static class FoodChain
          "I don't know why she swallowed the fly. Perhaps she'll die."
     };
 
-    public static string Song() => string.Join("\n\n", Enumerable.Range(1, Verses).Select(Verse));
-
     public static string Verse(int number) => $"{VerseBegin(number)}\n{VerseEnd(number)}";
 
+    public static string Verse(int begin, int end) => string.Join("\n\n", Enumerable.Range(begin, end - begin + 1).Select(i => Verse(i)));
+
     private static string VerseBegin(int number)
     {
         if (number == 1)

data/tracks/csharp/exercises/food-chain/FoodChain.cs

@@ -2,12 +2,12 @@
 
 public static class FoodChain
 {
-    public static string Song() 
+    public static string Verse(int number) 
     {
         throw new NotImplementedException("You need to implement this function.");
     }
 
-    public static string Verse(int number) 
+    public static string Verse(int begin, int end) 
     {
         throw new NotImplementedException("You need to implement this function.");
     }

data/tracks/csharp/exercises/food-chain/FoodChainTest.cs

@@ -1,103 +1,180 @@
-using Xunit;
+using Xunit;
 
 public class FoodChainTest
 {
     [Fact]
-    public void Verse_one()
+    public void Fly()
     {
-        const string expected = "I know an old lady who swallowed a fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.";
-
+        var expected = 
+            "I know an old lady who swallowed a fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
         Assert.Equal(expected, FoodChain.Verse(1));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Verse_two()
+    public void Spider()
     {
-        const string expected = "I know an old lady who swallowed a spider.\n" +
-                                "It wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.";
-
+        var expected = 
+            "I know an old lady who swallowed a spider.\n"+
+            "It wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
         Assert.Equal(expected, FoodChain.Verse(2));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Verse_four()
+    public void Bird()
     {
-        const string expected = "I know an old lady who swallowed a cat.\n" +
-                                "Imagine that, to swallow a cat!\n" +
-                                "She swallowed the cat to catch the bird.\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.";
+        var expected = 
+            "I know an old lady who swallowed a bird.\n"+
+            "How absurd to swallow a bird!\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
+        Assert.Equal(expected, FoodChain.Verse(3));
+    }
 
+    [Fact(Skip = "Remove to run test")]
+    public void Cat()
+    {
+        var expected = 
+            "I know an old lady who swallowed a cat.\n"+
+            "Imagine that, to swallow a cat!\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
         Assert.Equal(expected, FoodChain.Verse(4));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Verse_eight()
+    public void Dog()
     {
-        const string expected = "I know an old lady who swallowed a horse.\n" +
-                                "She's dead, of course!";
+        var expected = 
+            "I know an old lady who swallowed a dog.\n"+
+            "What a hog, to swallow a dog!\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
+        Assert.Equal(expected, FoodChain.Verse(5));
+    }
+
+    [Fact(Skip = "Remove to run test")]
+    public void Goat()
+    {
+        var expected = 
+            "I know an old lady who swallowed a goat.\n"+
+            "Just opened her throat and swallowed a goat!\n"+
+            "She swallowed the goat to catch the dog.\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
+        Assert.Equal(expected, FoodChain.Verse(6));
+    }
 
+    [Fact(Skip = "Remove to run test")]
+    public void Cow()
+    {
+        var expected = 
+            "I know an old lady who swallowed a cow.\n"+
+            "I don't know how she swallowed a cow!\n"+
+            "She swallowed the cow to catch the goat.\n"+
+            "She swallowed the goat to catch the dog.\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
+        Assert.Equal(expected, FoodChain.Verse(7));
+    }
+
+    [Fact(Skip = "Remove to run test")]
+    public void Horse()
+    {
+        var expected = 
+            "I know an old lady who swallowed a horse.\n"+
+            "She's dead, of course!";
         Assert.Equal(expected, FoodChain.Verse(8));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Complete_song()
+    public void Multiple_verses()
     {
-        const string expected = "I know an old lady who swallowed a fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a spider.\n" +
-                                "It wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a bird.\n" +
-                                "How absurd to swallow a bird!\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a cat.\n" +
-                                "Imagine that, to swallow a cat!\n" +
-                                "She swallowed the cat to catch the bird.\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a dog.\n" +
-                                "What a hog, to swallow a dog!\n" +
-                                "She swallowed the dog to catch the cat.\n" +
-                                "She swallowed the cat to catch the bird.\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a goat.\n" +
-                                "Just opened her throat and swallowed a goat!\n" +
-                                "She swallowed the goat to catch the dog.\n" +
-                                "She swallowed the dog to catch the cat.\n" +
-                                "She swallowed the cat to catch the bird.\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a cow.\n" +
-                                "I don't know how she swallowed a cow!\n" +
-                                "She swallowed the cow to catch the goat.\n" +
-                                "She swallowed the goat to catch the dog.\n" +
-                                "She swallowed the dog to catch the cat.\n" +
-                                "She swallowed the cat to catch the bird.\n" +
-                                "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
-                                "She swallowed the spider to catch the fly.\n" +
-                                "I don't know why she swallowed the fly. Perhaps she'll die.\n" +
-                                "\n" +
-                                "I know an old lady who swallowed a horse.\n" +
-                                "She's dead, of course!";
+        var expected = 
+            "I know an old lady who swallowed a fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a spider.\n"+
+            "It wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a bird.\n"+
+            "How absurd to swallow a bird!\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.";
+        Assert.Equal(expected, FoodChain.Verse(1, 3));
+    }
 
-        Assert.Equal(expected, FoodChain.Song());
+    [Fact(Skip = "Remove to run test")]
+    public void Full_song()
+    {
+        var expected = 
+            "I know an old lady who swallowed a fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a spider.\n"+
+            "It wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a bird.\n"+
+            "How absurd to swallow a bird!\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a cat.\n"+
+            "Imagine that, to swallow a cat!\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a dog.\n"+
+            "What a hog, to swallow a dog!\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a goat.\n"+
+            "Just opened her throat and swallowed a goat!\n"+
+            "She swallowed the goat to catch the dog.\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a cow.\n"+
+            "I don't know how she swallowed a cow!\n"+
+            "She swallowed the cow to catch the goat.\n"+
+            "She swallowed the goat to catch the dog.\n"+
+            "She swallowed the dog to catch the cat.\n"+
+            "She swallowed the cat to catch the bird.\n"+
+            "She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
+            "She swallowed the spider to catch the fly.\n"+
+            "I don't know why she swallowed the fly. Perhaps she'll die.\n"+
+            "\n"+
+            "I know an old lady who swallowed a horse.\n"+
+            "She's dead, of course!";
+        Assert.Equal(expected, FoodChain.Verse(1, 8));
     }
 }

data/tracks/csharp/exercises/luhn/LuhnTest.cs

@@ -14,32 +14,30 @@ public void A_single_zero_is_invalid()
         Assert.False(Luhn.IsValid("0"));
     }
 
-
     [Fact(Skip = "Remove to run test")]
-    public void A_simple_valid_SIN_that_remains_valid_if_reversed()
+    public void A_simple_valid_sin_that_remains_valid_if_reversed()
     {
         Assert.True(Luhn.IsValid("059"));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void A_simple_valid_SIN_that_becomes_invalid_if_reversed()
+    public void A_simple_valid_sin_that_becomes_invalid_if_reversed()
     {
         Assert.True(Luhn.IsValid("59"));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void A_valid_Canadian_SIN()
+    public void A_valid_canadian_sin()
     {
         Assert.True(Luhn.IsValid("055 444 285"));
     }
 
     [Fact(Skip = "Remove to run test")]
-    public void Invalid_Canadian_SIN()
+    public void Invalid_canadian_sin()
     {
         Assert.False(Luhn.IsValid("055 444 286"));
     }
 
-
     [Fact(Skip = "Remove to run test")]
     public void Invalid_credit_card()
     {
@@ -81,5 +79,4 @@ public void Input_digit_9_is_correctly_converted_to_output_digit_9()
     {
         Assert.True(Luhn.IsValid("091"));
     }
-
-}
+}

data/tracks/csharp/generators/Data/CanonicalDataValue.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json.Linq;
+
+namespace Generators.Data
+{
+    public static class CanonicalDataValue
+    {
+        public static string StringArrayToString(object expected)
+            => string.Join("\\n\"+\n\"", ((JArray) expected).Values<string>());
+    }
+}

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

@@ -0,0 +1,27 @@
+using Generators.Data;
+using Generators.Methods;
+
+namespace Generators.Exercises
+{
+    public class FoodChainExercise : EqualityExercise
+    {
+        public FoodChainExercise() : base("food-chain")
+        {
+        }
+
+        protected override TestMethodData CreateTestMethodData(CanonicalData canonicalData, CanonicalDataCase canonicalDataCase, int index)
+        {
+            var testMethodData = base.CreateTestMethodData(canonicalData, canonicalDataCase, index);
+
+            testMethodData.Options.UseVariableForExpected = true;
+            testMethodData.CanonicalDataCase.Expected = CanonicalDataValue.StringArrayToString(canonicalDataCase.Expected);
+
+            if (testMethodData.CanonicalDataCase.Data.ContainsKey("end verse"))
+                testMethodData.CanonicalDataCase.Input = new[] { testMethodData.CanonicalDataCase.Data["start verse"], testMethodData.CanonicalDataCase.Data["end verse"] };
+            else
+                testMethodData.Options.InputProperty = "start verse";
+
+            return testMethodData;
+        }
+    }
+}

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

@@ -1,7 +1,5 @@
 using System;
-using Generators.Data;
 using Generators.Methods;
-using Humanizer;
 
 namespace Generators.Exercises
 {
@@ -13,7 +11,7 @@ public NthPrimeExercise() : base("nth-prime")
 
         protected override TestMethod CreateTestMethod(TestMethodData testMethodData)
         {
-            if (testMethodData.CanonicalDataCase.Expected is bool b)
+            if (testMethodData.CanonicalDataCase.Expected is bool b && !b)
             {
                 testMethodData.Options.ExceptionType = typeof(ArgumentOutOfRangeException);
                 return CreateExceptionTestMethod(testMethodData);

data/tracks/csharp/generators/Methods/EqualityTestMethodGenerator.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Linq;
 
 namespace Generators.Methods
 {
     public class EqualityTestMethodGenerator : TestMethodGenerator
     {
+        private const string Tab = "    ";
+
         protected override string Body 
         {
             get
@@ -11,15 +14,36 @@ protected override string Body
                 switch (TestMethodData.Options.TestedMethodType)
                 {
                     case TestedMethodType.Static:
+                        if (TestMethodData.Options.UseVariableForExpected)
+                            return $"var expected = {FormattedExpectedVariable};\nAssert.Equal(expected, {TestedClassName}.{TestedMethod}({Input}));";
+
                         return $"Assert.Equal({Expected}, {TestedClassName}.{TestedMethod}({Input}));";
                     case TestedMethodType.Instance:
+                        if (TestMethodData.Options.UseVariableForExpected)
+                            return $"var expected = {FormattedExpectedVariable};\nvar sut = new {TestedClassName}();\n    Assert.Equal({Expected}, sut.{TestedMethod}({Input}));";
+
                         return $"var sut = new {TestedClassName}();\n    Assert.Equal({Expected}, sut.{TestedMethod}({Input}));";
                     case TestedMethodType.Extension:
+                        if (TestMethodData.Options.UseVariableForExpected)
+                            return $"var expected = {FormattedExpectedVariable};\nAssert.Equal(expected, {Input}.{TestedMethod}());";
+
                         return $"Assert.Equal({Expected}, {Input}.{TestedMethod}());";
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
             }
-        } 
+        }
+
+        protected virtual string FormattedExpectedVariable
+        {
+            get
+            {
+                var lines = Expected.ToString().Split('\n');
+                if (lines.Length == 1)
+                    return lines[0];
+
+                return "\n" + string.Join("\n", lines.Select(line => $"{Tab}{line}"));
+            }
+        }
     }
 }