Merge pull request #1211 from FridaTveit/AllYourBaseUpdate

all-your-base: update tests to version 2.1.0

exercises/all-your-base/.meta/src/reference/java/BaseConverter.java

@@ -39,11 +39,7 @@ final class BaseConverter {
         }
 
         if (originalDigits.length == 0) {
-            throw new IllegalArgumentException("You must supply at least one digit.");
-        }
-
-        if (originalDigits.length > 1 && originalDigits[0] == 0) {
-            throw new IllegalArgumentException("Digits may not contain leading zeros.");
+            return;
         }
 
         if (Arrays.stream(originalDigits).min().getAsInt() < 0) {

exercises/all-your-base/.meta/version

@@ -1 +1 @@
-1.1.0
+2.1.0

exercises/all-your-base/src/test/java/BaseConverterTest.java

@@ -150,10 +150,18 @@ public class BaseConverterTest {
     @Ignore("Remove to run test")
     @Test
     public void testEmptyDigits() {
-        expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("You must supply at least one digit.");
+        final BaseConverter baseConverter = new BaseConverter(2, new int[]{});
+
+        final int[] expectedDigits = new int[]{0};
+        final int[] actualDigits = baseConverter.convertToBase(10);
 
-        new BaseConverter(2, new int[]{});
+        assertArrayEquals(
+            String.format(
+                "Expected digits: %s but found digits: %s",
+                Arrays.toString(expectedDigits),
+                Arrays.toString(actualDigits)),
+            expectedDigits,
+            actualDigits);
     }
 
     @Ignore("Remove to run test")
@@ -176,19 +184,35 @@ public class BaseConverterTest {
     @Ignore("Remove to run test")
     @Test
     public void testMultipleZeros() {
-        expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("Digits may not contain leading zeros.");
+        final BaseConverter baseConverter = new BaseConverter(10, new int[]{0, 0, 0});
+
+        final int[] expectedDigits = new int[]{0};
+        final int[] actualDigits = baseConverter.convertToBase(2);
 
-        new BaseConverter(10, new int[]{0, 0, 0});
+        assertArrayEquals(
+            String.format(
+                "Expected digits: %s but found digits: %s",
+                Arrays.toString(expectedDigits),
+                Arrays.toString(actualDigits)),
+            expectedDigits,
+            actualDigits);
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testLeadingZeros() {
-        expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage("Digits may not contain leading zeros.");
+        final BaseConverter baseConverter = new BaseConverter(7, new int[]{0, 6, 0});
+
+        final int[] expectedDigits = new int[]{4, 2};
+        final int[] actualDigits = baseConverter.convertToBase(10);
 
-        new BaseConverter(7, new int[]{0, 6, 0});
+        assertArrayEquals(
+            String.format(
+                "Expected digits: %s but found digits: %s",
+                Arrays.toString(expectedDigits),
+                Arrays.toString(actualDigits)),
+            expectedDigits,
+            actualDigits);
     }
 
     @Ignore("Remove to run test")
@@ -250,7 +274,7 @@ public class BaseConverterTest {
     @Ignore("Remove to run test")
     @Test
     public void testSecondBaseIsZero() {
-        final BaseConverter baseConverter = new BaseConverter(2, new int[]{1, 0, 1, 0, 1, 0});
+        final BaseConverter baseConverter = new BaseConverter(10, new int[]{7});
 
         expectedException.expect(IllegalArgumentException.class);
         expectedException.expectMessage("Bases must be at least 2.");