projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big rename of variables and method to have more standard Java names
[zxing.git]
/
core
/
test
/
src
/
com
/
google
/
zxing
/
qrcode
/
encoder
/
MaskUtilTestCase.java
diff --git
a/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
b/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
index
c1dca49
..
fa942b2
100644
(file)
--- a/
core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
+++ b/
core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
@@
-33,7
+33,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 1, 0);
matrix.set(0, 2, 0);
matrix.set(0, 3, 0);
matrix.set(0, 1, 0);
matrix.set(0, 2, 0);
matrix.set(0, 3, 0);
- assertEquals(0, MaskUtil.
A
pplyMaskPenaltyRule1(matrix));
+ assertEquals(0, MaskUtil.
a
pplyMaskPenaltyRule1(matrix));
}
{ // Horizontal.
ByteMatrix matrix = new ByteMatrix(1, 6);
}
{ // Horizontal.
ByteMatrix matrix = new ByteMatrix(1, 6);
@@
-43,9
+43,9
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 3, 0);
matrix.set(0, 4, 0);
matrix.set(0, 5, 1);
matrix.set(0, 3, 0);
matrix.set(0, 4, 0);
matrix.set(0, 5, 1);
- assertEquals(3, MaskUtil.
A
pplyMaskPenaltyRule1(matrix));
+ assertEquals(3, MaskUtil.
a
pplyMaskPenaltyRule1(matrix));
matrix.set(0, 5, 0);
matrix.set(0, 5, 0);
- assertEquals(4, MaskUtil.
A
pplyMaskPenaltyRule1(matrix));
+ assertEquals(4, MaskUtil.
a
pplyMaskPenaltyRule1(matrix));
}
{ // Vertical.
ByteMatrix matrix = new ByteMatrix(6, 1);
}
{ // Vertical.
ByteMatrix matrix = new ByteMatrix(6, 1);
@@
-55,9
+55,9
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(3, 0, 0);
matrix.set(4, 0, 0);
matrix.set(5, 0, 1);
matrix.set(3, 0, 0);
matrix.set(4, 0, 0);
matrix.set(5, 0, 1);
- assertEquals(3, MaskUtil.
A
pplyMaskPenaltyRule1(matrix));
+ assertEquals(3, MaskUtil.
a
pplyMaskPenaltyRule1(matrix));
matrix.set(5, 0, 0);
matrix.set(5, 0, 0);
- assertEquals(4, MaskUtil.
A
pplyMaskPenaltyRule1(matrix));
+ assertEquals(4, MaskUtil.
a
pplyMaskPenaltyRule1(matrix));
}
}
}
}
@@
-65,7
+65,7
@@
public final class MaskUtilTestCase extends TestCase {
{
ByteMatrix matrix = new ByteMatrix(1, 1);
matrix.set(0, 0, 0);
{
ByteMatrix matrix = new ByteMatrix(1, 1);
matrix.set(0, 0, 0);
- assertEquals(0, MaskUtil.
A
pplyMaskPenaltyRule2(matrix));
+ assertEquals(0, MaskUtil.
a
pplyMaskPenaltyRule2(matrix));
}
{
ByteMatrix matrix = new ByteMatrix(2, 2);
}
{
ByteMatrix matrix = new ByteMatrix(2, 2);
@@
-73,7
+73,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 1, 0);
matrix.set(1, 0, 0);
matrix.set(1, 1, 1);
matrix.set(0, 1, 0);
matrix.set(1, 0, 0);
matrix.set(1, 1, 1);
- assertEquals(0, MaskUtil.
A
pplyMaskPenaltyRule2(matrix));
+ assertEquals(0, MaskUtil.
a
pplyMaskPenaltyRule2(matrix));
}
{
ByteMatrix matrix = new ByteMatrix(2, 2);
}
{
ByteMatrix matrix = new ByteMatrix(2, 2);
@@
-81,7
+81,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 1, 0);
matrix.set(1, 0, 0);
matrix.set(1, 1, 0);
matrix.set(0, 1, 0);
matrix.set(1, 0, 0);
matrix.set(1, 1, 0);
- assertEquals(3, MaskUtil.
A
pplyMaskPenaltyRule2(matrix));
+ assertEquals(3, MaskUtil.
a
pplyMaskPenaltyRule2(matrix));
}
{
ByteMatrix matrix = new ByteMatrix(3, 3);
}
{
ByteMatrix matrix = new ByteMatrix(3, 3);
@@
-95,7
+95,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(2, 1, 0);
matrix.set(2, 2, 0);
// Four instances of 2x2 blocks.
matrix.set(2, 1, 0);
matrix.set(2, 2, 0);
// Four instances of 2x2 blocks.
- assertEquals(3 * 4, MaskUtil.
A
pplyMaskPenaltyRule2(matrix));
+ assertEquals(3 * 4, MaskUtil.
a
pplyMaskPenaltyRule2(matrix));
}
}
}
}
@@
-114,7
+114,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 8, 1);
matrix.set(0, 9, 0);
matrix.set(0, 10, 1);
matrix.set(0, 8, 1);
matrix.set(0, 9, 0);
matrix.set(0, 10, 1);
- assertEquals(40, MaskUtil.
A
pplyMaskPenaltyRule3(matrix));
+ assertEquals(40, MaskUtil.
a
pplyMaskPenaltyRule3(matrix));
}
{
// Horizontal 10111010000.
}
{
// Horizontal 10111010000.
@@
-130,7
+130,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 8, 0);
matrix.set(0, 9, 0);
matrix.set(0, 10, 0);
matrix.set(0, 8, 0);
matrix.set(0, 9, 0);
matrix.set(0, 10, 0);
- assertEquals(40, MaskUtil.
A
pplyMaskPenaltyRule3(matrix));
+ assertEquals(40, MaskUtil.
a
pplyMaskPenaltyRule3(matrix));
}
{
// Vertical 00001011101.
}
{
// Vertical 00001011101.
@@
-146,7
+146,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(8, 0, 1);
matrix.set(9, 0, 0);
matrix.set(10, 0, 1);
matrix.set(8, 0, 1);
matrix.set(9, 0, 0);
matrix.set(10, 0, 1);
- assertEquals(40, MaskUtil.
A
pplyMaskPenaltyRule3(matrix));
+ assertEquals(40, MaskUtil.
a
pplyMaskPenaltyRule3(matrix));
}
{
// Vertical 10111010000.
}
{
// Vertical 10111010000.
@@
-162,7
+162,7
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(8, 0, 0);
matrix.set(9, 0, 0);
matrix.set(10, 0, 0);
matrix.set(8, 0, 0);
matrix.set(9, 0, 0);
matrix.set(10, 0, 0);
- assertEquals(40, MaskUtil.
A
pplyMaskPenaltyRule3(matrix));
+ assertEquals(40, MaskUtil.
a
pplyMaskPenaltyRule3(matrix));
}
}
}
}
@@
-171,14
+171,14
@@
public final class MaskUtilTestCase extends TestCase {
// Dark cell ratio = 0%
ByteMatrix matrix = new ByteMatrix(1, 1);
matrix.set(0, 0, 0);
// Dark cell ratio = 0%
ByteMatrix matrix = new ByteMatrix(1, 1);
matrix.set(0, 0, 0);
- assertEquals(100, MaskUtil.
A
pplyMaskPenaltyRule4(matrix));
+ assertEquals(100, MaskUtil.
a
pplyMaskPenaltyRule4(matrix));
}
{
// Dark cell ratio = 5%
ByteMatrix matrix = new ByteMatrix(1, 2);
matrix.set(0, 0, 0);
matrix.set(0, 0, 1);
}
{
// Dark cell ratio = 5%
ByteMatrix matrix = new ByteMatrix(1, 2);
matrix.set(0, 0, 0);
matrix.set(0, 0, 1);
- assertEquals(0, MaskUtil.
A
pplyMaskPenaltyRule4(matrix));
+ assertEquals(0, MaskUtil.
a
pplyMaskPenaltyRule4(matrix));
}
{
// Dark cell ratio = 66.67%
}
{
// Dark cell ratio = 66.67%
@@
-189,16
+189,16
@@
public final class MaskUtilTestCase extends TestCase {
matrix.set(0, 3, 1);
matrix.set(0, 4, 1);
matrix.set(0, 5, 0);
matrix.set(0, 3, 1);
matrix.set(0, 4, 1);
matrix.set(0, 5, 0);
- assertEquals(30, MaskUtil.
A
pplyMaskPenaltyRule4(matrix));
+ assertEquals(30, MaskUtil.
a
pplyMaskPenaltyRule4(matrix));
}
}
}
}
- private static boolean TestGetDataMaskBitInternal(int mask
_p
attern,
+ private static boolean TestGetDataMaskBitInternal(int mask
P
attern,
int[][] expected) {
for (int x = 0; x < 6; ++x) {
for (int y = 0; y < 6; ++y) {
if (expected[y][x] !=
int[][] expected) {
for (int x = 0; x < 6; ++x) {
for (int y = 0; y < 6; ++y) {
if (expected[y][x] !=
- MaskUtil.
GetDataMaskBit(mask_p
attern, x, y)) {
+ MaskUtil.
getDataMaskBit(maskP
attern, x, y)) {
return false;
}
}
return false;
}
}