From: dswitkin Date: Mon, 9 Mar 2009 20:48:48 +0000 (+0000) Subject: - Added a new unit test of 13 ITF images I took with a T-Mobile G1. X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=0b052642ea2b8bc587a900435cc41a287d7319fa - Added a new unit test of 13 ITF images I took with a T-Mobile G1. - Added upside down unit tests for the existing ITF images. - Removed the temporary format code from these tests now that ITF is on by default. git-svn-id: http://zxing.googlecode.com/svn/trunk@883 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/core/test/data/blackbox/itf-2/01.jpg b/core/test/data/blackbox/itf-2/01.jpg new file mode 100755 index 00000000..c1161d07 Binary files /dev/null and b/core/test/data/blackbox/itf-2/01.jpg differ diff --git a/core/test/data/blackbox/itf-2/01.txt b/core/test/data/blackbox/itf-2/01.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/01.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/02.jpg b/core/test/data/blackbox/itf-2/02.jpg new file mode 100755 index 00000000..c092b7e9 Binary files /dev/null and b/core/test/data/blackbox/itf-2/02.jpg differ diff --git a/core/test/data/blackbox/itf-2/02.txt b/core/test/data/blackbox/itf-2/02.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/02.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/03.jpg b/core/test/data/blackbox/itf-2/03.jpg new file mode 100755 index 00000000..c4c03f9c Binary files /dev/null and b/core/test/data/blackbox/itf-2/03.jpg differ diff --git a/core/test/data/blackbox/itf-2/03.txt b/core/test/data/blackbox/itf-2/03.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/03.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/04.jpg b/core/test/data/blackbox/itf-2/04.jpg new file mode 100755 index 00000000..2e46ce12 Binary files /dev/null and b/core/test/data/blackbox/itf-2/04.jpg differ diff --git a/core/test/data/blackbox/itf-2/04.txt b/core/test/data/blackbox/itf-2/04.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/04.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/05.jpg b/core/test/data/blackbox/itf-2/05.jpg new file mode 100755 index 00000000..de16bd98 Binary files /dev/null and b/core/test/data/blackbox/itf-2/05.jpg differ diff --git a/core/test/data/blackbox/itf-2/05.txt b/core/test/data/blackbox/itf-2/05.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/05.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/06.jpg b/core/test/data/blackbox/itf-2/06.jpg new file mode 100755 index 00000000..9a6113da Binary files /dev/null and b/core/test/data/blackbox/itf-2/06.jpg differ diff --git a/core/test/data/blackbox/itf-2/06.txt b/core/test/data/blackbox/itf-2/06.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/06.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/07.jpg b/core/test/data/blackbox/itf-2/07.jpg new file mode 100755 index 00000000..4727c79b Binary files /dev/null and b/core/test/data/blackbox/itf-2/07.jpg differ diff --git a/core/test/data/blackbox/itf-2/07.txt b/core/test/data/blackbox/itf-2/07.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/07.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/08.jpg b/core/test/data/blackbox/itf-2/08.jpg new file mode 100755 index 00000000..e33d6375 Binary files /dev/null and b/core/test/data/blackbox/itf-2/08.jpg differ diff --git a/core/test/data/blackbox/itf-2/08.txt b/core/test/data/blackbox/itf-2/08.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/08.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/09.jpg b/core/test/data/blackbox/itf-2/09.jpg new file mode 100755 index 00000000..7b4aa476 Binary files /dev/null and b/core/test/data/blackbox/itf-2/09.jpg differ diff --git a/core/test/data/blackbox/itf-2/09.txt b/core/test/data/blackbox/itf-2/09.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/09.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/10.jpg b/core/test/data/blackbox/itf-2/10.jpg new file mode 100755 index 00000000..74ca3b52 Binary files /dev/null and b/core/test/data/blackbox/itf-2/10.jpg differ diff --git a/core/test/data/blackbox/itf-2/10.txt b/core/test/data/blackbox/itf-2/10.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/10.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/11.jpg b/core/test/data/blackbox/itf-2/11.jpg new file mode 100755 index 00000000..64f6c016 Binary files /dev/null and b/core/test/data/blackbox/itf-2/11.jpg differ diff --git a/core/test/data/blackbox/itf-2/11.txt b/core/test/data/blackbox/itf-2/11.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/11.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/12.jpg b/core/test/data/blackbox/itf-2/12.jpg new file mode 100755 index 00000000..4c32edf4 Binary files /dev/null and b/core/test/data/blackbox/itf-2/12.jpg differ diff --git a/core/test/data/blackbox/itf-2/12.txt b/core/test/data/blackbox/itf-2/12.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/12.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/data/blackbox/itf-2/13.jpg b/core/test/data/blackbox/itf-2/13.jpg new file mode 100755 index 00000000..caa0600d Binary files /dev/null and b/core/test/data/blackbox/itf-2/13.jpg differ diff --git a/core/test/data/blackbox/itf-2/13.txt b/core/test/data/blackbox/itf-2/13.txt new file mode 100644 index 00000000..a8fb53df --- /dev/null +++ b/core/test/data/blackbox/itf-2/13.txt @@ -0,0 +1 @@ +070429 \ No newline at end of file diff --git a/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java b/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java index 28d81f03..ad488dc6 100644 --- a/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java +++ b/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java @@ -17,13 +17,9 @@ package com.google.zxing.oned; import com.google.zxing.BarcodeFormat; -import com.google.zxing.DecodeHintType; import com.google.zxing.MultiFormatReader; import com.google.zxing.common.AbstractBlackBoxTestCase; -import java.util.Hashtable; -import java.util.Vector; - /** * @author kevin.osullivan@sita.aero */ @@ -32,27 +28,7 @@ public final class ITFBlackBox1TestCase extends AbstractBlackBoxTestCase { public ITFBlackBox1TestCase() { super("test/data/blackbox/itf-1", new MultiFormatReader(), BarcodeFormat.ITF); addTest(9, 12, 0.0f); - } - - // TODO(dswitkin): This is only used for the mean time because ITF is not turned on by default. - // The other formats are included here to make sure we don't recognize an ITF barcode as something - // else. Unfortunately this list is fragile. The right thing to do is profile ITF for performance, - // and if it doesn't impose significant overhead, turn it on by default. Then this method can be - // removed completely. - @Override - protected Hashtable getHints() { - Hashtable hints = new Hashtable(3); - Vector vector = new Vector(); - vector.addElement(BarcodeFormat.UPC_A); - vector.addElement(BarcodeFormat.UPC_E); - vector.addElement(BarcodeFormat.EAN_13); - vector.addElement(BarcodeFormat.EAN_8); - vector.addElement(BarcodeFormat.CODE_39); - vector.addElement(BarcodeFormat.CODE_128); - vector.addElement(BarcodeFormat.ITF); - vector.addElement(BarcodeFormat.QR_CODE); - hints.put(DecodeHintType.POSSIBLE_FORMATS, vector); - return hints; + addTest(8, 12, 180.0f); } } diff --git a/core/test/src/com/google/zxing/oned/ITFBlackBox2TestCase.java b/core/test/src/com/google/zxing/oned/ITFBlackBox2TestCase.java new file mode 100644 index 00000000..72f321c6 --- /dev/null +++ b/core/test/src/com/google/zxing/oned/ITFBlackBox2TestCase.java @@ -0,0 +1,34 @@ +/* + * 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.oned; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.MultiFormatReader; +import com.google.zxing.common.AbstractBlackBoxTestCase; + +/** + * @author dswitkin@google.com (Daniel Switkin) + */ +public final class ITFBlackBox2TestCase extends AbstractBlackBoxTestCase { + + public ITFBlackBox2TestCase() { + super("test/data/blackbox/itf-2", new MultiFormatReader(), BarcodeFormat.ITF); + addTest(8, 9, 0.0f); + addTest(8, 9, 180.0f); + } + +}