Final updates to use local test images rather than remote

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

diff --git a/core/test/data/blackbox/qrcode-2/1.png b/core/test/data/blackbox/qrcode-2/1.png
new file mode 100644 (file)
index 0000000..7455789
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/1.png differ

diff --git a/core/test/data/blackbox/qrcode-2/1.url b/core/test/data/blackbox/qrcode-2/1.url
deleted file mode 100644 (file)
index d607e52..0000000
--- a/core/test/data/blackbox/qrcode-2/1.url
+++ /dev/null
@@ -1 +0,0 @@
-http://writerresponsetheory.org/wordpress/wp-content/uploads/qrcode_01.png
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/10.gif b/core/test/data/blackbox/qrcode-2/10.gif
new file mode 100644 (file)
index 0000000..fdfc26c
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/10.gif differ

diff --git a/core/test/data/blackbox/qrcode-2/10.url b/core/test/data/blackbox/qrcode-2/10.url
deleted file mode 100644 (file)
index a59a083..0000000
--- a/core/test/data/blackbox/qrcode-2/10.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.google.co.jp/mobile/images/qrcode_mobile.gif
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/11.gif b/core/test/data/blackbox/qrcode-2/11.gif
new file mode 100644 (file)
index 0000000..215e423
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/11.gif differ

diff --git a/core/test/data/blackbox/qrcode-2/11.url b/core/test/data/blackbox/qrcode-2/11.url
deleted file mode 100644 (file)
index 5ea8885..0000000
--- a/core/test/data/blackbox/qrcode-2/11.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.d-co.de/images/qrcode_eg1.gif
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/2.png b/core/test/data/blackbox/qrcode-2/2.png
new file mode 100644 (file)
index 0000000..45177b8
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/2.png differ

diff --git a/core/test/data/blackbox/qrcode-2/2.url b/core/test/data/blackbox/qrcode-2/2.url
deleted file mode 100644 (file)
index b919825..0000000
--- a/core/test/data/blackbox/qrcode-2/2.url
+++ /dev/null
@@ -1 +0,0 @@
-http://writerresponsetheory.org/query/poe/qrcode%20outputs/qrcodegen-examples/chunk-from-128-bug-head/encodes-by-nfggames/qr-chunk-from-128-bughead-ground.png
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/4.jpg b/core/test/data/blackbox/qrcode-2/4.jpg
new file mode 100644 (file)
index 0000000..e2faf54
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/4.jpg differ

diff --git a/core/test/data/blackbox/qrcode-2/4.url b/core/test/data/blackbox/qrcode-2/4.url
deleted file mode 100644 (file)
index 5f39146..0000000
--- a/core/test/data/blackbox/qrcode-2/4.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.qrcodeblog.com/qr/0609/060902_qr_kawasaki_st02.jpg
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/5.jpg b/core/test/data/blackbox/qrcode-2/5.jpg
new file mode 100644 (file)
index 0000000..c51b6fd
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/5.jpg differ

diff --git a/core/test/data/blackbox/qrcode-2/5.url b/core/test/data/blackbox/qrcode-2/5.url
deleted file mode 100644 (file)
index 540863c..0000000
--- a/core/test/data/blackbox/qrcode-2/5.url
+++ /dev/null
@@ -1 +0,0 @@
-http://mobile.kaywa.com/files/images/2007/4/480/mob181_1175524511.jpg
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/6.jpg b/core/test/data/blackbox/qrcode-2/6.jpg
new file mode 100644 (file)
index 0000000..dfa0eeb
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/6.jpg differ

diff --git a/core/test/data/blackbox/qrcode-2/6.url b/core/test/data/blackbox/qrcode-2/6.url
deleted file mode 100644 (file)
index a6ee3dd..0000000
--- a/core/test/data/blackbox/qrcode-2/6.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.smoothplanet.com/files/images/2007/2/mob281_1170754866.jpg
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/7.gif b/core/test/data/blackbox/qrcode-2/7.gif
new file mode 100644 (file)
index 0000000..2c4fb74
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/7.gif differ

diff --git a/core/test/data/blackbox/qrcode-2/7.url b/core/test/data/blackbox/qrcode-2/7.url
deleted file mode 100644 (file)
index 2e0923b..0000000
--- a/core/test/data/blackbox/qrcode-2/7.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.mobileviews.com/blog/wp-content/uploads/2006/11/livebarcode.gif
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/8.gif b/core/test/data/blackbox/qrcode-2/8.gif
new file mode 100644 (file)
index 0000000..0f6577d
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/8.gif differ

diff --git a/core/test/data/blackbox/qrcode-2/8.url b/core/test/data/blackbox/qrcode-2/8.url
deleted file mode 100644 (file)
index 2b2d912..0000000
--- a/core/test/data/blackbox/qrcode-2/8.url
+++ /dev/null
@@ -1 +0,0 @@
-http://staticrooster.com/tshirts/qr_sm.gif
\ No newline at end of file

diff --git a/core/test/data/blackbox/qrcode-2/9.png b/core/test/data/blackbox/qrcode-2/9.png
new file mode 100644 (file)
index 0000000..d6b53e8
Binary files /dev/null and b/core/test/data/blackbox/qrcode-2/9.png differ

diff --git a/core/test/data/blackbox/qrcode-2/9.url b/core/test/data/blackbox/qrcode-2/9.url
deleted file mode 100644 (file)
index a861037..0000000
--- a/core/test/data/blackbox/qrcode-2/9.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.ihaveanidea.org/blogs/uploads/i/interactive/270.png
\ No newline at end of file

diff --git a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
index 1dedb91..396f5ed 100644 (file)
--- a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
+++ b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
@@ -35,7 +35,6 @@ import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.Hashtable;
 import java.util.Vector;
 
@@ -55,8 +54,7 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
     public boolean accept(File dir, String name) {
       String lowerCase = name.toLowerCase();
       return lowerCase.endsWith(".jpg") || lowerCase.endsWith(".jpeg") ||
-             lowerCase.endsWith(".gif") || lowerCase.endsWith(".png") ||
-             lowerCase.endsWith(".url");
+             lowerCase.endsWith(".gif") || lowerCase.endsWith(".png");
     }
   };
 
@@ -108,13 +106,7 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
     for (File testImage : imageFiles) {
       System.out.println("Starting " + testImage.getAbsolutePath());
 
-      BufferedImage image;
-      if (testImage.getName().endsWith(".url")) {
-        String urlString = readFileAsString(testImage);
-        image = ImageIO.read(new URL(urlString));
-      } else {
-        image = ImageIO.read(testImage);
-      }
+      BufferedImage image = ImageIO.read(testImage);
 
       String testImageFileName = testImage.getName();
       File expectedTextFile = new File(testBase,