Changed trytecoverter to throw error, updated tests

Author: kwek20

jota/src/main/java/jota/utils/TrytesConverter.java

@@ -1,5 +1,7 @@
 package jota.utils;
 
+import jota.error.ArgumentException;
+
 /**
  * This class allows to convert between ASCII and tryte encoded strings.
  *
@@ -67,12 +69,13 @@ public static String asciiToTrytes(String inputString) {
      * 2 Trytes == 1 Byte
      * @param inputTrytes the trytes we want to convert
      * @return an ASCII string or null when the inputTrytes are uneven
+     * @throws ArgumentException When the trytes in the string are an odd number
      */
-    public static String trytesToAscii(String inputTrytes) {
+    public static String trytesToAscii(String inputTrytes) throws ArgumentException {
 
         // If input length is odd, return null
         if (inputTrytes.length() % 2 != 0)
-            return null;
+            throw new ArgumentException("Odd amount of trytes supplied");
 
         StringBuilder string = new StringBuilder();
 

jota/src/test/java/jota/TrytesConverterTest.java

@@ -1,5 +1,6 @@
 package jota;
 
+import jota.error.ArgumentException;
 import jota.utils.TrytesConverter;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
@@ -20,14 +21,24 @@ public void shouldConvertStringToTrytes() {
 
     @Test
     public void shouldConvertTrytesToString() {
-        assertEquals(TrytesConverter.trytesToAscii("IC"), "Z");
-        assertEquals(TrytesConverter.trytesToAscii("TBYBCCKBEATBYBCCKB"), "JOTA JOTA");
+        try {
+            assertEquals(TrytesConverter.trytesToAscii("IC"), "Z");
+            assertEquals(TrytesConverter.trytesToAscii("TBYBCCKBEATBYBCCKB"), "JOTA JOTA");
+        } catch (ArgumentException e) {
+            e.printStackTrace();
+        }
     }
 
     @Test
     public void shouldConvertBackAndForth() {
         String str = RandomStringUtils.randomAlphabetic(1000).toUpperCase();
-        String back = TrytesConverter.trytesToAscii(TrytesConverter.asciiToTrytes(str));
-        assertTrue(str.equals(back));
+        String back;
+        try {
+            back = TrytesConverter.trytesToAscii(TrytesConverter.asciiToTrytes(str));
+            assertTrue(str.equals(back));
+        } catch (ArgumentException e) {
+            e.printStackTrace();
+        }
+        
     }
 }