Add Aztec reader initialization support (#2066)

2 files changed, 14 insertions, 4 deletions

diff --git a/core/src/test/java/com/google/zxing/aztec/AztecBlackBox1TestCase.java b/core/src/test/java/com/google/zxing/aztec/AztecBlackBox1TestCase.java
index 340550680..6f12e90d6 100644
--- a/core/src/test/java/com/google/zxing/aztec/AztecBlackBox1TestCase.java
+++ b/core/src/test/java/com/google/zxing/aztec/AztecBlackBox1TestCase.java
@@ -26,10 +26,10 @@ public final class AztecBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public AztecBlackBox1TestCase() {
     super("src/test/resources/blackbox/aztec-1", new AztecReader(), BarcodeFormat.AZTEC);
-    addTest(15, 15, 0.0f);
-    addTest(15, 15, 90.0f);
-    addTest(15, 15, 180.0f);
-    addTest(15, 15, 270.0f);
+    addTest(17, 17, 0.0f);
+    addTest(17, 17, 90.0f);
+    addTest(17, 17, 180.0f);
+    addTest(17, 17, 270.0f);
   }
 
 }
diff --git a/core/src/test/java/com/google/zxing/common/AbstractBlackBoxTestCase.java b/core/src/test/java/com/google/zxing/common/AbstractBlackBoxTestCase.java
index adce02a89..ee30d3bd7 100644
--- a/core/src/test/java/com/google/zxing/common/AbstractBlackBoxTestCase.java
+++ b/core/src/test/java/com/google/zxing/common/AbstractBlackBoxTestCase.java
@@ -167,6 +167,7 @@ public abstract class AbstractBlackBoxTestCase extends Assert {
         }
         correctInteger(expectedMetadata, ResultMetadataType.ERRORS_CORRECTED);
         correctInteger(expectedMetadata, ResultMetadataType.ERASURES_CORRECTED);
+        correctBoolean(expectedMetadata, ResultMetadataType.READER_INIT);
       }
 
       for (int x = 0; x < testCount; x++) {
@@ -260,6 +261,15 @@ public abstract class AbstractBlackBoxTestCase extends Assert {
     }
   }
 
+  private static void correctBoolean(Properties metadata, ResultMetadataType key) {
+    String skey = key.toString();
+    if (metadata.containsKey(skey)) {
+      String sval = metadata.getProperty(skey);
+      Boolean bval = Boolean.valueOf(sval);
+      metadata.put(skey, bval);
+    }
+  }
+
   private boolean decode(BinaryBitmap source,
                          float rotation,
                          String expectedText,