Created a new blackbox test of real world Aztec images taken with a mobile phone. We're only decoding 9% at the moment.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1771 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/core/build.xml b/core/build.xml
index ef364de..c3983e4 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -121,6 +121,9 @@
<target name="test-blackbox" depends="build-test">
<parallel failonany="true">
<antcall target="test-blackbox-subset">
+ <param name="subdir" value="aztec"/>
+ </antcall>
+ <antcall target="test-blackbox-subset">
<param name="subdir" value="datamatrix"/>
</antcall>
<antcall target="test-blackbox-subset">
@@ -150,7 +153,7 @@
<assertions>
<enable/>
</assertions>
- <jvmarg value="-Djava.awt.headless=true"/>
+ <jvmarg value="-Djava.awt.headless=true"/>
<batchtest>
<fileset dir="test/src">
<include name="**/${subdir}/*BlackBox*TestCase.java"/>
diff --git a/core/test/data/blackbox/aztec-2/01.png b/core/test/data/blackbox/aztec-2/01.png
new file mode 100755
index 0000000..90cccf9
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/01.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/01.txt b/core/test/data/blackbox/aztec-2/01.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/01.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/02.png b/core/test/data/blackbox/aztec-2/02.png
new file mode 100755
index 0000000..cc2a119
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/02.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/02.txt b/core/test/data/blackbox/aztec-2/02.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/02.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/03.png b/core/test/data/blackbox/aztec-2/03.png
new file mode 100755
index 0000000..95415e0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/03.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/03.txt b/core/test/data/blackbox/aztec-2/03.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/03.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/04.png b/core/test/data/blackbox/aztec-2/04.png
new file mode 100755
index 0000000..2cc2073
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/04.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/04.txt b/core/test/data/blackbox/aztec-2/04.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/04.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/05.png b/core/test/data/blackbox/aztec-2/05.png
new file mode 100755
index 0000000..82f68d5
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/05.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/05.txt b/core/test/data/blackbox/aztec-2/05.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/05.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/06.png b/core/test/data/blackbox/aztec-2/06.png
new file mode 100755
index 0000000..f53b2fc
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/06.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/06.txt b/core/test/data/blackbox/aztec-2/06.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/06.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/07.png b/core/test/data/blackbox/aztec-2/07.png
new file mode 100755
index 0000000..e8dfe93
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/07.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/07.txt b/core/test/data/blackbox/aztec-2/07.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/07.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/08.png b/core/test/data/blackbox/aztec-2/08.png
new file mode 100755
index 0000000..e089a32
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/08.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/08.txt b/core/test/data/blackbox/aztec-2/08.txt
new file mode 100644
index 0000000..60a24c0
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/08.txt
@@ -0,0 +1 @@
+This is a real world Aztec barcode test.
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/09.png b/core/test/data/blackbox/aztec-2/09.png
new file mode 100755
index 0000000..086597d
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/09.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/09.txt b/core/test/data/blackbox/aztec-2/09.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/09.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/10.png b/core/test/data/blackbox/aztec-2/10.png
new file mode 100755
index 0000000..67286b2
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/10.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/10.txt b/core/test/data/blackbox/aztec-2/10.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/10.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/11.png b/core/test/data/blackbox/aztec-2/11.png
new file mode 100755
index 0000000..dd0c6c3
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/11.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/11.txt b/core/test/data/blackbox/aztec-2/11.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/11.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/12.png b/core/test/data/blackbox/aztec-2/12.png
new file mode 100755
index 0000000..9e3ab55
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/12.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/12.txt b/core/test/data/blackbox/aztec-2/12.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/12.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/13.png b/core/test/data/blackbox/aztec-2/13.png
new file mode 100755
index 0000000..a6dc7eb
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/13.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/13.txt b/core/test/data/blackbox/aztec-2/13.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/13.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/14.png b/core/test/data/blackbox/aztec-2/14.png
new file mode 100755
index 0000000..7c1b90a
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/14.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/14.txt b/core/test/data/blackbox/aztec-2/14.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/14.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/15.png b/core/test/data/blackbox/aztec-2/15.png
new file mode 100755
index 0000000..fcff11f
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/15.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/15.txt b/core/test/data/blackbox/aztec-2/15.txt
new file mode 100644
index 0000000..30afa17
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/15.txt
@@ -0,0 +1 @@
+mailto:zxing@googlegroups.com
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/16.png b/core/test/data/blackbox/aztec-2/16.png
new file mode 100755
index 0000000..005a0cc
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/16.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/16.txt b/core/test/data/blackbox/aztec-2/16.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/16.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/17.png b/core/test/data/blackbox/aztec-2/17.png
new file mode 100755
index 0000000..e94e64c
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/17.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/17.txt b/core/test/data/blackbox/aztec-2/17.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/17.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/18.png b/core/test/data/blackbox/aztec-2/18.png
new file mode 100755
index 0000000..252e358
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/18.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/18.txt b/core/test/data/blackbox/aztec-2/18.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/18.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/19.png b/core/test/data/blackbox/aztec-2/19.png
new file mode 100755
index 0000000..499ae3b
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/19.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/19.txt b/core/test/data/blackbox/aztec-2/19.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/19.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/20.png b/core/test/data/blackbox/aztec-2/20.png
new file mode 100755
index 0000000..7472931
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/20.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/20.txt b/core/test/data/blackbox/aztec-2/20.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/20.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/21.png b/core/test/data/blackbox/aztec-2/21.png
new file mode 100755
index 0000000..8313809
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/21.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/21.txt b/core/test/data/blackbox/aztec-2/21.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/21.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/data/blackbox/aztec-2/22.png b/core/test/data/blackbox/aztec-2/22.png
new file mode 100755
index 0000000..3a6e9f1
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/22.png
Binary files differ
diff --git a/core/test/data/blackbox/aztec-2/22.txt b/core/test/data/blackbox/aztec-2/22.txt
new file mode 100644
index 0000000..8399dfe
--- /dev/null
+++ b/core/test/data/blackbox/aztec-2/22.txt
@@ -0,0 +1 @@
+http://code.google.com/p/zxing/source/browse/trunk/android/src/com/google/zxing/client/android/result/URIResultHandler.java
\ No newline at end of file
diff --git a/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java b/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
index c4e98be..fc1d9b9 100644
--- a/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
+++ b/core/test/src/com/google/zxing/aztec/AztecBlackBox2TestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 ZXing authors
+ * Copyright 2011 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,16 +20,18 @@
import com.google.zxing.common.AbstractBlackBoxTestCase;
/**
- * @author David Olivier
+ * A test of Aztec barcodes under real world lighting conditions, taken with a mobile phone.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
*/
public final class AztecBlackBox2TestCase extends AbstractBlackBoxTestCase {
public AztecBlackBox2TestCase() {
super("test/data/blackbox/aztec-2", new AztecReader(), BarcodeFormat.AZTEC);
- addTest(1, 1, 0.0f);
- addTest(1, 1, 90.0f);
- addTest(1, 1, 180.0f);
+ addTest(2, 2, 0.0f);
+ addTest(2, 2, 90.0f);
+ addTest(3, 3, 180.0f);
addTest(1, 1, 270.0f);
}
-}
\ No newline at end of file
+}
diff --git a/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java b/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
index 8d0486b..159ad2c 100644
--- a/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
+++ b/core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
@@ -27,10 +27,10 @@
public FalsePositives2BlackBoxTestCase() {
super("test/data/blackbox/falsepositives-2");
- addTest(6, 0.0f);
- addTest(6, 90.0f);
- addTest(6, 180.0f);
- addTest(6, 270.0f);
+ addTest(7, 0.0f);
+ addTest(7, 90.0f);
+ addTest(7, 180.0f);
+ addTest(7, 270.0f);
}
}
