Minor changes from code inspection

2 files changed, 26 insertions, 41 deletions

diff --git a/core/src/test/java/com/google/zxing/aztec/encoder/EncoderTest.java b/core/src/test/java/com/google/zxing/aztec/encoder/EncoderTest.java
index 4678e5bd1..adf809772 100644
--- a/core/src/test/java/com/google/zxing/aztec/encoder/EncoderTest.java
+++ b/core/src/test/java/com/google/zxing/aztec/encoder/EncoderTest.java
@@ -425,8 +425,17 @@ public final class EncoderTest extends Assert {
         "...X. XXXXX ..X.. X....... ..X.XXX. ..X..... X.......");
   }
 
-  @Test
+  @Test(expected = IllegalArgumentException.class)
   public void testUserSpecifiedLayers() {
+    doTestUserSpecifiedLayers(33);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testUserSpecifiedLayers2() {
+    doTestUserSpecifiedLayers(-1);
+  }
+
+  private void doTestUserSpecifiedLayers(int userSpecifiedLayers) {
     String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     AztecCode aztec = Encoder.encode(alphabet, 25, -2);
     assertEquals(2, aztec.getLayers());
@@ -436,19 +445,17 @@ public final class EncoderTest extends Assert {
     assertEquals(32, aztec.getLayers());
     assertFalse(aztec.isCompact());
 
-    try {
-      Encoder.encode(alphabet, 25, 33);
-      fail("Encode should have failed.  No such thing as 33 layers");
-    } catch (IllegalArgumentException expected) {
-      // continue
-    }
+    Encoder.encode(alphabet, 25, userSpecifiedLayers);
+  }
 
-    try {
-      Encoder.encode(alphabet, 25, -1);
-      fail("Encode should have failed.  Text can't fit in 1-layer compact");
-    } catch (IllegalArgumentException expected) {
-      // continue
-    }
+  @Test(expected = IllegalArgumentException.class)
+  public void testBorderCompact4CaseFailed() {
+    // Compact(4) con hold 608 bits of information, but at most 504 can be data.  Rest must
+    // be error correction
+    String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    // encodes as 26 * 5 * 4 = 520 bits of data
+    String alphabet4 = alphabet + alphabet + alphabet + alphabet;
+    Encoder.encode(alphabet4, 0, -4);
   }
 
   @Test
@@ -458,12 +465,6 @@ public final class EncoderTest extends Assert {
     String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     // encodes as 26 * 5 * 4 = 520 bits of data
     String alphabet4 = alphabet + alphabet + alphabet + alphabet;
-    try {
-      Encoder.encode(alphabet4, 0, -4);
-      fail("Encode should have failed.  Text can't fit in 1-layer compact");
-    } catch (IllegalArgumentException expected) {
-      // continue
-    }
 
     // If we just try to encode it normally, it will go to a non-compact 4 layer
     AztecCode aztecCode = Encoder.encode(alphabet4, 0, Encoder.DEFAULT_AZTEC_LAYERS);
diff --git a/core/src/test/java/com/google/zxing/pdf417/decoder/PDF417DecoderTestCase.java b/core/src/test/java/com/google/zxing/pdf417/decoder/PDF417DecoderTestCase.java
index 6494a9a24..50cc9e48f 100644
--- a/core/src/test/java/com/google/zxing/pdf417/decoder/PDF417DecoderTestCase.java
+++ b/core/src/test/java/com/google/zxing/pdf417/decoder/PDF417DecoderTestCase.java
@@ -155,40 +155,24 @@ public class PDF417DecoderTestCase extends Assert {
     assertNull(resultMetadata.getOptionalData());
   }
 
-  @Test
+  @Test(expected = FormatException.class)
   public void testSampleWithBadSequenceIndexMacro() throws FormatException {
     int[] sampleCodes = {3, 928, 222, 0};
     PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
-
-    try {
-      DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
-    } catch (FormatException expected) {
-      // continue
-    }
+    DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
   }
 
-  @Test
+  @Test(expected = FormatException.class)
   public void testSampleWithNoFileIdMacro() throws FormatException {
     int[] sampleCodes = {4, 928, 222, 198, 0};
     PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
-
-    try {
-      DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
-    } catch (FormatException expected) {
-      // continue
-    }
+    DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
   }
 
-  @Test
+  @Test(expected = FormatException.class)
   public void testSampleWithNoDataNoMacro() throws FormatException {
     int[] sampleCodes = {3, 899, 899, 0};
-
-    try {
-      DecodedBitStreamParser.decode(sampleCodes, "0");
-    } catch (FormatException expected) {
-      // continue
-    }
-
+    DecodedBitStreamParser.decode(sampleCodes, "0");
   }
 
 }