Issue 563: Support non-rectangular Data Matrix

[zxing.git] / core / test / src / com / google / zxing / AllPositiveBlackBoxTester.java

diff --git a/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java b/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java
index e72a370..0beb2c9 100644 (file)
--- a/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java
+++ b/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java
@@ -36,10 +36,12 @@ import com.google.zxing.oned.UPCABlackBox1TestCase;
 import com.google.zxing.oned.UPCABlackBox2TestCase;
 import com.google.zxing.oned.UPCABlackBox3ReflectiveTestCase;
 import com.google.zxing.oned.UPCABlackBox4TestCase;
+import com.google.zxing.oned.UPCABlackBox5TestCase;
 import com.google.zxing.oned.UPCEBlackBox1TestCase;
 import com.google.zxing.oned.UPCEBlackBox2TestCase;
 import com.google.zxing.oned.UPCEBlackBox3ReflectiveTestCase;
 import com.google.zxing.pdf417.PDF417BlackBox1TestCase;
+import com.google.zxing.pdf417.PDF417BlackBox2TestCase;
 import com.google.zxing.qrcode.QRCodeBlackBox1TestCase;
 import com.google.zxing.qrcode.QRCodeBlackBox2TestCase;
 import com.google.zxing.qrcode.QRCodeBlackBox3TestCase;
@@ -79,10 +81,12 @@ public final class AllPositiveBlackBoxTester {
     new UPCABlackBox2TestCase(),
     new UPCABlackBox3ReflectiveTestCase(),
     new UPCABlackBox4TestCase(),
+    new UPCABlackBox5TestCase(),
     new UPCEBlackBox1TestCase(),
     new UPCEBlackBox2TestCase(),
     new UPCEBlackBox3ReflectiveTestCase(),
     new PDF417BlackBox1TestCase(),
+    new PDF417BlackBox2TestCase(),
     new QRCodeBlackBox1TestCase(),
     new QRCodeBlackBox2TestCase(),
     new QRCodeBlackBox3TestCase(),
@@ -113,6 +117,7 @@ public final class AllPositiveBlackBoxTester {
 //    new UPCABlackBox2TestCase(),
 //    new UPCABlackBox3ReflectiveTestCase(),
 //    new UPCABlackBox4TestCase(),
+//    new UPCABlackBox5TestCase(),
 //    new UPCEBlackBox1TestCase(),
 //    new UPCEBlackBox2TestCase(),
 //    new UPCEBlackBox3ReflectiveTestCase(),
@@ -157,8 +162,8 @@ public final class AllPositiveBlackBoxTester {
     long now = System.currentTimeMillis();
     AbstractBlackBoxTestCase.SummaryResults results = new AbstractBlackBoxTestCase.SummaryResults();
 
-    for (int x = 0; x < TESTS.length; x++) {
-      results.add(TESTS[x].testBlackBoxCountingResults(false));
+    for (AbstractBlackBoxTestCase test : TESTS) {
+      results.add(test.testBlackBoxCountingResults(false));
     }
 
     // This threaded version can't be used yet because BlackPointEstimator (and possibly other code)