X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fcommon%2FAbstractBlackBoxTestCase.java;h=6695c4b23bbac6d8aed77e4cf2f12435e52e53d2;hb=72e8850d9af1243e1e79dbb54c474f4d81238b42;hp=f31ea462c175de2e92b179fe24859c90e4c3be4b;hpb=0e6441475c83c367ff7a8386ef88b8046927db7b;p=zxing.git

diff --git a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
index f31ea462..6695c4b2 100644
--- a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
+++ b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
@@ -95,7 +95,11 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
         continue;
       }
 
-      assertEquals(expectedFormat, result.getBarcodeFormat());
+      if (expectedFormat != result.getBarcodeFormat()) {
+        System.out.println("Format mismatch: expected '" + expectedFormat + "' but got '" +
+            result.getBarcodeFormat() + '\'');
+        continue;
+      }
 
       String testImageFileName = testImage.getName();
       File expectedTextFile = new File(testBase,
@@ -107,7 +111,8 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
       if (passed) {
         passedCount++;
       } else {
-        fail("Mismatch: expected '" + expectedText + "' but got '" + resultText + '\'');
+        System.out.println("Mismatch: expected '" + expectedText + "' but got '" + resultText + '\'');
+        continue;
       }
 
       // Try "try harder" mode
@@ -119,10 +124,13 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
         }
         continue;
       }
-      assertEquals("Normal mode succeeded but \"try harder\" failed", expectedFormat,
-          result.getBarcodeFormat());
-      assertEquals("Normal mode succeeded but \"try harder\" failed", expectedText,
-          result.getText());
+      if (expectedFormat != result.getBarcodeFormat()) {
+        System.out.println("Try Harder Format mismatch: expected '" + expectedFormat + "' but got '" +
+            result.getBarcodeFormat() + '\'');
+      } else if (!expectedText.equals(resultText)) {
+        System.out.println("Try Harder Mismatch: expected '" + expectedText + "' but got '" +
+            resultText + '\'');
+      }
     }
 
     System.out.println(passedCount + " of " + imageFiles.length + " images passed (" +