Added 18 real world DataMatrix blackbox images, plus turned on rotation for the origi...

git-svn-id: http://zxing.googlecode.com/svn/trunk@815 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/test/data/blackbox/datamatrix-2/01.jpg b/core/test/data/blackbox/datamatrix-2/01.jpg
new file mode 100755 (executable)
index 0000000..fd74b45
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/01.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/01.txt b/core/test/data/blackbox/datamatrix-2/01.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/01.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/02.jpg b/core/test/data/blackbox/datamatrix-2/02.jpg
new file mode 100755 (executable)
index 0000000..06963ad
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/02.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/02.txt b/core/test/data/blackbox/datamatrix-2/02.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/02.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/03.jpg b/core/test/data/blackbox/datamatrix-2/03.jpg
new file mode 100755 (executable)
index 0000000..432f929
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/03.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/03.txt b/core/test/data/blackbox/datamatrix-2/03.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/03.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/04.jpg b/core/test/data/blackbox/datamatrix-2/04.jpg
new file mode 100755 (executable)
index 0000000..5c394c5
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/04.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/04.txt b/core/test/data/blackbox/datamatrix-2/04.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/04.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/05.jpg b/core/test/data/blackbox/datamatrix-2/05.jpg
new file mode 100755 (executable)
index 0000000..74f04c6
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/05.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/05.txt b/core/test/data/blackbox/datamatrix-2/05.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/05.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/06.jpg b/core/test/data/blackbox/datamatrix-2/06.jpg
new file mode 100755 (executable)
index 0000000..913a081
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/06.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/06.txt b/core/test/data/blackbox/datamatrix-2/06.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/06.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/07.jpg b/core/test/data/blackbox/datamatrix-2/07.jpg
new file mode 100755 (executable)
index 0000000..250d1a3
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/07.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/07.txt b/core/test/data/blackbox/datamatrix-2/07.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/07.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/08.jpg b/core/test/data/blackbox/datamatrix-2/08.jpg
new file mode 100755 (executable)
index 0000000..ea3397a
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/08.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/08.txt b/core/test/data/blackbox/datamatrix-2/08.txt
new file mode 100644 (file)
index 0000000..f86d0df
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/08.txt
@@ -0,0 +1 @@
+http://google.com/m
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/09.jpg b/core/test/data/blackbox/datamatrix-2/09.jpg
new file mode 100755 (executable)
index 0000000..dc7b655
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/09.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/09.txt b/core/test/data/blackbox/datamatrix-2/09.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/09.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/10.jpg b/core/test/data/blackbox/datamatrix-2/10.jpg
new file mode 100755 (executable)
index 0000000..fb20318
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/10.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/10.txt b/core/test/data/blackbox/datamatrix-2/10.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/10.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/11.jpg b/core/test/data/blackbox/datamatrix-2/11.jpg
new file mode 100755 (executable)
index 0000000..5b412cd
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/11.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/11.txt b/core/test/data/blackbox/datamatrix-2/11.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/11.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/12.jpg b/core/test/data/blackbox/datamatrix-2/12.jpg
new file mode 100755 (executable)
index 0000000..bb6ee9c
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/12.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/12.txt b/core/test/data/blackbox/datamatrix-2/12.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/12.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/13.jpg b/core/test/data/blackbox/datamatrix-2/13.jpg
new file mode 100755 (executable)
index 0000000..7da7666
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/13.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/13.txt b/core/test/data/blackbox/datamatrix-2/13.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/13.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/14.jpg b/core/test/data/blackbox/datamatrix-2/14.jpg
new file mode 100755 (executable)
index 0000000..30cd328
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/14.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/14.txt b/core/test/data/blackbox/datamatrix-2/14.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/14.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/15.jpg b/core/test/data/blackbox/datamatrix-2/15.jpg
new file mode 100755 (executable)
index 0000000..7220e06
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/15.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/15.txt b/core/test/data/blackbox/datamatrix-2/15.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/15.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/16.jpg b/core/test/data/blackbox/datamatrix-2/16.jpg
new file mode 100755 (executable)
index 0000000..840a820
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/16.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/16.txt b/core/test/data/blackbox/datamatrix-2/16.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/16.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/17.jpg b/core/test/data/blackbox/datamatrix-2/17.jpg
new file mode 100755 (executable)
index 0000000..12d0ba2
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/17.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/17.txt b/core/test/data/blackbox/datamatrix-2/17.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/17.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/data/blackbox/datamatrix-2/18.jpg b/core/test/data/blackbox/datamatrix-2/18.jpg
new file mode 100755 (executable)
index 0000000..c1faba7
Binary files /dev/null and b/core/test/data/blackbox/datamatrix-2/18.jpg differ

diff --git a/core/test/data/blackbox/datamatrix-2/18.txt b/core/test/data/blackbox/datamatrix-2/18.txt
new file mode 100644 (file)
index 0000000..a8ae2d5
--- /dev/null
+++ b/core/test/data/blackbox/datamatrix-2/18.txt
@@ -0,0 +1 @@
+This is a test of our DataMatrix support using a longer piece of text, and therefore a more dense barcode.
\ No newline at end of file

diff --git a/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
index 2214374..dd82994 100644 (file)
--- a/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
@@ -31,6 +31,9 @@ public final class DataMatrixBlackBox1TestCase extends AbstractBlackBoxTestCase
     // TODO use MultiFormatReader here once Data Matrix decoder is done
     super(new File("test/data/blackbox/datamatrix-1"), new DataMatrixReader(), BarcodeFormat.DATAMATRIX);
     addTest(7, 7, 0.0f);
+    addTest(7, 7, 90.0f);
+    addTest(6, 6, 180.0f);
+    addTest(4, 4, 270.0f);
   }
 
 }
\ No newline at end of file

diff --git a/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox2TestCase.java b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox2TestCase.java
new file mode 100644 (file)
index 0000000..be943ca
--- /dev/null
+++ b/core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox2TestCase.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.datamatrix;
+
+//import com.google.zxing.MultiFormatReader;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.common.AbstractBlackBoxTestCase;
+
+import java.io.File;
+
+/**
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class DataMatrixBlackBox2TestCase extends AbstractBlackBoxTestCase {
+
+  public DataMatrixBlackBox2TestCase() {
+    // TODO use MultiFormatReader here once Data Matrix decoder is done
+    super(new File("test/data/blackbox/datamatrix-2"), new DataMatrixReader(), BarcodeFormat.DATAMATRIX);
+    addTest(3, 3, 0.0f);
+    addTest(1, 1, 90.0f);
+    addTest(3, 3, 180.0f);
+    addTest(4, 4, 270.0f);
+  }
+
+}