mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More enhancements to Reed-Solomon tests

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@703 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-11-14 18:34:19 +00:00
parent b625c6f7e5
commit f80cd1ff51
4 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/test/src/com/google/zxing/common/reedsolomon/AbstractReedSolomonTestCase.java
View file

@ -47,7 +47,11 @@ abstract class AbstractReedSolomonTestCase extends TestCase {
assertArraysEqual(expectedECBytes, 0, toEncode, dataBytes.length, expectedECBytes.length); assertArraysEqual(expectedECBytes, 0, toEncode, dataBytes.length, expectedECBytes.length);
} }
private static void assertArraysEqual(int[] expected, int expectedOffset, int[] actual, int actualOffset, int length) { static Random getRandom() {
return new Random(0xDEADBEEF);
}
static void assertArraysEqual(int[] expected, int expectedOffset, int[] actual, int actualOffset, int length) {
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
assertEquals(expected[expectedOffset + i], actual[actualOffset + i]); assertEquals(expected[expectedOffset + i], actual[actualOffset + i]);
} }

6
core/test/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoderDataMatrixTestCase.java
View file

@ -40,7 +40,7 @@ public final class ReedSolomonDecoderDataMatrixTestCase extends AbstractReedSolo
public void testOneError() throws ReedSolomonException { public void testOneError() throws ReedSolomonException {
int[] received = new int[DM_CODE_TEST_WITH_EC.length]; int[] received = new int[DM_CODE_TEST_WITH_EC.length];
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
for (int i = 0; i < received.length; i++) { for (int i = 0; i < received.length; i++) {
System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length);
received[i] = random.nextInt(256); received[i] = random.nextInt(256);
@ -50,7 +50,7 @@ public final class ReedSolomonDecoderDataMatrixTestCase extends AbstractReedSolo
public void testMaxErrors() throws ReedSolomonException { public void testMaxErrors() throws ReedSolomonException {
int[] received = new int[DM_CODE_TEST_WITH_EC.length]; int[] received = new int[DM_CODE_TEST_WITH_EC.length];
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
for (int i = 0; i < DM_CODE_TEST.length; i++) { // # iterations is kind of arbitrary for (int i = 0; i < DM_CODE_TEST.length; i++) { // # iterations is kind of arbitrary
System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length);
corrupt(received, DM_CODE_CORRECTABLE, random); corrupt(received, DM_CODE_CORRECTABLE, random);
@ -61,7 +61,7 @@ public final class ReedSolomonDecoderDataMatrixTestCase extends AbstractReedSolo
public void testTooManyErrors() { public void testTooManyErrors() {
int[] received = new int[DM_CODE_TEST_WITH_EC.length]; int[] received = new int[DM_CODE_TEST_WITH_EC.length];
System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(DM_CODE_TEST_WITH_EC, 0, received, 0, received.length);
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
corrupt(received, DM_CODE_CORRECTABLE + 1, random); corrupt(received, DM_CODE_CORRECTABLE + 1, random);
try { try {
checkQRRSDecode(received); checkQRRSDecode(received);

6
core/test/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoderQRCodeTestCase.java
View file

@ -45,7 +45,7 @@ public final class ReedSolomonDecoderQRCodeTestCase extends AbstractReedSolomonT
public void testOneError() throws ReedSolomonException { public void testOneError() throws ReedSolomonException {
int[] received = new int[QR_CODE_TEST_WITH_EC.length]; int[] received = new int[QR_CODE_TEST_WITH_EC.length];
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
for (int i = 0; i < received.length; i++) { for (int i = 0; i < received.length; i++) {
System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length);
received[i] = random.nextInt(256); received[i] = random.nextInt(256);
@ -55,7 +55,7 @@ public final class ReedSolomonDecoderQRCodeTestCase extends AbstractReedSolomonT
public void testMaxErrors() throws ReedSolomonException { public void testMaxErrors() throws ReedSolomonException {
int[] received = new int[QR_CODE_TEST_WITH_EC.length]; int[] received = new int[QR_CODE_TEST_WITH_EC.length];
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
for (int i = 0; i < QR_CODE_TEST.length; i++) { // # iterations is kind of arbitrary for (int i = 0; i < QR_CODE_TEST.length; i++) { // # iterations is kind of arbitrary
System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length);
corrupt(received, QR_CODE_CORRECTABLE, random); corrupt(received, QR_CODE_CORRECTABLE, random);
@ -66,7 +66,7 @@ public final class ReedSolomonDecoderQRCodeTestCase extends AbstractReedSolomonT
public void testTooManyErrors() { public void testTooManyErrors() {
int[] received = new int[QR_CODE_TEST_WITH_EC.length]; int[] received = new int[QR_CODE_TEST_WITH_EC.length];
System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length); System.arraycopy(QR_CODE_TEST_WITH_EC, 0, received, 0, received.length);
Random random = new Random(0xDEADBEEFL); Random random = getRandom();
corrupt(received, QR_CODE_CORRECTABLE + 1, random); corrupt(received, QR_CODE_CORRECTABLE + 1, random);
try { try {
checkQRRSDecode(received); checkQRRSDecode(received);

22
core/test/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoderQRCodeTestCase.java
View file

@ -16,6 +16,8 @@
package com.google.zxing.common.reedsolomon; package com.google.zxing.common.reedsolomon;
import java.util.Random;
/** /**
* @author srowen@google.com (Sean Owen) * @author srowen@google.com (Sean Owen)
*/ */
@ -34,6 +36,26 @@ public final class ReedSolomonEncoderQRCodeTestCase extends AbstractReedSolomonT
doTestQRCodeEncoding(dataBytes, expectedECBytes); doTestQRCodeEncoding(dataBytes, expectedECBytes);
} }
public void testQRCodeVersusDecoder() throws Exception {
Random random = getRandom();
ReedSolomonEncoder encoder = new ReedSolomonEncoder(GF256.QR_CODE_FIELD);
ReedSolomonDecoder decoder = new ReedSolomonDecoder(GF256.QR_CODE_FIELD);
for (int i = 0; i < 100; i++) {
int size = random.nextInt(1000);
int[] toEncode = new int[size];
int ecBytes = random.nextInt(2 * (1 + size / 8));
int dataBytes = size - ecBytes;
for (int j = 0; j < dataBytes; j++) {
toEncode[j] = random.nextInt(256);
}
int[] original = new int[dataBytes];
System.arraycopy(toEncode, 0, original, 0, dataBytes);
encoder.encode(toEncode, ecBytes);
decoder.decode(toEncode, ecBytes);
assertArraysEqual(original, 0, toEncode, 0, dataBytes);
}
}
// Need more tests I am sure // Need more tests I am sure
} }