projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
At last update to JUnit 4.x
[zxing.git]
/
core
/
test
/
src
/
com
/
google
/
zxing
/
qrcode
/
decoder
/
DataMaskTestCase.java
diff --git
a/core/test/src/com/google/zxing/qrcode/decoder/DataMaskTestCase.java
b/core/test/src/com/google/zxing/qrcode/decoder/DataMaskTestCase.java
index
6d8011a
..
e8bda16
100644
(file)
--- a/
core/test/src/com/google/zxing/qrcode/decoder/DataMaskTestCase.java
+++ b/
core/test/src/com/google/zxing/qrcode/decoder/DataMaskTestCase.java
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2007
Google Inc.
+ * Copyright 2007
ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,14
+17,15
@@
package com.google.zxing.qrcode.decoder;
import com.google.zxing.common.BitMatrix;
package com.google.zxing.qrcode.decoder;
import com.google.zxing.common.BitMatrix;
-import
junit.framework.TestCase
;
-import
junit.textui.TestRunner
;
+import
org.junit.Assert
;
+import
org.junit.Test
;
/**
* @author Sean Owen
*/
/**
* @author Sean Owen
*/
-public final class DataMaskTestCase extends
TestCase
{
+public final class DataMaskTestCase extends
Assert
{
+ @Test
public void testMask0() {
testMaskAcrossDimensions(0, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask0() {
testMaskAcrossDimensions(0, new MaskCondition() {
public boolean isMasked(int i, int j) {
@@
-33,6
+34,7
@@
public final class DataMaskTestCase extends TestCase {
});
}
});
}
+ @Test
public void testMask1() {
testMaskAcrossDimensions(1, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask1() {
testMaskAcrossDimensions(1, new MaskCondition() {
public boolean isMasked(int i, int j) {
@@
-41,6
+43,7
@@
public final class DataMaskTestCase extends TestCase {
});
}
});
}
+ @Test
public void testMask2() {
testMaskAcrossDimensions(2, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask2() {
testMaskAcrossDimensions(2, new MaskCondition() {
public boolean isMasked(int i, int j) {
@@
-49,6
+52,7
@@
public final class DataMaskTestCase extends TestCase {
});
}
});
}
+ @Test
public void testMask3() {
testMaskAcrossDimensions(3, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask3() {
testMaskAcrossDimensions(3, new MaskCondition() {
public boolean isMasked(int i, int j) {
@@
-57,66
+61,65
@@
public final class DataMaskTestCase extends TestCase {
});
}
});
}
+ @Test
public void testMask4() {
testMaskAcrossDimensions(4, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask4() {
testMaskAcrossDimensions(4, new MaskCondition() {
public boolean isMasked(int i, int j) {
- return (i
/2 + j/
3) % 2 == 0;
+ return (i
/ 2 + j /
3) % 2 == 0;
}
});
}
}
});
}
+ @Test
public void testMask5() {
testMaskAcrossDimensions(5, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask5() {
testMaskAcrossDimensions(5, new MaskCondition() {
public boolean isMasked(int i, int j) {
- return (i
*j) % 2 + (i*
j) % 3 == 0;
+ return (i
* j) % 2 + (i *
j) % 3 == 0;
}
});
}
}
});
}
+ @Test
public void testMask6() {
testMaskAcrossDimensions(6, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask6() {
testMaskAcrossDimensions(6, new MaskCondition() {
public boolean isMasked(int i, int j) {
- return ((i
*j) % 2 + (i*
j) % 3) % 2 == 0;
+ return ((i
* j) % 2 + (i *
j) % 3) % 2 == 0;
}
});
}
}
});
}
+ @Test
public void testMask7() {
testMaskAcrossDimensions(7, new MaskCondition() {
public boolean isMasked(int i, int j) {
public void testMask7() {
testMaskAcrossDimensions(7, new MaskCondition() {
public boolean isMasked(int i, int j) {
- return ((i
+j) % 2 + (i*
j) % 3) % 2 == 0;
+ return ((i
+ j) % 2 + (i *
j) % 3) % 2 == 0;
}
});
}
}
});
}
- private void testMaskAcrossDimensions(int reference,
- MaskCondition condition) {
+ private static void testMaskAcrossDimensions(int reference, MaskCondition condition) {
DataMask mask = DataMask.forReference(reference);
for (int version = 1; version <= 40; version++) {
DataMask mask = DataMask.forReference(reference);
for (int version = 1; version <= 40; version++) {
- int dimension = 17 + 4
*
version;
+ int dimension = 17 + 4
*
version;
testMask(mask, dimension, condition);
}
}
testMask(mask, dimension, condition);
}
}
- private void testMask(DataMask mask, int dimension, MaskCondition condition) {
+ private
static
void testMask(DataMask mask, int dimension, MaskCondition condition) {
BitMatrix bits = new BitMatrix(dimension);
BitMatrix bits = new BitMatrix(dimension);
- mask.unmaskBitMatrix(bits
.getBits()
, dimension);
+ mask.unmaskBitMatrix(bits, dimension);
for (int i = 0; i < dimension; i++) {
for (int j = 0; j < dimension; j++) {
assertEquals(
for (int i = 0; i < dimension; i++) {
for (int j = 0; j < dimension; j++) {
assertEquals(
- "(" + i + ',' + j + ')',
+ "(" + i + ',' + j + ')',
condition.isMasked(i, j),
condition.isMasked(i, j),
- bits.get(
i, j
));
+ bits.get(
j, i
));
}
}
}
}
}
}
- private
static
interface MaskCondition {
+ private interface MaskCondition {
boolean isMasked(int i, int j);
}
boolean isMasked(int i, int j);
}
- public static void main(String[] args) {
- TestRunner.run(new DataMaskTestCase());
- }
-
}
}