binary and trinary exercises didn't have tests verifying if values were valid or not

Author: bressain

binary/BinaryTest.cs

@@ -15,11 +15,22 @@ public int Binary_converts_to_decimal(string binary)
     {
         return new Binary(binary).ToDecimal();
     }
+    
+    [TestCase("carrot", Ignore = true)]
+    [TestCase("2", Ignore = true)]
+    [TestCase("5", Ignore = true)]
+    [TestCase("9", Ignore = true)]
+    [TestCase("134678", Ignore = true)]
+    [TestCase("abc10z", Ignore = true)]
+    public void Invalid_binary_is_decimal_0(string invalidValue)
+    {
+        Assert.That(new Binary(invalidValue).ToDecimal(), Is.EqualTo(0));
+    }
 
     [Ignore]
     [Test]
-    public void Invalid_binary_is_decimal_0()
+    public void Binary_can_convert_formatted_strings()
     {
-        Assert.That(new Binary("carrot123").ToDecimal(), Is.EqualTo(0));
+        Assert.That(new Binary("011").ToDecimal(), Is.EqualTo(3));
     }
 }

binary/Example.cs

@@ -3,25 +3,25 @@
 
 public class Binary
 {
-    private readonly string number;
+    private readonly string value;
 
-    public Binary(string number)
+    public Binary(string value)
     {
-        this.number = number;
+        this.value = value;
     }
 
     public int ToDecimal()
     {
-        if (IsNotANumber()) return 0;
+        if (IsNotValidBinary()) return 0;
 
-        return number
-            .Select((c, i) => int.Parse(c.ToString()) * TwoToThePowerOf(number.Length - i - 1))
+        return value
+            .Select((c, i) => int.Parse(c.ToString()) * TwoToThePowerOf(value.Length - i - 1))
             .Sum();
     }
 
-    private bool IsNotANumber()
+    private bool IsNotValidBinary()
     {
-        return !number.All(char.IsDigit);
+        return !value.All(x => char.IsDigit(x) && int.Parse(x.ToString()) < 2);
     }
 
     private static int TwoToThePowerOf(int power)

trinary/Example.cs

@@ -12,16 +12,16 @@ public Trinary(string value)
 
     public int ToDecimal()
     {
-        if (IsNotNumeric()) return 0;
+        if (IsNotValidTrinary()) return 0;
 
         return value
             .Select((c, i) => int.Parse(c.ToString()) * ThreeToThePowerOf(value.Length - i - 1))
             .Sum();
     }
 
-    private bool IsNotNumeric()
+    private bool IsNotValidTrinary()
     {
-        return !value.All(char.IsDigit);
+        return !value.All(x => char.IsDigit(x) && int.Parse(x.ToString()) < 3);
     }
 
     private static int ThreeToThePowerOf(int power)

trinary/TrinaryTest.cs

@@ -17,10 +17,21 @@ public int Trinary_converts_to_decimal(string value)
         return new Trinary(value).ToDecimal();
     }
 
+    [TestCase("carrot", Ignore = true)]
+    [TestCase("3", Ignore = true)]
+    [TestCase("6", Ignore = true)]
+    [TestCase("9", Ignore = true)]
+    [TestCase("124578", Ignore = true)]
+    [TestCase("abc1z", Ignore = true)]
+    public void Invalid_trinary_is_decimal_0(string invalidValue)
+    {
+        Assert.That(new Trinary(invalidValue).ToDecimal(), Is.EqualTo(0));
+    }
+
     [Ignore]
     [Test]
-    public void Invalid_trinary_is_decimal_0()
+    public void Trinary_can_convert_formatted_strings()
     {
-        Assert.That(new Trinary("carrot").ToDecimal(), Is.EqualTo(0));
+        Assert.That(new Trinary("011").ToDecimal(), Is.EqualTo(4));
     }
 }