diff --git a/core/test/data/blackbox/upca-5/01.png b/core/test/data/blackbox/upca-5/01.png new file mode 100755 index 000000000..57dabda86 Binary files /dev/null and b/core/test/data/blackbox/upca-5/01.png differ diff --git a/core/test/data/blackbox/upca-5/01.txt b/core/test/data/blackbox/upca-5/01.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/01.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/02.png b/core/test/data/blackbox/upca-5/02.png new file mode 100755 index 000000000..e52eb8ae6 Binary files /dev/null and b/core/test/data/blackbox/upca-5/02.png differ diff --git a/core/test/data/blackbox/upca-5/02.txt b/core/test/data/blackbox/upca-5/02.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/02.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/03.png b/core/test/data/blackbox/upca-5/03.png new file mode 100755 index 000000000..44d30c961 Binary files /dev/null and b/core/test/data/blackbox/upca-5/03.png differ diff --git a/core/test/data/blackbox/upca-5/03.txt b/core/test/data/blackbox/upca-5/03.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/03.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/04.png b/core/test/data/blackbox/upca-5/04.png new file mode 100755 index 000000000..2d29b9760 Binary files /dev/null and b/core/test/data/blackbox/upca-5/04.png differ diff --git a/core/test/data/blackbox/upca-5/04.txt b/core/test/data/blackbox/upca-5/04.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/04.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/05.png b/core/test/data/blackbox/upca-5/05.png new file mode 100755 index 000000000..1e09457d5 Binary files /dev/null and b/core/test/data/blackbox/upca-5/05.png differ diff --git a/core/test/data/blackbox/upca-5/05.txt b/core/test/data/blackbox/upca-5/05.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/05.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/06.png b/core/test/data/blackbox/upca-5/06.png new file mode 100755 index 000000000..2e122caf5 Binary files /dev/null and b/core/test/data/blackbox/upca-5/06.png differ diff --git a/core/test/data/blackbox/upca-5/06.txt b/core/test/data/blackbox/upca-5/06.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/06.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/07.png b/core/test/data/blackbox/upca-5/07.png new file mode 100755 index 000000000..29c68a477 Binary files /dev/null and b/core/test/data/blackbox/upca-5/07.png differ diff --git a/core/test/data/blackbox/upca-5/07.txt b/core/test/data/blackbox/upca-5/07.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/07.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/08.png b/core/test/data/blackbox/upca-5/08.png new file mode 100755 index 000000000..28e288c7e Binary files /dev/null and b/core/test/data/blackbox/upca-5/08.png differ diff --git a/core/test/data/blackbox/upca-5/08.txt b/core/test/data/blackbox/upca-5/08.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/08.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/09.png b/core/test/data/blackbox/upca-5/09.png new file mode 100755 index 000000000..f9556229a Binary files /dev/null and b/core/test/data/blackbox/upca-5/09.png differ diff --git a/core/test/data/blackbox/upca-5/09.txt b/core/test/data/blackbox/upca-5/09.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/09.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/10.png b/core/test/data/blackbox/upca-5/10.png new file mode 100755 index 000000000..5cf731a33 Binary files /dev/null and b/core/test/data/blackbox/upca-5/10.png differ diff --git a/core/test/data/blackbox/upca-5/10.txt b/core/test/data/blackbox/upca-5/10.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/10.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/11.png b/core/test/data/blackbox/upca-5/11.png new file mode 100755 index 000000000..16ace4112 Binary files /dev/null and b/core/test/data/blackbox/upca-5/11.png differ diff --git a/core/test/data/blackbox/upca-5/11.txt b/core/test/data/blackbox/upca-5/11.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/11.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/12.png b/core/test/data/blackbox/upca-5/12.png new file mode 100755 index 000000000..55ba92dee Binary files /dev/null and b/core/test/data/blackbox/upca-5/12.png differ diff --git a/core/test/data/blackbox/upca-5/12.txt b/core/test/data/blackbox/upca-5/12.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/12.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/13.png b/core/test/data/blackbox/upca-5/13.png new file mode 100755 index 000000000..93585bfed Binary files /dev/null and b/core/test/data/blackbox/upca-5/13.png differ diff --git a/core/test/data/blackbox/upca-5/13.txt b/core/test/data/blackbox/upca-5/13.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/13.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/14.png b/core/test/data/blackbox/upca-5/14.png new file mode 100755 index 000000000..87d09528d Binary files /dev/null and b/core/test/data/blackbox/upca-5/14.png differ diff --git a/core/test/data/blackbox/upca-5/14.txt b/core/test/data/blackbox/upca-5/14.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/14.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/15.png b/core/test/data/blackbox/upca-5/15.png new file mode 100755 index 000000000..af635fdf4 Binary files /dev/null and b/core/test/data/blackbox/upca-5/15.png differ diff --git a/core/test/data/blackbox/upca-5/15.txt b/core/test/data/blackbox/upca-5/15.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/15.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/16.png b/core/test/data/blackbox/upca-5/16.png new file mode 100755 index 000000000..732736041 Binary files /dev/null and b/core/test/data/blackbox/upca-5/16.png differ diff --git a/core/test/data/blackbox/upca-5/16.txt b/core/test/data/blackbox/upca-5/16.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/16.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/17.png b/core/test/data/blackbox/upca-5/17.png new file mode 100755 index 000000000..d6e7caf3f Binary files /dev/null and b/core/test/data/blackbox/upca-5/17.png differ diff --git a/core/test/data/blackbox/upca-5/17.txt b/core/test/data/blackbox/upca-5/17.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/17.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/18.png b/core/test/data/blackbox/upca-5/18.png new file mode 100755 index 000000000..08ebfcc29 Binary files /dev/null and b/core/test/data/blackbox/upca-5/18.png differ diff --git a/core/test/data/blackbox/upca-5/18.txt b/core/test/data/blackbox/upca-5/18.txt new file mode 100644 index 000000000..108f62301 --- /dev/null +++ b/core/test/data/blackbox/upca-5/18.txt @@ -0,0 +1 @@ +312547701310 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/19.png b/core/test/data/blackbox/upca-5/19.png new file mode 100755 index 000000000..5ec69a0ec Binary files /dev/null and b/core/test/data/blackbox/upca-5/19.png differ diff --git a/core/test/data/blackbox/upca-5/19.txt b/core/test/data/blackbox/upca-5/19.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/19.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/20.png b/core/test/data/blackbox/upca-5/20.png new file mode 100755 index 000000000..8fd59639c Binary files /dev/null and b/core/test/data/blackbox/upca-5/20.png differ diff --git a/core/test/data/blackbox/upca-5/20.txt b/core/test/data/blackbox/upca-5/20.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/20.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/21.png b/core/test/data/blackbox/upca-5/21.png new file mode 100755 index 000000000..da60da995 Binary files /dev/null and b/core/test/data/blackbox/upca-5/21.png differ diff --git a/core/test/data/blackbox/upca-5/21.txt b/core/test/data/blackbox/upca-5/21.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/21.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/22.png b/core/test/data/blackbox/upca-5/22.png new file mode 100755 index 000000000..2e5787c51 Binary files /dev/null and b/core/test/data/blackbox/upca-5/22.png differ diff --git a/core/test/data/blackbox/upca-5/22.txt b/core/test/data/blackbox/upca-5/22.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/22.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/23.png b/core/test/data/blackbox/upca-5/23.png new file mode 100755 index 000000000..f50bf520d Binary files /dev/null and b/core/test/data/blackbox/upca-5/23.png differ diff --git a/core/test/data/blackbox/upca-5/23.txt b/core/test/data/blackbox/upca-5/23.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/23.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/24.png b/core/test/data/blackbox/upca-5/24.png new file mode 100755 index 000000000..4a6d56e18 Binary files /dev/null and b/core/test/data/blackbox/upca-5/24.png differ diff --git a/core/test/data/blackbox/upca-5/24.txt b/core/test/data/blackbox/upca-5/24.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/24.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/25.png b/core/test/data/blackbox/upca-5/25.png new file mode 100755 index 000000000..60e8464a6 Binary files /dev/null and b/core/test/data/blackbox/upca-5/25.png differ diff --git a/core/test/data/blackbox/upca-5/25.txt b/core/test/data/blackbox/upca-5/25.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/25.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/26.png b/core/test/data/blackbox/upca-5/26.png new file mode 100755 index 000000000..63d94a650 Binary files /dev/null and b/core/test/data/blackbox/upca-5/26.png differ diff --git a/core/test/data/blackbox/upca-5/26.txt b/core/test/data/blackbox/upca-5/26.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/26.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/27.png b/core/test/data/blackbox/upca-5/27.png new file mode 100755 index 000000000..f928b292b Binary files /dev/null and b/core/test/data/blackbox/upca-5/27.png differ diff --git a/core/test/data/blackbox/upca-5/27.txt b/core/test/data/blackbox/upca-5/27.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/27.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/28.png b/core/test/data/blackbox/upca-5/28.png new file mode 100755 index 000000000..bc97fea02 Binary files /dev/null and b/core/test/data/blackbox/upca-5/28.png differ diff --git a/core/test/data/blackbox/upca-5/28.txt b/core/test/data/blackbox/upca-5/28.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/28.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/29.png b/core/test/data/blackbox/upca-5/29.png new file mode 100755 index 000000000..bdd032c5e Binary files /dev/null and b/core/test/data/blackbox/upca-5/29.png differ diff --git a/core/test/data/blackbox/upca-5/29.txt b/core/test/data/blackbox/upca-5/29.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/29.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/30.png b/core/test/data/blackbox/upca-5/30.png new file mode 100755 index 000000000..25246aa05 Binary files /dev/null and b/core/test/data/blackbox/upca-5/30.png differ diff --git a/core/test/data/blackbox/upca-5/30.txt b/core/test/data/blackbox/upca-5/30.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/30.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/31.png b/core/test/data/blackbox/upca-5/31.png new file mode 100755 index 000000000..5b5abd240 Binary files /dev/null and b/core/test/data/blackbox/upca-5/31.png differ diff --git a/core/test/data/blackbox/upca-5/31.txt b/core/test/data/blackbox/upca-5/31.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/31.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/32.png b/core/test/data/blackbox/upca-5/32.png new file mode 100755 index 000000000..0467409d1 Binary files /dev/null and b/core/test/data/blackbox/upca-5/32.png differ diff --git a/core/test/data/blackbox/upca-5/32.txt b/core/test/data/blackbox/upca-5/32.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/32.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/33.png b/core/test/data/blackbox/upca-5/33.png new file mode 100755 index 000000000..bfd049979 Binary files /dev/null and b/core/test/data/blackbox/upca-5/33.png differ diff --git a/core/test/data/blackbox/upca-5/33.txt b/core/test/data/blackbox/upca-5/33.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/33.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/34.png b/core/test/data/blackbox/upca-5/34.png new file mode 100755 index 000000000..33f5579de Binary files /dev/null and b/core/test/data/blackbox/upca-5/34.png differ diff --git a/core/test/data/blackbox/upca-5/34.txt b/core/test/data/blackbox/upca-5/34.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/34.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/data/blackbox/upca-5/35.png b/core/test/data/blackbox/upca-5/35.png new file mode 100755 index 000000000..19b41b124 Binary files /dev/null and b/core/test/data/blackbox/upca-5/35.png differ diff --git a/core/test/data/blackbox/upca-5/35.txt b/core/test/data/blackbox/upca-5/35.txt new file mode 100644 index 000000000..5546cb726 --- /dev/null +++ b/core/test/data/blackbox/upca-5/35.txt @@ -0,0 +1 @@ +625034201058 \ No newline at end of file diff --git a/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java b/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java index 401a0fb86..60eb71a0e 100644 --- a/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java +++ b/core/test/src/com/google/zxing/AllPositiveBlackBoxTester.java @@ -36,6 +36,7 @@ import com.google.zxing.oned.UPCABlackBox1TestCase; import com.google.zxing.oned.UPCABlackBox2TestCase; import com.google.zxing.oned.UPCABlackBox3ReflectiveTestCase; import com.google.zxing.oned.UPCABlackBox4TestCase; +import com.google.zxing.oned.UPCABlackBox5TestCase; import com.google.zxing.oned.UPCEBlackBox1TestCase; import com.google.zxing.oned.UPCEBlackBox2TestCase; import com.google.zxing.oned.UPCEBlackBox3ReflectiveTestCase; @@ -80,6 +81,7 @@ public final class AllPositiveBlackBoxTester { new UPCABlackBox2TestCase(), new UPCABlackBox3ReflectiveTestCase(), new UPCABlackBox4TestCase(), + new UPCABlackBox5TestCase(), new UPCEBlackBox1TestCase(), new UPCEBlackBox2TestCase(), new UPCEBlackBox3ReflectiveTestCase(), @@ -115,6 +117,7 @@ public final class AllPositiveBlackBoxTester { // new UPCABlackBox2TestCase(), // new UPCABlackBox3ReflectiveTestCase(), // new UPCABlackBox4TestCase(), +// new UPCABlackBox5TestCase(), // new UPCEBlackBox1TestCase(), // new UPCEBlackBox2TestCase(), // new UPCEBlackBox3ReflectiveTestCase(), diff --git a/core/test/src/com/google/zxing/oned/UPCABlackBox5TestCase.java b/core/test/src/com/google/zxing/oned/UPCABlackBox5TestCase.java new file mode 100644 index 000000000..8e689cea0 --- /dev/null +++ b/core/test/src/com/google/zxing/oned/UPCABlackBox5TestCase.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 UPCABlackBox5TestCase extends AbstractBlackBoxTestCase { + + public UPCABlackBox5TestCase() { + super("test/data/blackbox/upca-5", new MultiFormatReader(), BarcodeFormat.UPC_A); + addTest(19, 22, 0.0f); + addTest(21, 22, 180.0f); + } + +}