diff options
| author | Nayuki <me@nayuki.io> | 2016-05-25 14:46:44 +0300 |
|---|---|---|
| committer | Sean Owen <srowen@gmail.com> | 2016-05-25 14:46:44 +0300 |
| commit | 7cf49565c2d5f0f875e2df2d9eca29e7c0f4139f (patch) | |
| tree | 8e4accb9f436347577df33c0c2fd54158ec1a21b /core/src/test/java/com | |
| parent | c2eb20d976f6b47521e8c9615e27ec26b3261867 (diff) | |
| download | zxing-7cf49565c2d5f0f875e2df2d9eca29e7c0f4139f.tar.xz | |
Simplified pieces of code (#601)
* Simplify code in bit-twiddling methods, using APIs introduced in Java 5.
* Align code by adjusting whitespace and adding `+0`.
* Convert qrcode DataMask to enum to reduce source code size, which shouldn't change behavior.
* Simplify lists of character constants using string initializer instead of array.
* Remove redundant `+ 0` operations from a recent change.
* Delete the function DataMask.forReference() and inline the logic into all its callers.
Diffstat (limited to 'core/src/test/java/com')
| -rw-r--r-- | core/src/test/java/com/google/zxing/qrcode/decoder/DataMaskTestCase.java | 2 | ||||
| -rw-r--r-- | core/src/test/java/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/test/java/com/google/zxing/qrcode/decoder/DataMaskTestCase.java b/core/src/test/java/com/google/zxing/qrcode/decoder/DataMaskTestCase.java index 1d4e1cb90..d6ff4798b 100644 --- a/core/src/test/java/com/google/zxing/qrcode/decoder/DataMaskTestCase.java +++ b/core/src/test/java/com/google/zxing/qrcode/decoder/DataMaskTestCase.java @@ -106,7 +106,7 @@ public final class DataMaskTestCase extends Assert { } private static void testMaskAcrossDimensions(int reference, MaskCondition condition) { - DataMask mask = DataMask.forReference(reference); + DataMask mask = DataMask.values()[reference]; for (int version = 1; version <= 40; version++) { int dimension = 17 + 4 * version; testMask(mask, dimension, condition); diff --git a/core/src/test/java/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java b/core/src/test/java/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java index e35034304..56f1f3d0f 100644 --- a/core/src/test/java/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java +++ b/core/src/test/java/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java @@ -192,7 +192,7 @@ public final class MaskUtilTestCase extends Assert { {1, 0, 1, 0, 1, 0}, {0, 1, 0, 1, 0, 1}, }; - assertTrue(TestGetDataMaskBitInternal(0, mask0)); + assertTrue(TestGetDataMaskBitInternal(0, mask0)); int[][] mask1 = { {1, 1, 1, 1, 1, 1}, {0, 0, 0, 0, 0, 0}, @@ -201,7 +201,7 @@ public final class MaskUtilTestCase extends Assert { {1, 1, 1, 1, 1, 1}, {0, 0, 0, 0, 0, 0}, }; - assertTrue(TestGetDataMaskBitInternal(1, mask1)); + assertTrue(TestGetDataMaskBitInternal(1, mask1)); int[][] mask2 = { {1, 0, 0, 1, 0, 0}, {1, 0, 0, 1, 0, 0}, |