From 29fbff0802218121c7cf2b0dfcf7c1ed2d341ba6 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Thu, 17 Feb 2022 14:14:37 -0600 Subject: Minor code changes to previous PR merges --- .../zxing/datamatrix/encoder/HighLevelEncodeTestCase.java | 3 +-- .../java/com/google/zxing/oned/Code128WriterTestCase.java | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'core/src/test/java') diff --git a/core/src/test/java/com/google/zxing/datamatrix/encoder/HighLevelEncodeTestCase.java b/core/src/test/java/com/google/zxing/datamatrix/encoder/HighLevelEncodeTestCase.java index 52a556059..438865965 100644 --- a/core/src/test/java/com/google/zxing/datamatrix/encoder/HighLevelEncodeTestCase.java +++ b/core/src/test/java/com/google/zxing/datamatrix/encoder/HighLevelEncodeTestCase.java @@ -538,8 +538,7 @@ public final class HighLevelEncodeTestCase extends Assert { private static String encodeHighLevel(String msg, boolean compareSizeToMinimalEncoder) { CharSequence encoded = HighLevelEncoder.encodeHighLevel(msg); CharSequence encoded2 = MinimalEncoder.encodeHighLevel(msg); - assert !compareSizeToMinimalEncoder || encoded2.length() <= encoded.length(); - //DecodeHighLevel.decode(encoded); + assertTrue(!compareSizeToMinimalEncoder || encoded2.length() <= encoded.length()); return visualize(encoded); } diff --git a/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java b/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java index 97719ad9d..c2a5b0499 100644 --- a/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java +++ b/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java @@ -130,7 +130,7 @@ public class Code128WriterTestCase extends Assert { public void testLongCompact() throws Exception { //test longest possible input String toEncode = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - BitMatrix result = encode(toEncode, true, toEncode); + encode(toEncode, true, toEncode); } @Test @@ -246,7 +246,7 @@ public class Code128WriterTestCase extends Assert { int width = result.getWidth(); result = encode(toEncode, true, toEncode); - assert result.getWidth() <= width; + assertTrue(result.getWidth() <= width); } @@ -257,7 +257,7 @@ public class Code128WriterTestCase extends Assert { Map hints = new EnumMap<>(EncodeHintType.class); hints.put(EncodeHintType.FORCE_CODE_SET, "A"); - BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); + writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); } @Test(expected = IllegalArgumentException.class) @@ -267,7 +267,7 @@ public class Code128WriterTestCase extends Assert { Map hints = new EnumMap<>(EncodeHintType.class); hints.put(EncodeHintType.FORCE_CODE_SET, "B"); - BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); + writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); } @Test(expected = IllegalArgumentException.class) @@ -277,7 +277,7 @@ public class Code128WriterTestCase extends Assert { Map hints = new EnumMap<>(EncodeHintType.class); hints.put(EncodeHintType.FORCE_CODE_SET, "C"); - BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); + writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); } @Test(expected = IllegalArgumentException.class) @@ -287,7 +287,7 @@ public class Code128WriterTestCase extends Assert { Map hints = new EnumMap<>(EncodeHintType.class); hints.put(EncodeHintType.FORCE_CODE_SET, "C"); - BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); + writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); } @Test(expected = IllegalArgumentException.class) @@ -297,7 +297,7 @@ public class Code128WriterTestCase extends Assert { Map hints = new EnumMap<>(EncodeHintType.class); hints.put(EncodeHintType.FORCE_CODE_SET, "C"); - BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); + writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints); } @Test -- cgit v1.2.3