Check if characters are digits for EAN_13, EAN_8, ITF and UPC_EAN_EXTENSION (#1039)

* Check if characters are digits

* Use regex to check if input is valid. Added tests

* Create checkNumeric method

* Remove unused locals, moved attributes to top of class.

* Simplify testcase

* Reduce repeated code

* Fixed indentation

4 files changed, 17 insertions, 0 deletions

diff --git a/core/src/test/java/com/google/zxing/oned/EAN13WriterTestCase.java b/core/src/test/java/com/google/zxing/oned/EAN13WriterTestCase.java
index e95799970..679b6f7ef 100644
--- a/core/src/test/java/com/google/zxing/oned/EAN13WriterTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/EAN13WriterTestCase.java
@@ -42,4 +42,8 @@ public final class EAN13WriterTestCase extends Assert {
     assertEquals(testStr, BitMatrixTestCase.matrixToString(result));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testEncodeIllegalCharacters() throws WriterException {
+    new EAN13Writer().encode("5901234123abc", BarcodeFormat.EAN_13, 0, 0);
+  }
 }
diff --git a/core/src/test/java/com/google/zxing/oned/EAN8WriterTestCase.java b/core/src/test/java/com/google/zxing/oned/EAN8WriterTestCase.java
index 8594d5c39..512e8ef00 100644
--- a/core/src/test/java/com/google/zxing/oned/EAN8WriterTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/EAN8WriterTestCase.java
@@ -42,4 +42,8 @@ public final class EAN8WriterTestCase extends Assert {
     assertEquals(testStr, BitMatrixTestCase.matrixToString(result));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testEncodeIllegalCharacters() throws WriterException {
+    new EAN8Writer().encode("96385abc", BarcodeFormat.EAN_8, 0, 0);
+  }
 }
diff --git a/core/src/test/java/com/google/zxing/oned/ITFWriterTestCase.java b/core/src/test/java/com/google/zxing/oned/ITFWriterTestCase.java
index 56842b241..79635658d 100644
--- a/core/src/test/java/com/google/zxing/oned/ITFWriterTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/ITFWriterTestCase.java
@@ -40,4 +40,9 @@ public final class ITFWriterTestCase extends Assert {
     assertEquals(expected, BitMatrixTestCase.matrixToString(result));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testEncodeIllegalCharacters() throws WriterException {
+    new ITFWriter().encode("00123456789abc", BarcodeFormat.ITF, 0, 0);
+  }
+
 }
diff --git a/core/src/test/java/com/google/zxing/oned/UPCEWriterTestCase.java b/core/src/test/java/com/google/zxing/oned/UPCEWriterTestCase.java
index dd7db3f74..93eb4f415 100644
--- a/core/src/test/java/com/google/zxing/oned/UPCEWriterTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/UPCEWriterTestCase.java
@@ -51,4 +51,8 @@ public final class UPCEWriterTestCase extends Assert {
     assertEquals(encoding, BitMatrixTestCase.matrixToString(result));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testEncodeIllegalCharacters() throws WriterException {
+    new UPCEWriter().encode("05096abc", BarcodeFormat.UPC_E, 0, 0);
+  }
 }