Small code improvements from inspections

6 files changed, 23 insertions, 23 deletions

diff --git a/core/src/test/java/com/google/zxing/datamatrix/encoder/SymbolInfoTestCase.java b/core/src/test/java/com/google/zxing/datamatrix/encoder/SymbolInfoTestCase.java
index 8614f3c8d..3a6c8bff8 100644
--- a/core/src/test/java/com/google/zxing/datamatrix/encoder/SymbolInfoTestCase.java
+++ b/core/src/test/java/com/google/zxing/datamatrix/encoder/SymbolInfoTestCase.java
@@ -75,6 +75,7 @@ public final class SymbolInfoTestCase extends Assert {
     Dimension fixedSize = new Dimension(26, 26);
     info = SymbolInfo.lookup(35,
                              SymbolShapeHint.FORCE_NONE, fixedSize, fixedSize, false);
+    assertNotNull(info);
     assertEquals(26, info.getSymbolWidth());
     assertEquals(26, info.getSymbolHeight());
 
@@ -87,16 +88,19 @@ public final class SymbolInfoTestCase extends Assert {
 
     info = SymbolInfo.lookup(35,
                              SymbolShapeHint.FORCE_NONE, minSize, maxSize, false);
+    assertNotNull(info);
     assertEquals(26, info.getSymbolWidth());
     assertEquals(26, info.getSymbolHeight());
 
     info = SymbolInfo.lookup(40,
                              SymbolShapeHint.FORCE_NONE, minSize, maxSize, false);
+    assertNotNull(info);
     assertEquals(26, info.getSymbolWidth());
     assertEquals(26, info.getSymbolHeight());
 
     info = SymbolInfo.lookup(45,
                              SymbolShapeHint.FORCE_NONE, minSize, maxSize, false);
+    assertNotNull(info);
     assertEquals(32, info.getSymbolWidth());
     assertEquals(32, info.getSymbolHeight());
 
diff --git a/core/src/test/java/com/google/zxing/oned/Code93WriterTestCase.java b/core/src/test/java/com/google/zxing/oned/Code93WriterTestCase.java
index b9b9f672e..c5aa4ff6f 100644
--- a/core/src/test/java/com/google/zxing/oned/Code93WriterTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/Code93WriterTestCase.java
@@ -60,7 +60,7 @@ public final class Code93WriterTestCase extends Assert {
   }
 
   @Test
-  public void testConvertToExtended() throws Exception {
+  public void testConvertToExtended() {
     // non-extended chars are not changed.
     String src = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%";
     String dst = Code93Writer.convertToExtended(src);
diff --git a/core/src/test/java/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java b/core/src/test/java/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
index 1c42db30d..609c91108 100644
--- a/core/src/test/java/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
+++ b/core/src/test/java/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
@@ -76,7 +76,7 @@ public final class BitArrayBuilderTest extends Assert {
         rightChar = null;
       }
 
-      ExpandedPair expandedPair = new ExpandedPair(leftChar, rightChar, null, true);
+      ExpandedPair expandedPair = new ExpandedPair(leftChar, rightChar, null);
       pairs.add(expandedPair);
     }
 
diff --git a/core/src/test/java/com/google/zxing/qrcode/decoder/ErrorCorrectionLevelTestCase.java b/core/src/test/java/com/google/zxing/qrcode/decoder/ErrorCorrectionLevelTestCase.java
index c12452a88..64b5f60c4 100644
--- a/core/src/test/java/com/google/zxing/qrcode/decoder/ErrorCorrectionLevelTestCase.java
+++ b/core/src/test/java/com/google/zxing/qrcode/decoder/ErrorCorrectionLevelTestCase.java
@@ -30,13 +30,11 @@ public final class ErrorCorrectionLevelTestCase extends Assert {
     assertSame(ErrorCorrectionLevel.L, ErrorCorrectionLevel.forBits(1));
     assertSame(ErrorCorrectionLevel.H, ErrorCorrectionLevel.forBits(2));
     assertSame(ErrorCorrectionLevel.Q, ErrorCorrectionLevel.forBits(3));
-    try {
-      ErrorCorrectionLevel.forBits(4);
-      fail("Should have thrown an exception");
-    } catch (IllegalArgumentException iae) {
-      // good
-    }
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testBadECLevel() {
+    ErrorCorrectionLevel.forBits(4);
+  }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/com/google/zxing/qrcode/decoder/ModeTestCase.java b/core/src/test/java/com/google/zxing/qrcode/decoder/ModeTestCase.java
index ee7ddc8b6..15636d272 100644
--- a/core/src/test/java/com/google/zxing/qrcode/decoder/ModeTestCase.java
+++ b/core/src/test/java/com/google/zxing/qrcode/decoder/ModeTestCase.java
@@ -31,12 +31,11 @@ public final class ModeTestCase extends Assert {
     assertSame(Mode.ALPHANUMERIC, Mode.forBits(0x02));
     assertSame(Mode.BYTE, Mode.forBits(0x04));
     assertSame(Mode.KANJI, Mode.forBits(0x08));
-    try {
-      Mode.forBits(0x10);
-      fail("Should have thrown an exception");
-    } catch (IllegalArgumentException iae) {
-      // good
-    }
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testBadMode() {
+    Mode.forBits(0x10);
   }
 
   @Test
@@ -50,4 +49,4 @@ public final class ModeTestCase extends Assert {
     assertEquals(8, Mode.KANJI.getCharacterCountBits(Version.getVersionForNumber(8)));
   }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/com/google/zxing/qrcode/decoder/VersionTestCase.java b/core/src/test/java/com/google/zxing/qrcode/decoder/VersionTestCase.java
index 7eaec0a57..4df7d4fb2 100644
--- a/core/src/test/java/com/google/zxing/qrcode/decoder/VersionTestCase.java
+++ b/core/src/test/java/com/google/zxing/qrcode/decoder/VersionTestCase.java
@@ -24,14 +24,13 @@ import org.junit.Test;
  */
 public final class VersionTestCase extends Assert {
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testBadVersion() {
+    Version.getVersionForNumber(0);
+  }
+
   @Test
   public void testVersionForNumber() {
-    try {
-      Version.getVersionForNumber(0);
-      fail("Should have thrown an exception");
-    } catch (IllegalArgumentException iae) {
-      // good
-    }
     for (int i = 1; i <= 40; i++) {
       checkVersion(Version.getVersionForNumber(i), i, 4 * i + 17);
     }
@@ -76,4 +75,4 @@ public final class VersionTestCase extends Assert {
     assertEquals(expectedVersion, version.getVersionNumber());
   }
 
-}
\ No newline at end of file
+}