package com.google.zxing.qrcode.encoder;
-import com.google.zxing.common.ByteArray;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitArray;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.google.zxing.qrcode.decoder.Mode;
import junit.framework.TestCase;
-import java.util.Arrays;
+import java.io.UnsupportedEncodingException;
/**
* @author satorux@google.com (Satoru Takabayashi) - creator
public void testGetAlphanumericCode() {
// The first ten code points are numbers.
for (int i = 0; i < 10; ++i) {
- assertEquals(i, Encoder.GetAlphanumericCode('0' + i));
+ assertEquals(i, Encoder.getAlphanumericCode('0' + i));
}
// The next 26 code points are capital alphabet letters.
for (int i = 10; i < 36; ++i) {
- assertEquals(i, Encoder.GetAlphanumericCode('A' + i - 10));
+ assertEquals(i, Encoder.getAlphanumericCode('A' + i - 10));
}
// Others are symbol letters
- assertEquals(36, Encoder.GetAlphanumericCode(' '));
- assertEquals(37, Encoder.GetAlphanumericCode('$'));
- assertEquals(38, Encoder.GetAlphanumericCode('%'));
- assertEquals(39, Encoder.GetAlphanumericCode('*'));
- assertEquals(40, Encoder.GetAlphanumericCode('+'));
- assertEquals(41, Encoder.GetAlphanumericCode('-'));
- assertEquals(42, Encoder.GetAlphanumericCode('.'));
- assertEquals(43, Encoder.GetAlphanumericCode('/'));
- assertEquals(44, Encoder.GetAlphanumericCode(':'));
+ assertEquals(36, Encoder.getAlphanumericCode(' '));
+ assertEquals(37, Encoder.getAlphanumericCode('$'));
+ assertEquals(38, Encoder.getAlphanumericCode('%'));
+ assertEquals(39, Encoder.getAlphanumericCode('*'));
+ assertEquals(40, Encoder.getAlphanumericCode('+'));
+ assertEquals(41, Encoder.getAlphanumericCode('-'));
+ assertEquals(42, Encoder.getAlphanumericCode('.'));
+ assertEquals(43, Encoder.getAlphanumericCode('/'));
+ assertEquals(44, Encoder.getAlphanumericCode(':'));
// Should return -1 for other letters;
- assertEquals(-1, Encoder.GetAlphanumericCode('a'));
- assertEquals(-1, Encoder.GetAlphanumericCode('#'));
- assertEquals(-1, Encoder.GetAlphanumericCode('\0'));
+ assertEquals(-1, Encoder.getAlphanumericCode('a'));
+ assertEquals(-1, Encoder.getAlphanumericCode('#'));
+ assertEquals(-1, Encoder.getAlphanumericCode('\0'));
}
- public void testChooseMode() {
+ public void testChooseMode() throws WriterException {
// Numeric mode.
- assertEquals(QRCode.MODE_NUMERIC, Encoder.ChooseMode(new ByteArray("0")));
- assertEquals(QRCode.MODE_NUMERIC, Encoder.ChooseMode(new ByteArray("0123456789")));
+ assertSame(Mode.NUMERIC, Encoder.chooseMode("0"));
+ assertSame(Mode.NUMERIC, Encoder.chooseMode("0123456789"));
// Alphanumeric mode.
- assertEquals(QRCode.MODE_ALPHANUMERIC, Encoder.ChooseMode(new ByteArray("A")));
- assertEquals(QRCode.MODE_ALPHANUMERIC,
- Encoder.ChooseMode(new ByteArray("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:")));
+ assertSame(Mode.ALPHANUMERIC, Encoder.chooseMode("A"));
+ assertSame(Mode.ALPHANUMERIC,
+ Encoder.chooseMode("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:"));
// 8-bit byte mode.
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray("a")));
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray("#")));
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray("")));
+ assertSame(Mode.BYTE, Encoder.chooseMode("a"));
+ assertSame(Mode.BYTE, Encoder.chooseMode("#"));
+ assertSame(Mode.BYTE, Encoder.chooseMode(""));
// Kanji mode. We used to use MODE_KANJI for these, but we stopped
// doing that as we cannot distinguish Shift_JIS from other encodings
// from data bytes alone. See also comments in qrcode_encoder.h.
// AIUE in Hiragana in Shift_JIS
- byte[] dat1 = {0x8,0xa,0x8,0xa,0x8,0xa,0x8,(byte)0xa6};
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray(dat1)));
+ assertSame(Mode.BYTE,
+ Encoder.chooseMode(shiftJISString(new byte[]{0x8, 0xa, 0x8, 0xa, 0x8, 0xa, 0x8, (byte) 0xa6})));
// Nihon in Kanji in Shift_JIS.
- byte[] dat2 = {0x9,0xf,0x9,0x7b};
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray(dat2)));
+ assertSame(Mode.BYTE, Encoder.chooseMode(shiftJISString(new byte[]{0x9, 0xf, 0x9, 0x7b})));
// Sou-Utsu-Byou in Kanji in Shift_JIS.
- byte[] dat3 = {0xe,0x4,0x9,0x5,0x9,0x61};
- assertEquals(QRCode.MODE_8BIT_BYTE, Encoder.ChooseMode(new ByteArray(dat3)));
+ assertSame(Mode.BYTE, Encoder.chooseMode(shiftJISString(new byte[]{0xe, 0x4, 0x9, 0x5, 0x9, 0x61})));
}
- public void testEncode() {
- QRCode qr_code = new QRCode();
- assertTrue(Encoder.Encode(new ByteArray("ABCDEF"), QRCode.EC_LEVEL_H, qr_code));
+ public void testEncode() throws WriterException {
+ QRCode qrCode = new QRCode();
+ Encoder.encode("ABCDEF", ErrorCorrectionLevel.H, qrCode);
// The following is a valid QR Code that can be read by cell phones.
String expected =
"<<\n" +
" mode: ALPHANUMERIC\n" +
- " ec_level: H\n" +
+ " ecLevel: H\n" +
" version: 1\n" +
- " matrix_width: 21\n" +
- " mask_pattern: 0\n" +
- " num_total_bytes_: 26\n" +
- " num_data_bytes: 9\n" +
- " num_ec_bytes: 17\n" +
- " num_rs_blocks: 1\n" +
+ " matrixWidth: 21\n" +
+ " maskPattern: 0\n" +
+ " numTotalBytes: 26\n" +
+ " numDataBytes: 9\n" +
+ " numECBytes: 17\n" +
+ " numRSBlocks: 1\n" +
" matrix:\n" +
" 1 1 1 1 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 1\n" +
" 1 0 0 0 0 0 1 0 0 1 1 1 0 0 1 0 0 0 0 0 1\n" +
" 1 0 0 0 0 0 1 0 0 1 1 0 1 1 0 1 0 0 0 1 1\n" +
" 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 1 0 1\n" +
">>\n";
- assertEquals(expected, qr_code.toString());
+ assertEquals(expected, qrCode.toString());
}
public void testAppendModeInfo() {
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendModeInfo(QRCode.MODE_NUMERIC, bits));
- assertEquals("0001", bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendModeInfo(Mode.NUMERIC, bits);
+ assertEquals(" ...X", bits.toString());
}
- public void testAppendLengthInfo() {
+ public void testAppendLengthInfo() throws WriterException {
{
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendLengthInfo(1, // 1 letter (1/1).
- 1, // version 1.
- QRCode.MODE_NUMERIC,
- bits));
- assertEquals("0000000001", bits.toString()); // 10 bits.
+ BitArray bits = new BitArray();
+ Encoder.appendLengthInfo(1, // 1 letter (1/1).
+ 1, // version 1.
+ Mode.NUMERIC,
+ bits);
+ assertEquals(" ........ .X", bits.toString()); // 10 bits.
}
{
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendLengthInfo(2, // 2 letters (2/1).
- 10, // version 10.
- QRCode.MODE_ALPHANUMERIC,
- bits));
- assertEquals("00000000010", bits.toString()); // 11 bits.
+ BitArray bits = new BitArray();
+ Encoder.appendLengthInfo(2, // 2 letters (2/1).
+ 10, // version 10.
+ Mode.ALPHANUMERIC,
+ bits);
+ assertEquals(" ........ .X.", bits.toString()); // 11 bits.
}
{
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendLengthInfo(255, // 255 letter (255/1).
- 27, // version 27.
- QRCode.MODE_8BIT_BYTE,
- bits));
- assertEquals("0000000011111111", bits.toString()); // 16 bits.
+ BitArray bits = new BitArray();
+ Encoder.appendLengthInfo(255, // 255 letter (255/1).
+ 27, // version 27.
+ Mode.BYTE,
+ bits);
+ assertEquals(" ........ XXXXXXXX", bits.toString()); // 16 bits.
}
{
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendLengthInfo(1024, // 512 letters (1024/2).
- 40, // version 40.
- QRCode.MODE_KANJI,
- bits));
- assertEquals("001000000000", bits.toString()); // 12 bits.
+ BitArray bits = new BitArray();
+ Encoder.appendLengthInfo(512, // 512 letters (1024/2).
+ 40, // version 40.
+ Mode.KANJI,
+ bits);
+ assertEquals(" ..X..... ....", bits.toString()); // 12 bits.
}
}
- public void testAppendBytes() {
+ public void testAppendBytes() throws WriterException {
{
- // Should use AppendNumericBytes.
+ // Should use appendNumericBytes.
// 1 = 01 = 0001 in 4 bits.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendBytes(new ByteArray("1"), QRCode.MODE_NUMERIC, bits));
- assertEquals("0001" , bits.toString());
- // 'A' cannot be encoded in MODE_NUMERIC.
- assertFalse(Encoder.AppendBytes(new ByteArray("A"), QRCode.MODE_NUMERIC, bits));
+ BitArray bits = new BitArray();
+ Encoder.appendBytes("1", Mode.NUMERIC, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ assertEquals(" ...X" , bits.toString());
}
{
- // Should use AppendAlphanumericBytes.
+ // Should use appendAlphanumericBytes.
// A = 10 = 0xa = 001010 in 6 bits
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendBytes(new ByteArray("A"), QRCode.MODE_ALPHANUMERIC, bits));
- assertEquals("001010" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendBytes("A", Mode.ALPHANUMERIC, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ assertEquals(" ..X.X." , bits.toString());
// Lower letters such as 'a' cannot be encoded in MODE_ALPHANUMERIC.
- assertFalse(Encoder.AppendBytes(new ByteArray("a"), QRCode.MODE_ALPHANUMERIC, bits));
+ try {
+ Encoder.appendBytes("a", Mode.ALPHANUMERIC, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ } catch (WriterException we) {
+ // good
+ }
}
{
- // Should use Append8BitBytes.
+ // Should use append8BitBytes.
// 0x61, 0x62, 0x63
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendBytes(new ByteArray("abc"), QRCode.MODE_8BIT_BYTE, bits));
- assertEquals("01100001" + "01100010" + "01100011", bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendBytes("abc", Mode.BYTE, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ assertEquals(" .XX....X .XX...X. .XX...XX", bits.toString());
// Anything can be encoded in QRCode.MODE_8BIT_BYTE.
- byte[] bytes = {0x00};
- assertTrue(Encoder.AppendBytes(new ByteArray(bytes), QRCode.MODE_8BIT_BYTE, bits));
+ Encoder.appendBytes("\0", Mode.BYTE, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
}
{
- // Should use AppendKanjiBytes.
+ // Should use appendKanjiBytes.
// 0x93, 0x5f
- BitVector bits = new BitVector();
- byte[] bytes = {(byte)0x93,0x5f};
- assertTrue(Encoder.AppendBytes(new ByteArray(bytes), QRCode.MODE_KANJI, bits));
- assertEquals("0110110011111", bits.toString());
- // ASCII characters can not be encoded in QRCode.MODE_KANJI.
- assertFalse(Encoder.AppendBytes(new ByteArray("a"), QRCode.MODE_KANJI, bits));
+ BitArray bits = new BitArray();
+ Encoder.appendBytes(shiftJISString(new byte[] {(byte)0x93,0x5f}), Mode.KANJI, bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ assertEquals(" .XX.XX.. XXXXX", bits.toString());
}
}
- public void testInit() {
- // TODO: should be implemented.
- }
-
- public void testTerminateBits() {
+ public void testTerminateBits() throws WriterException {
{
- BitVector v = new BitVector();
- assertTrue(Encoder.TerminateBits(0, v));
+ BitArray v = new BitArray();
+ Encoder.terminateBits(0, v);
assertEquals("", v.toString());
}
{
- BitVector v = new BitVector();
- assertTrue(Encoder.TerminateBits(1, v));
- assertEquals("00000000", v.toString());
+ BitArray v = new BitArray();
+ Encoder.terminateBits(1, v);
+ assertEquals(" ........", v.toString());
}
{
- BitVector v = new BitVector();
- v.AppendBits(0, 3); // Append 000
- assertTrue(Encoder.TerminateBits(1, v));
- assertEquals("00000000", v.toString());
+ BitArray v = new BitArray();
+ v.appendBits(0, 3); // Append 000
+ Encoder.terminateBits(1, v);
+ assertEquals(" ........", v.toString());
}
{
- BitVector v = new BitVector();
- v.AppendBits(0, 5); // Append 00000
- assertTrue(Encoder.TerminateBits(1, v));
- assertEquals("00000000", v.toString());
+ BitArray v = new BitArray();
+ v.appendBits(0, 5); // Append 00000
+ Encoder.terminateBits(1, v);
+ assertEquals(" ........", v.toString());
}
{
- BitVector v = new BitVector();
- v.AppendBits(0, 8); // Append 00000000
- assertTrue(Encoder.TerminateBits(1, v));
- assertEquals("00000000", v.toString());
+ BitArray v = new BitArray();
+ v.appendBits(0, 8); // Append 00000000
+ Encoder.terminateBits(1, v);
+ assertEquals(" ........", v.toString());
}
{
- BitVector v = new BitVector();
- assertTrue(Encoder.TerminateBits(2, v));
- assertEquals("0000000011101100", v.toString());
+ BitArray v = new BitArray();
+ Encoder.terminateBits(2, v);
+ assertEquals(" ........ XXX.XX..", v.toString());
}
{
- BitVector v = new BitVector();
- v.AppendBits(0, 1); // Append 0
- assertTrue(Encoder.TerminateBits(3, v));
- assertEquals("000000001110110000010001", v.toString());
+ BitArray v = new BitArray();
+ v.appendBits(0, 1); // Append 0
+ Encoder.terminateBits(3, v);
+ assertEquals(" ........ XXX.XX.. ...X...X", v.toString());
}
}
- public void testGetNumDataBytesAndNumECBytesForBlockID() {
- int[] num_data_bytes = new int[1];
- int[] num_ec_bytes = new int[1];
+ public void testGetNumDataBytesAndNumECBytesForBlockID() throws WriterException {
+ int[] numDataBytes = new int[1];
+ int[] numEcBytes = new int[1];
// Version 1-H.
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(26, 9, 1, 0, num_data_bytes, num_ec_bytes);
- assertEquals(9, num_data_bytes[0]);
- assertEquals(17, num_ec_bytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(26, 9, 1, 0, numDataBytes, numEcBytes);
+ assertEquals(9, numDataBytes[0]);
+ assertEquals(17, numEcBytes[0]);
// Version 3-H. 2 blocks.
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(70, 26, 2, 0, num_data_bytes, num_ec_bytes);
- assertEquals(13, num_data_bytes[0]);
- assertEquals(22, num_ec_bytes[0]);
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(70, 26, 2, 1, num_data_bytes, num_ec_bytes);
- assertEquals(13, num_data_bytes[0]);
- assertEquals(22, num_ec_bytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(70, 26, 2, 0, numDataBytes, numEcBytes);
+ assertEquals(13, numDataBytes[0]);
+ assertEquals(22, numEcBytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(70, 26, 2, 1, numDataBytes, numEcBytes);
+ assertEquals(13, numDataBytes[0]);
+ assertEquals(22, numEcBytes[0]);
// Version 7-H. (4 + 1) blocks.
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(196, 66, 5, 0, num_data_bytes, num_ec_bytes);
- assertEquals(13, num_data_bytes[0]);
- assertEquals(26, num_ec_bytes[0]);
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(196, 66, 5, 4, num_data_bytes, num_ec_bytes);
- assertEquals(14, num_data_bytes[0]);
- assertEquals(26, num_ec_bytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(196, 66, 5, 0, numDataBytes, numEcBytes);
+ assertEquals(13, numDataBytes[0]);
+ assertEquals(26, numEcBytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(196, 66, 5, 4, numDataBytes, numEcBytes);
+ assertEquals(14, numDataBytes[0]);
+ assertEquals(26, numEcBytes[0]);
// Version 40-H. (20 + 61) blocks.
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 0, num_data_bytes, num_ec_bytes);
- assertEquals(15, num_data_bytes[0]);
- assertEquals(30, num_ec_bytes[0]);
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 20, num_data_bytes, num_ec_bytes);
- assertEquals(16, num_data_bytes[0]);
- assertEquals(30, num_ec_bytes[0]);
- Encoder.GetNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 80, num_data_bytes, num_ec_bytes);
- assertEquals(16, num_data_bytes[0]);
- assertEquals(30, num_ec_bytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 0, numDataBytes, numEcBytes);
+ assertEquals(15, numDataBytes[0]);
+ assertEquals(30, numEcBytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 20, numDataBytes, numEcBytes);
+ assertEquals(16, numDataBytes[0]);
+ assertEquals(30, numEcBytes[0]);
+ Encoder.getNumDataBytesAndNumECBytesForBlockID(3706, 1276, 81, 80, numDataBytes, numEcBytes);
+ assertEquals(16, numDataBytes[0]);
+ assertEquals(30, numEcBytes[0]);
}
- public void testInterleaveWithECBytes() {
+ public void testInterleaveWithECBytes() throws WriterException {
{
- final byte[] data_bytes = {32, 65, (byte)205, 69, 41, (byte)220, 46, (byte)128, (byte)236};
- BitVector in = new BitVector();
- for (byte data_byte: data_bytes) {
- in.AppendBits(data_byte, 8);
+ byte[] dataBytes = {32, 65, (byte)205, 69, 41, (byte)220, 46, (byte)128, (byte)236};
+ BitArray in = new BitArray();
+ for (byte dataByte: dataBytes) {
+ in.appendBits(dataByte, 8);
}
- BitVector out = new BitVector();
- assertTrue(Encoder.InterleaveWithECBytes(in, 26, 9, 1, out));
- final byte[] expected = {
+ BitArray out = new BitArray();
+ Encoder.interleaveWithECBytes(in, 26, 9, 1, out);
+ byte[] expected = {
// Data bytes.
32, 65, (byte)205, 69, 41, (byte)220, 46, (byte)128, (byte)236,
// Error correction bytes.
42, (byte)159, 74, (byte)221, (byte)244, (byte)169, (byte)239, (byte)150, (byte)138, 70,
(byte)237, 85, (byte)224, 96, 74, (byte)219, 61,
};
- assertTrue(Arrays.equals(expected, out.getArray()));
+ assertEquals(expected.length, out.getSizeInBytes());
+ byte[] outArray = new byte[expected.length];
+ out.toBytes(0, outArray, 0, expected.length);
+ // Can't use Arrays.equals(), because outArray may be longer than out.sizeInBytes()
+ for (int x = 0; x < expected.length; x++) {
+ assertEquals(expected[x], outArray[x]);
+ }
}
// Numbers are from http://www.swetake.com/qr/qr8.html
{
- final byte[] data_bytes = {
+ byte[] dataBytes = {
67, 70, 22, 38, 54, 70, 86, 102, 118, (byte)134, (byte)150, (byte)166, (byte)182,
(byte)198, (byte)214, (byte)230, (byte)247, 7, 23, 39, 55, 71, 87, 103, 119, (byte)135,
(byte)151, (byte)166, 22, 38, 54, 70, 86, 102, 118, (byte)134, (byte)150, (byte)166,
(byte)135, (byte)151, (byte)160, (byte)236, 17, (byte)236, 17, (byte)236, 17, (byte)236,
17
};
- BitVector in = new BitVector();
- for (byte data_byte: data_bytes) {
- in.AppendBits(data_byte, 8);
+ BitArray in = new BitArray();
+ for (byte dataByte: dataBytes) {
+ in.appendBits(dataByte, 8);
}
- BitVector out = new BitVector();
- assertTrue(Encoder.InterleaveWithECBytes(in, 134, 62, 4, out));
- final byte[] expected = {
+ BitArray out = new BitArray();
+ Encoder.interleaveWithECBytes(in, 134, 62, 4, out);
+ byte[] expected = {
// Data bytes.
67, (byte)230, 54, 55, 70, (byte)247, 70, 71, 22, 7, 86, 87, 38, 23, 102, 103, 54, 39,
118, 119, 70, 55, (byte)134, (byte)135, 86, 71, (byte)150, (byte)151, 102, 87, (byte)166,
(byte)140, 61, (byte)179, (byte)154, (byte)214, (byte)138, (byte)147, 87, 27, 96, 77, 47,
(byte)187, 49, (byte)156, (byte)214,
};
- assertTrue(Arrays.equals(expected, out.getArray()));
+ assertEquals(expected.length, out.getSizeInBytes());
+ byte[] outArray = new byte[expected.length];
+ out.toBytes(0, outArray, 0, expected.length);
+ for (int x = 0; x < expected.length; x++) {
+ assertEquals(expected[x], outArray[x]);
+ }
}
}
public void testAppendNumericBytes() {
{
// 1 = 01 = 0001 in 4 bits.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendNumericBytes(new ByteArray("1"), bits));
- assertEquals("0001" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendNumericBytes("1", bits);
+ assertEquals(" ...X" , bits.toString());
}
{
// 12 = 0xc = 0001100 in 7 bits.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendNumericBytes(new ByteArray("12"), bits));
- assertEquals("0001100" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendNumericBytes("12", bits);
+ assertEquals(" ...XX.." , bits.toString());
}
{
// 123 = 0x7b = 0001111011 in 10 bits.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendNumericBytes(new ByteArray("123"), bits));
- assertEquals("0001111011" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendNumericBytes("123", bits);
+ assertEquals(" ...XXXX. XX" , bits.toString());
}
{
// 1234 = "123" + "4" = 0001111011 + 0100
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendNumericBytes(new ByteArray("1234"), bits));
- assertEquals("0001111011" + "0100" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendNumericBytes("1234", bits);
+ assertEquals(" ...XXXX. XX.X.." , bits.toString());
}
{
// Empty.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendNumericBytes(new ByteArray(""), bits));
+ BitArray bits = new BitArray();
+ Encoder.appendNumericBytes("", bits);
assertEquals("" , bits.toString());
}
- {
- // Invalid data.
- BitVector bits = new BitVector();
- assertFalse(Encoder.AppendNumericBytes(new ByteArray("abc"), bits));
- }
}
- public void testAppendAlphanumericBytes() {
+ public void testAppendAlphanumericBytes() throws WriterException {
{
// A = 10 = 0xa = 001010 in 6 bits
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendAlphanumericBytes(new ByteArray("A"), bits));
- assertEquals("001010" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendAlphanumericBytes("A", bits);
+ assertEquals(" ..X.X." , bits.toString());
}
{
// AB = 10 * 45 + 11 = 461 = 0x1cd = 00111001101 in 11 bits
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendAlphanumericBytes(new ByteArray("AB"), bits));
- assertEquals("00111001101", bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendAlphanumericBytes("AB", bits);
+ assertEquals(" ..XXX..X X.X", bits.toString());
}
{
// ABC = "AB" + "C" = 00111001101 + 001100
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendAlphanumericBytes(new ByteArray("ABC"), bits));
- assertEquals("00111001101" + "001100" , bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.appendAlphanumericBytes("ABC", bits);
+ assertEquals(" ..XXX..X X.X..XX. ." , bits.toString());
}
{
// Empty.
- BitVector bits = new BitVector();
- assertTrue(Encoder.AppendAlphanumericBytes(new ByteArray(""), bits));
+ BitArray bits = new BitArray();
+ Encoder.appendAlphanumericBytes("", bits);
assertEquals("" , bits.toString());
}
{
// Invalid data.
- BitVector bits = new BitVector();
- assertFalse(Encoder.AppendAlphanumericBytes(new ByteArray("abc"), bits));
+ BitArray bits = new BitArray();
+ try {
+ Encoder.appendAlphanumericBytes("abc", bits);
+ } catch (WriterException we) {
+ // good
+ }
}
}
- public void testAppend8BitBytes() {
+ public void testAppend8BitBytes() throws WriterException {
{
// 0x61, 0x62, 0x63
- BitVector bits = new BitVector();
- assertTrue(Encoder.Append8BitBytes(new ByteArray("abc"), bits));
- assertEquals("01100001" + "01100010" + "01100011", bits.toString());
+ BitArray bits = new BitArray();
+ Encoder.append8BitBytes("abc", bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
+ assertEquals(" .XX....X .XX...X. .XX...XX", bits.toString());
}
{
// Empty.
- BitVector bits = new BitVector();
- assertTrue(Encoder.Append8BitBytes(new ByteArray(""), bits));
+ BitArray bits = new BitArray();
+ Encoder.append8BitBytes("", bits, Encoder.DEFAULT_BYTE_MODE_ENCODING);
assertEquals("", bits.toString());
}
}
// Numbers are from page 21 of JISX0510:2004
- public void testAppendKanjiBytes() {
- {
- BitVector bits = new BitVector();
- byte[] dat1 = {(byte)0x93,0x5f};
- assertTrue(Encoder.AppendKanjiBytes(new ByteArray(dat1), bits));
- assertEquals("0110110011111", bits.toString());
- byte[] dat2 = {(byte)0xe4,(byte)0xaa};
- assertTrue(Encoder.AppendKanjiBytes(new ByteArray(dat2), bits));
- assertEquals("0110110011111" + "1101010101010", bits.toString());
- }
+ public void testAppendKanjiBytes() throws WriterException {
+ BitArray bits = new BitArray();
+ Encoder.appendKanjiBytes(shiftJISString(new byte[] {(byte)0x93,0x5f}), bits);
+ assertEquals(" .XX.XX.. XXXXX", bits.toString());
+ Encoder.appendKanjiBytes(shiftJISString(new byte[] {(byte)0xe4,(byte)0xaa}), bits);
+ assertEquals(" .XX.XX.. XXXXXXX. X.X.X.X. X.", bits.toString());
}
- // JAVAPORT: Uncomment and fix up with new Reed Solomon objects
-// static boolean ComparePoly(final int[] expected, final int size, final GF_Poly poly) {
-// if (size != poly.degree() + 1) {
-// return false;
-// }
-// for (int i = 0; i < size; ++i) {
-// // "expected" is ordered in a reverse order. We reverse the coeff
-// // index for comparison.
-// final int coeff = GaloisField.GetField(8).Log(
-// poly.coeff(size - i - 1));
-// if (expected[i] != coeff) {
-// Debug.LOG_ERROR("values don't match at " + i + ": " +
-// expected[i] + " vs. " + coeff);
-// return false;
-// }
-// }
-// return true;
-// }
-//
-// // Numbers are from Appendix A of JISX0510 2004 (p.59).
-// public void testGetECPoly() {
-// {
-// final GF_Poly poly = Encoder.GetECPoly(7);
-// final int[] expected = {0, 87, 229, 146, 149, 238, 102, 21};
-// assertTrue(ComparePoly(expected, expected.length, poly));
-// }
-// {
-// final GF_Poly poly = Encoder.GetECPoly(17);
-// final int[] expected = {
-// 0, 43, 139, 206, 78, 43, 239, 123, 206, 214, 147, 24, 99, 150,
-// 39, 243, 163, 136
-// };
-// assertTrue(ComparePoly(expected, expected.length, poly));
-// }
-// {
-// final GF_Poly poly = Encoder.GetECPoly(34);
-// final int[] expected = {
-// 0, 111, 77, 146, 94, 26, 21, 108, 19,
-// 105, 94, 113, 193, 86, 140, 163, 125,
-// 58,
-// 158, 229, 239, 218, 103, 56, 70, 114,
-// 61, 183, 129, 167, 13, 98, 62, 129, 51
-// };
-// assertTrue(ComparePoly(expected, expected.length, poly));
-// }
-// {
-// final GF_Poly poly = Encoder.GetECPoly(68);
-// final int[] expected = {
-// 0, 247, 159, 223, 33, 224, 93, 77, 70,
-// 90, 160, 32, 254, 43, 150, 84, 101,
-// 190,
-// 205, 133, 52, 60, 202, 165, 220, 203,
-// 151, 93, 84, 15, 84, 253, 173, 160,
-// 89, 227, 52, 199, 97, 95, 231, 52,
-// 177, 41, 125, 137, 241, 166, 225, 118,
-// 2, 54,
-// 32, 82, 215, 175, 198, 43, 238, 235,
-// 27, 101, 184, 127, 3, 5, 8, 163, 238
-// };
-// assertTrue(ComparePoly(expected, expected.length, poly));
-// }
-// }
-
// Numbers are from http://www.swetake.com/qr/qr3.html and
// http://www.swetake.com/qr/qr9.html
public void testGenerateECBytes() {
{
- final byte[] data_bytes = {32, 65, (byte)205, 69, 41, (byte)220, 46, (byte)128, (byte)236};
- ByteArray ec_bytes = Encoder.GenerateECBytes(new ByteArray(data_bytes), 17);
- final int[] expected = {
+ byte[] dataBytes = {32, 65, (byte)205, 69, 41, (byte)220, 46, (byte)128, (byte)236};
+ byte[] ecBytes = Encoder.generateECBytes(dataBytes, 17);
+ int[] expected = {
42, 159, 74, 221, 244, 169, 239, 150, 138, 70, 237, 85, 224, 96, 74, 219, 61
};
- assertEquals(expected.length, ec_bytes.size());
+ assertEquals(expected.length, ecBytes.length);
for (int x = 0; x < expected.length; x++) {
- assertEquals(expected[x], ec_bytes.at(x));
+ assertEquals(expected[x], ecBytes[x] & 0xFF);
}
}
{
- final byte[] data_bytes = {67, 70, 22, 38, 54, 70, 86, 102, 118,
+ byte[] dataBytes = {67, 70, 22, 38, 54, 70, 86, 102, 118,
(byte)134, (byte)150, (byte)166, (byte)182, (byte)198, (byte)214};
- ByteArray ec_bytes = Encoder.GenerateECBytes(new ByteArray(data_bytes), 18);
- final int[] expected = {
+ byte[] ecBytes = Encoder.generateECBytes(dataBytes, 18);
+ int[] expected = {
175, 80, 155, 64, 178, 45, 214, 233, 65, 209, 12, 155, 117, 31, 140, 214, 27, 187
};
- assertEquals(expected.length, ec_bytes.size());
+ assertEquals(expected.length, ecBytes.length);
for (int x = 0; x < expected.length; x++) {
- assertEquals(expected[x], ec_bytes.at(x));
+ assertEquals(expected[x], ecBytes[x] & 0xFF);
}
}
{
- // High-order zero cofficient case.
- final byte[] data_bytes = {32, 49, (byte)205, 69, 42, 20, 0, (byte)236, 17};
- ByteArray ec_bytes = Encoder.GenerateECBytes(new ByteArray(data_bytes), 17);
- final int[] expected = {
+ // High-order zero coefficient case.
+ byte[] dataBytes = {32, 49, (byte)205, 69, 42, 20, 0, (byte)236, 17};
+ byte[] ecBytes = Encoder.generateECBytes(dataBytes, 17);
+ int[] expected = {
0, 3, 130, 179, 194, 0, 55, 211, 110, 79, 98, 72, 170, 96, 211, 137, 213
};
- assertEquals(expected.length, ec_bytes.size());
+ assertEquals(expected.length, ecBytes.length);
for (int x = 0; x < expected.length; x++) {
- assertEquals(expected[x], ec_bytes.at(x));
+ assertEquals(expected[x], ecBytes[x] & 0xFF);
}
}
}
- public void testIsValidKanji() {
- assertTrue(Encoder.IsValidKanji(0x82, 0xa0)); // Hiragana "A".
- assertTrue(Encoder.IsValidKanji(0x93, 0xfa)); // Nichi in Kanji.
- assertTrue(Encoder.IsValidKanji(0x8a, 0xbf)); // Kan in Kanji.
- assertTrue(Encoder.IsValidKanji(0xe7, 0x4e)); // Sou in Kanji.
- assertTrue(Encoder.IsValidKanji(0xea, 0xa2)); // Haruka in Kanji.
-
- assertFalse(Encoder.IsValidKanji('0', '1'));
- assertFalse(Encoder.IsValidKanji(0x82, 0x7f));
- assertFalse(Encoder.IsValidKanji(0xa0, 0xa0));
+ public void testBugInBitVectorNumBytes() throws WriterException {
+ // There was a bug in BitVector.sizeInBytes() that caused it to return a
+ // smaller-by-one value (ex. 1465 instead of 1466) if the number of bits
+ // in the vector is not 8-bit aligned. In QRCodeEncoder::InitQRCode(),
+ // BitVector::sizeInBytes() is used for finding the smallest QR Code
+ // version that can fit the given data. Hence there were corner cases
+ // where we chose a wrong QR Code version that cannot fit the given
+ // data. Note that the issue did not occur with MODE_8BIT_BYTE, as the
+ // bits in the bit vector are always 8-bit aligned.
+ //
+ // Before the bug was fixed, the following test didn't pass, because:
+ //
+ // - MODE_NUMERIC is chosen as all bytes in the data are '0'
+ // - The 3518-byte numeric data needs 1466 bytes
+ // - 3518 / 3 * 10 + 7 = 11727 bits = 1465.875 bytes
+ // - 3 numeric bytes are encoded in 10 bits, hence the first
+ // 3516 bytes are encoded in 3516 / 3 * 10 = 11720 bits.
+ // - 2 numeric bytes can be encoded in 7 bits, hence the last
+ // 2 bytes are encoded in 7 bits.
+ // - The version 27 QR Code with the EC level L has 1468 bytes for data.
+ // - 1828 - 360 = 1468
+ // - In InitQRCode(), 3 bytes are reserved for a header. Hence 1465 bytes
+ // (1468 -3) are left for data.
+ // - Because of the bug in BitVector::sizeInBytes(), InitQRCode() determines
+ // the given data can fit in 1465 bytes, despite it needs 1466 bytes.
+ // - Hence QRCodeEncoder.encode() failed and returned false.
+ // - To be precise, it needs 11727 + 4 (getMode info) + 14 (length info) =
+ // 11745 bits = 1468.125 bytes are needed (i.e. cannot fit in 1468
+ // bytes).
+ StringBuilder builder = new StringBuilder(3518);
+ for (int x = 0; x < 3518; x++) {
+ builder.append('0');
+ }
+ QRCode qrCode = new QRCode();
+ Encoder.encode(builder.toString(), ErrorCorrectionLevel.L, qrCode);
}
- public void testIsValidKanjiSequence() {
- // AIUEO in Katakana
- byte[] dat1 = {0x8,0x4,0x8,0x4,0x8,0x4,0x8,0x4,0x8,0x49};
- assertTrue(Encoder.IsValidKanjiSequence(new ByteArray(dat1)));
- // 012345 in multi-byte letters.
- byte[] dat2 = {0x8,0x4,0x8,0x5,0x8,0x5,0x8,0x5,0x8,0x5,0x8,0x54};
- assertTrue(Encoder.IsValidKanjiSequence(new ByteArray(dat2)));
- // Yoroshiku in Kanji.
- byte[] dat3 = {0x9,0xe,0x9,0x4,0x8,0x8,0x8,(byte)0xea};
- assertTrue(Encoder.IsValidKanjiSequence(new ByteArray(dat3)));
- assertFalse(Encoder.IsValidKanjiSequence(new ByteArray("0123")));
- assertFalse(Encoder.IsValidKanjiSequence(new ByteArray("ABC")));
+ private static String shiftJISString(byte[] bytes) throws WriterException {
+ try {
+ return new String(bytes, "Shift_JIS");
+ } catch (UnsupportedEncodingException uee) {
+ throw new WriterException(uee.toString());
+ }
}
+
}
projects / zxing.git / blobdiff