Added 41 real world UPC-E tests. We need to improve regular decoding here: it gets 17/41, but try harder gets 28/41.

git-svn-id: https://zxing.googlecode.com/svn/trunk@508 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2025-02-02 05:41:08 -08:00 · 2008-07-09 21:37:09 +00:00 · 2008-07-09 21:37:09 +00:00 · 13cb307965
parent 936343b221
commit 13cb307965
83 changed files with 77 additions and 0 deletions
--- a/core/test/data/blackbox/upce-2/01.jpg
+++ b/core/test/data/blackbox/upce-2/01.jpg
--- a/core/test/data/blackbox/upce-2/01.txt
+++ b/core/test/data/blackbox/upce-2/01.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/02.jpg
+++ b/core/test/data/blackbox/upce-2/02.jpg
--- a/core/test/data/blackbox/upce-2/02.txt
+++ b/core/test/data/blackbox/upce-2/02.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/03.jpg
+++ b/core/test/data/blackbox/upce-2/03.jpg
--- a/core/test/data/blackbox/upce-2/03.txt
+++ b/core/test/data/blackbox/upce-2/03.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/04.jpg
+++ b/core/test/data/blackbox/upce-2/04.jpg
--- a/core/test/data/blackbox/upce-2/04.txt
+++ b/core/test/data/blackbox/upce-2/04.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/05.jpg
+++ b/core/test/data/blackbox/upce-2/05.jpg
--- a/core/test/data/blackbox/upce-2/05.txt
+++ b/core/test/data/blackbox/upce-2/05.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/06.jpg
+++ b/core/test/data/blackbox/upce-2/06.jpg
--- a/core/test/data/blackbox/upce-2/06.txt
+++ b/core/test/data/blackbox/upce-2/06.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/07.jpg
+++ b/core/test/data/blackbox/upce-2/07.jpg
--- a/core/test/data/blackbox/upce-2/07.txt
+++ b/core/test/data/blackbox/upce-2/07.txt
@ -0,0 +1 @@
+05096893
--- a/core/test/data/blackbox/upce-2/08.jpg
+++ b/core/test/data/blackbox/upce-2/08.jpg
--- a/core/test/data/blackbox/upce-2/08.txt
+++ b/core/test/data/blackbox/upce-2/08.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/09.jpg
+++ b/core/test/data/blackbox/upce-2/09.jpg
--- a/core/test/data/blackbox/upce-2/09.txt
+++ b/core/test/data/blackbox/upce-2/09.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/10.jpg
+++ b/core/test/data/blackbox/upce-2/10.jpg
--- a/core/test/data/blackbox/upce-2/10.txt
+++ b/core/test/data/blackbox/upce-2/10.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/11.jpg
+++ b/core/test/data/blackbox/upce-2/11.jpg
--- a/core/test/data/blackbox/upce-2/11.txt
+++ b/core/test/data/blackbox/upce-2/11.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/12.jpg
+++ b/core/test/data/blackbox/upce-2/12.jpg
--- a/core/test/data/blackbox/upce-2/12.txt
+++ b/core/test/data/blackbox/upce-2/12.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/13.jpg
+++ b/core/test/data/blackbox/upce-2/13.jpg
--- a/core/test/data/blackbox/upce-2/13.txt
+++ b/core/test/data/blackbox/upce-2/13.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/14.jpg
+++ b/core/test/data/blackbox/upce-2/14.jpg
--- a/core/test/data/blackbox/upce-2/14.txt
+++ b/core/test/data/blackbox/upce-2/14.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/15.jpg
+++ b/core/test/data/blackbox/upce-2/15.jpg
--- a/core/test/data/blackbox/upce-2/15.txt
+++ b/core/test/data/blackbox/upce-2/15.txt
@ -0,0 +1 @@
+04963406
--- a/core/test/data/blackbox/upce-2/16.jpg
+++ b/core/test/data/blackbox/upce-2/16.jpg
--- a/core/test/data/blackbox/upce-2/16.txt
+++ b/core/test/data/blackbox/upce-2/16.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/17.jpg
+++ b/core/test/data/blackbox/upce-2/17.jpg
--- a/core/test/data/blackbox/upce-2/17.txt
+++ b/core/test/data/blackbox/upce-2/17.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/18.jpg
+++ b/core/test/data/blackbox/upce-2/18.jpg
--- a/core/test/data/blackbox/upce-2/18.txt
+++ b/core/test/data/blackbox/upce-2/18.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/19.jpg
+++ b/core/test/data/blackbox/upce-2/19.jpg
--- a/core/test/data/blackbox/upce-2/19.txt
+++ b/core/test/data/blackbox/upce-2/19.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/20.jpg
+++ b/core/test/data/blackbox/upce-2/20.jpg
--- a/core/test/data/blackbox/upce-2/20.txt
+++ b/core/test/data/blackbox/upce-2/20.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/21.jpg
+++ b/core/test/data/blackbox/upce-2/21.jpg
--- a/core/test/data/blackbox/upce-2/21.txt
+++ b/core/test/data/blackbox/upce-2/21.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/22.jpg
+++ b/core/test/data/blackbox/upce-2/22.jpg
--- a/core/test/data/blackbox/upce-2/22.txt
+++ b/core/test/data/blackbox/upce-2/22.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/23.jpg
+++ b/core/test/data/blackbox/upce-2/23.jpg
--- a/core/test/data/blackbox/upce-2/23.txt
+++ b/core/test/data/blackbox/upce-2/23.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/24.jpg
+++ b/core/test/data/blackbox/upce-2/24.jpg
--- a/core/test/data/blackbox/upce-2/24.txt
+++ b/core/test/data/blackbox/upce-2/24.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/25.jpg
+++ b/core/test/data/blackbox/upce-2/25.jpg
--- a/core/test/data/blackbox/upce-2/25.txt
+++ b/core/test/data/blackbox/upce-2/25.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/26.jpg
+++ b/core/test/data/blackbox/upce-2/26.jpg
--- a/core/test/data/blackbox/upce-2/26.txt
+++ b/core/test/data/blackbox/upce-2/26.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/27.jpg
+++ b/core/test/data/blackbox/upce-2/27.jpg
--- a/core/test/data/blackbox/upce-2/27.txt
+++ b/core/test/data/blackbox/upce-2/27.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/28.jpg
+++ b/core/test/data/blackbox/upce-2/28.jpg
--- a/core/test/data/blackbox/upce-2/28.txt
+++ b/core/test/data/blackbox/upce-2/28.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/29.jpg
+++ b/core/test/data/blackbox/upce-2/29.jpg
--- a/core/test/data/blackbox/upce-2/29.txt
+++ b/core/test/data/blackbox/upce-2/29.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/30.jpg
+++ b/core/test/data/blackbox/upce-2/30.jpg
--- a/core/test/data/blackbox/upce-2/30.txt
+++ b/core/test/data/blackbox/upce-2/30.txt
@ -0,0 +1 @@
+04124498
--- a/core/test/data/blackbox/upce-2/31.jpg
+++ b/core/test/data/blackbox/upce-2/31.jpg
--- a/core/test/data/blackbox/upce-2/31.txt
+++ b/core/test/data/blackbox/upce-2/31.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/32.jpg
+++ b/core/test/data/blackbox/upce-2/32.jpg
--- a/core/test/data/blackbox/upce-2/32.txt
+++ b/core/test/data/blackbox/upce-2/32.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/33.jpg
+++ b/core/test/data/blackbox/upce-2/33.jpg
--- a/core/test/data/blackbox/upce-2/33.txt
+++ b/core/test/data/blackbox/upce-2/33.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/34.jpg
+++ b/core/test/data/blackbox/upce-2/34.jpg
--- a/core/test/data/blackbox/upce-2/34.txt
+++ b/core/test/data/blackbox/upce-2/34.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/35.jpg
+++ b/core/test/data/blackbox/upce-2/35.jpg
--- a/core/test/data/blackbox/upce-2/35.txt
+++ b/core/test/data/blackbox/upce-2/35.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/36.jpg
+++ b/core/test/data/blackbox/upce-2/36.jpg
--- a/core/test/data/blackbox/upce-2/36.txt
+++ b/core/test/data/blackbox/upce-2/36.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/37.jpg
+++ b/core/test/data/blackbox/upce-2/37.jpg
--- a/core/test/data/blackbox/upce-2/37.txt
+++ b/core/test/data/blackbox/upce-2/37.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/38.jpg
+++ b/core/test/data/blackbox/upce-2/38.jpg
--- a/core/test/data/blackbox/upce-2/38.txt
+++ b/core/test/data/blackbox/upce-2/38.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/39.jpg
+++ b/core/test/data/blackbox/upce-2/39.jpg
--- a/core/test/data/blackbox/upce-2/39.txt
+++ b/core/test/data/blackbox/upce-2/39.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/40.jpg
+++ b/core/test/data/blackbox/upce-2/40.jpg
--- a/core/test/data/blackbox/upce-2/40.txt
+++ b/core/test/data/blackbox/upce-2/40.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/data/blackbox/upce-2/41.jpg
+++ b/core/test/data/blackbox/upce-2/41.jpg
--- a/core/test/data/blackbox/upce-2/41.txt
+++ b/core/test/data/blackbox/upce-2/41.txt
@ -0,0 +1 @@
+01264904
--- a/core/test/src/com/google/zxing/oned/UPCEBlackBox2TestCase.java
+++ b/core/test/src/com/google/zxing/oned/UPCEBlackBox2TestCase.java
@ -0,0 +1,36 @@
+/*
+ * 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.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 UPCEBlackBox2TestCase extends AbstractBlackBoxTestCase {
+
+  public UPCEBlackBox2TestCase() {
+    super(new File("test/data/blackbox/upce-2"), new MultiFormatReader(), BarcodeFormat.UPC_E);
+    addTest(17, 28, 0.0f);
+    addTest(19, 28, 180.0f);
+  }
+
+}