Skip to content

Commit

Permalink
Issue zxing#61 : touch up style in test and simplify new logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@srowen
srowen committed Feb 17, 2014
1 parent 525774a commit 9d4b8b9
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 127 deletions.
1 change: 1 addition & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Matthew Schulkind (Google)
Matt York (LifeMarks)
mike32767
mikej06
Mike Kicinski
Mohamad Fairol
Morgan Courbet
Nikolaos Ftylitakis
Expand Down
64 changes: 21 additions & 43 deletions core/src/main/java/com/google/zxing/oned/Code128Writer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,52 +105,30 @@ public boolean[] encode(String contents) {
int patternIndex;
if (newCodeSet == codeSet) {
// Encode the current character
if (codeSet == CODE_CODE_B) {
switch (contents.charAt(position)) {
case ESCAPE_FNC_1:
patternIndex = CODE_FNC_1;
position++;
break;
case ESCAPE_FNC_2:
patternIndex = CODE_FNC_2;
position++;
break;
case ESCAPE_FNC_3:
patternIndex = CODE_FNC_3;
position++;
break;
case ESCAPE_FNC_4:
patternIndex = CODE_FNC_4_B; // FIXME if this ever outputs Code A
position++;
break;
default:
// First handle escapes
switch (contents.charAt(position)) {
case ESCAPE_FNC_1:
patternIndex = CODE_FNC_1;
break;
case ESCAPE_FNC_2:
patternIndex = CODE_FNC_2;
break;
case ESCAPE_FNC_3:
patternIndex = CODE_FNC_3;
break;
case ESCAPE_FNC_4:
patternIndex = CODE_FNC_4_B; // FIXME if this ever outputs Code A
break;
default:
// Then handle normal characters otherwise
if (codeSet == CODE_CODE_B) {
patternIndex = contents.charAt(position) - ' ';
position++;
}
} else { // CODE_CODE_C
switch (contents.charAt(position)) {
case ESCAPE_FNC_1:
patternIndex = CODE_FNC_1;
position++;
break;
case ESCAPE_FNC_2:
patternIndex = CODE_FNC_2;
position++;
break;
case ESCAPE_FNC_3:
patternIndex = CODE_FNC_3;
position++;
break;
case ESCAPE_FNC_4:
patternIndex = CODE_FNC_4_B; // FIXME if this ever outputs Code A
position++;
break;
default:
} else { // CODE_CODE_C
patternIndex = Integer.parseInt(contents.substring(position, position + 2));
position += 2;
break;
}
position++; // Also incremented below
}
}
position++;
} else {
// Should we change the current code?
// Do we have a code set?
Expand Down
185 changes: 101 additions & 84 deletions core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,101 @@
package com.google.zxing.oned;

import static org.junit.Assert.assertEquals;

import org.junit.Before;
import org.junit.Test;

import com.google.zxing.BarcodeFormat;
import com.google.zxing.Writer;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;

public class Code128WriterTestCase {
private static final String FNC1 = "11110101110";
private static final String FNC2 = "11110101000";
private static final String FNC3 = "10111100010";
private static final String FNC4 = "10111101110";
private static final String START_CODE_B = "11010010000";
public static final String QUIET_SPACE = "00000";
public static final String STOP = "1100011101011";

Writer writer;

@Before
public void setup() {
writer = new Code128Writer();
}

@Test
public void testEncodeWithFunc3() throws WriterException {
String toEncode = "\u00f3" + "123";
// "1" "2" "3" check digit 51
String expected = QUIET_SPACE + START_CODE_B + FNC3 + "10011100110" + "11001110010" + "11001011100" + "11101000110" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc2() throws WriterException {
String toEncode = "\u00f2" + "123";
// "1" "2" "3" check digit 56
String expected = QUIET_SPACE + START_CODE_B + FNC2 + "10011100110" + "11001110010" + "11001011100" + "11100010110" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc1() throws WriterException {
String toEncode = "\u00f1" + "123";
// "1" "2" "3" check digit 61
String expected = QUIET_SPACE + START_CODE_B + FNC1 + "10011100110" + "11001110010" + "11001011100" + "11001000010" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc4() throws WriterException {
String toEncode = "\u00f4" + "123";
// "1" "2" "3" check digit 59
String expected = QUIET_SPACE + START_CODE_B + FNC4 + "10011100110" + "11001110010" + "11001011100" + "11100011010" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

private String matrixToString(BitMatrix result) {
StringBuilder builder = new StringBuilder(result.getWidth());
for (int i = 0; i < result.getWidth(); i++) {
builder.append(result.get(i, 0) ? '1' : '0');
}
return builder.toString();
}
}
/*
* Copyright 2014 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.zxing.oned;

import static org.junit.Assert.assertEquals;

import org.junit.Before;
import org.junit.Test;

import com.google.zxing.BarcodeFormat;
import com.google.zxing.Writer;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;

public class Code128WriterTestCase {

private static final String FNC1 = "11110101110";
private static final String FNC2 = "11110101000";
private static final String FNC3 = "10111100010";
private static final String FNC4 = "10111101110";
private static final String START_CODE_B = "11010010000";
public static final String QUIET_SPACE = "00000";
public static final String STOP = "1100011101011";

private Writer writer;

@Before
public void setup() {
writer = new Code128Writer();
}

@Test
public void testEncodeWithFunc3() throws WriterException {
String toEncode = "\u00f3" + "123";
// "1" "2" "3" check digit 51
String expected = QUIET_SPACE + START_CODE_B + FNC3 + "10011100110" + "11001110010" + "11001011100" + "11101000110" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc2() throws WriterException {
String toEncode = "\u00f2" + "123";
// "1" "2" "3" check digit 56
String expected = QUIET_SPACE + START_CODE_B + FNC2 + "10011100110" + "11001110010" + "11001011100" + "11100010110" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc1() throws WriterException {
String toEncode = "\u00f1" + "123";
// "1" "2" "3" check digit 61
String expected = QUIET_SPACE + START_CODE_B + FNC1 + "10011100110" + "11001110010" + "11001011100" + "11001000010" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

@Test
public void testEncodeWithFunc4() throws WriterException {
String toEncode = "\u00f4" + "123";
// "1" "2" "3" check digit 59
String expected = QUIET_SPACE + START_CODE_B + FNC4 + "10011100110" + "11001110010" + "11001011100" + "11100011010" + STOP + QUIET_SPACE;

BitMatrix result = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);

String actual = matrixToString(result);
assertEquals(expected, actual);
}

private String matrixToString(BitMatrix result) {
StringBuilder builder = new StringBuilder(result.getWidth());
for (int i = 0; i < result.getWidth(); i++) {
builder.append(result.get(i, 0) ? '1' : '0');
}
return builder.toString();
}
}

0 comments on commit 9d4b8b9

Please sign in to comment.