summaryrefslogtreecommitdiff
path: root/core/src/test/java
diff options
context:
space:
mode:
authorSean Owen <srowen@gmail.com>2016-06-24 12:28:00 +0300
committerSean Owen <srowen@gmail.com>2016-06-24 12:28:00 +0300
commit08e5431d995a88d443c06406520e62e2e0d02034 (patch)
tree410279c8988a35773eb9f13ef6573b3315c5ab32 /core/src/test/java
parentddfc0cac117e57100f4a7946d977bca303ac8403 (diff)
downloadzxing-08e5431d995a88d443c06406520e62e2e0d02034.tar.xz
Implement more style checks around whitespace
Diffstat (limited to 'core/src/test/java')
-rw-r--r--core/src/test/java/com/google/zxing/common/BitMatrixTestCase.java4
-rw-r--r--core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtil.java2
-rw-r--r--core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtilTest.java8
-rw-r--r--core/src/test/java/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java8
-rw-r--r--core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java2
5 files changed, 12 insertions, 12 deletions
diff --git a/core/src/test/java/com/google/zxing/common/BitMatrixTestCase.java b/core/src/test/java/com/google/zxing/common/BitMatrixTestCase.java
index 0e6e9ce12..b2a3c9ccf 100644
--- a/core/src/test/java/com/google/zxing/common/BitMatrixTestCase.java
+++ b/core/src/test/java/com/google/zxing/common/BitMatrixTestCase.java
@@ -224,14 +224,14 @@ public final class BitMatrixTestCase extends Assert {
try {
emptyMatrix.clone().xor(badMatrix);
fail();
- } catch(IllegalArgumentException ex) {
+ } catch (IllegalArgumentException ex) {
// good
}
try {
badMatrix.clone().xor(emptyMatrix);
fail();
- } catch(IllegalArgumentException ex) {
+ } catch (IllegalArgumentException ex) {
// good
}
}
diff --git a/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtil.java b/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtil.java
index 23841fd58..8e84c3894 100644
--- a/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtil.java
+++ b/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtil.java
@@ -50,7 +50,7 @@ public final class BinaryUtil {
BitArray binary = new BitArray(SPACE.matcher(dotsAndXs).replaceAll("").length());
int counter = 0;
- for(int i = 0; i < dotsAndXs.length(); ++i){
+ for (int i = 0; i < dotsAndXs.length(); ++i) {
if (i % 9 == 0) { // spaces
if (dotsAndXs.charAt(i) != ' ') {
throw new IllegalStateException("space expected");
diff --git a/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtilTest.java b/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtilTest.java
index f8bf058d9..a7adf5fee 100644
--- a/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtilTest.java
+++ b/core/src/test/java/com/google/zxing/oned/rss/expanded/BinaryUtilTest.java
@@ -41,7 +41,7 @@ public final class BinaryUtilTest extends Assert {
private static final Pattern SPACE = Pattern.compile(" ");
@Test
- public void testBuildBitArrayFromString(){
+ public void testBuildBitArrayFromString() {
CharSequence data = " ..X..X.. ..XXX... XXXXXXXX ........";
check(data);
@@ -59,13 +59,13 @@ public final class BinaryUtilTest extends Assert {
check(data);
}
- private static void check(CharSequence data){
+ private static void check(CharSequence data) {
BitArray binary = BinaryUtil.buildBitArrayFromString(data);
assertEquals(data, binary.toString());
}
@Test
- public void testBuildBitArrayFromStringWithoutSpaces(){
+ public void testBuildBitArrayFromStringWithoutSpaces() {
CharSequence data = " ..X..X.. ..XXX... XXXXXXXX ........";
checkWithoutSpaces(data);
@@ -82,7 +82,7 @@ public final class BinaryUtilTest extends Assert {
checkWithoutSpaces(data);
}
- private static void checkWithoutSpaces(CharSequence data){
+ private static void checkWithoutSpaces(CharSequence data) {
CharSequence dataWithoutSpaces = SPACE.matcher(data).replaceAll("");
BitArray binary = BinaryUtil.buildBitArrayFromStringWithoutSpaces(dataWithoutSpaces);
assertEquals(data, binary.toString());
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 f7955ff32..1c42db30d 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
@@ -57,20 +57,20 @@ public final class BitArrayBuilderTest extends Assert {
private static BitArray buildBitArray(int[][] pairValues) {
List<ExpandedPair> pairs = new ArrayList<>();
- for(int i = 0; i < pairValues.length; ++i){
+ for (int i = 0; i < pairValues.length; ++i) {
int [] pair = pairValues[i];
DataCharacter leftChar;
- if(i == 0) {
+ if (i == 0) {
leftChar = null;
} else {
leftChar = new DataCharacter(pair[0], 0);
}
DataCharacter rightChar;
- if(i == 0) {
+ if (i == 0) {
rightChar = new DataCharacter(pair[0], 0);
- } else if(pair.length == 2) {
+ } else if (pair.length == 2) {
rightChar = new DataCharacter(pair[1], 0);
} else {
rightChar = null;
diff --git a/core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java b/core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java
index f99b11929..c53e0d5c3 100644
--- a/core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java
+++ b/core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java
@@ -84,7 +84,7 @@ public final class RSSExpandedInternalTestCase extends Assert {
rssExpandedReader.retrieveNextPair(row, previousPairs, rowNumber);
// the previous was the last pair
fail(NotFoundException.class.getName() + " expected");
- }catch(NotFoundException nfe){
+ } catch (NotFoundException nfe) {
// ok
}
}