From fa5c84a0cf12759beeab77d4ed8f802b84d3b759 Mon Sep 17 00:00:00 2001 From: srowen Date: Sat, 13 Aug 2011 16:58:32 +0000 Subject: [PATCH] Let RSS tests succeed even when run from project root git-svn-id: https://zxing.googlecode.com/svn/trunk@1883 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../RSSExpandedImage2binaryTestCase.java | 8 ++++- .../RSSExpandedImage2resultTestCase.java | 8 ++++- .../RSSExpandedImage2stringTestCase.java | 8 ++++- .../expanded/RSSExpandedInternalTestCase.java | 32 ++++++++++++++++--- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java index 6372fb8f6..e47106d7c 100644 --- a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java +++ b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java @@ -224,7 +224,13 @@ public final class RSSExpandedImage2binaryTestCase extends Assert { private static void assertCorrectImage2binary(String path, String expected) throws IOException, NotFoundException { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); int rowNumber = binaryMap.getHeight() / 2; BitArray row = binaryMap.getBlackRow(rowNumber, null); diff --git a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java index 83fe79cb9..33ebfd49a 100644 --- a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java +++ b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java @@ -72,7 +72,13 @@ public final class RSSExpandedImage2resultTestCase extends Assert { throws IOException, NotFoundException { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); int rowNumber = binaryMap.getHeight() / 2; BitArray row = binaryMap.getBlackRow(rowNumber, null); diff --git a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java index 16762b07b..ffb94cd37 100644 --- a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java +++ b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java @@ -268,7 +268,13 @@ public final class RSSExpandedImage2stringTestCase extends Assert { private static void assertCorrectImage2string(String path, String expected) throws IOException, NotFoundException { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); int rowNumber = binaryMap.getHeight() / 2; BitArray row = binaryMap.getBlackRow(rowNumber, null); diff --git a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java index 774f6aaf6..04d735059 100644 --- a/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java +++ b/core/test/src/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java @@ -54,7 +54,13 @@ public final class RSSExpandedInternalTestCase extends Assert { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); String path = "test/data/blackbox/rssexpanded-1/2.jpg"; - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); int rowNumber = binaryMap.getHeight() / 2; BitArray row = binaryMap.getBlackRow(rowNumber, null); @@ -89,7 +95,13 @@ public final class RSSExpandedInternalTestCase extends Assert { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); String path = "test/data/blackbox/rssexpanded-1/3.jpg"; - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); int rowNumber = binaryMap.getHeight() / 2; BitArray row = binaryMap.getBlackRow(rowNumber, null); @@ -111,7 +123,13 @@ public final class RSSExpandedInternalTestCase extends Assert { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); String path = "test/data/blackbox/rssexpanded-1/3.jpg"; - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); BitArray row = binaryMap.getBlackRow(binaryMap.getHeight() / 2, null); @@ -129,7 +147,13 @@ public final class RSSExpandedInternalTestCase extends Assert { RSSExpandedReader rssExpandedReader = new RSSExpandedReader(); String path = "test/data/blackbox/rssexpanded-1/3.jpg"; - BufferedImage image = ImageIO.read(new File(path)); + File file = new File(path); + if (!file.exists()) { + // Support running from project root too + file = new File("core", path); + } + + BufferedImage image = ImageIO.read(file); BinaryBitmap binaryMap = new BinaryBitmap(new GlobalHistogramBinarizer(new BufferedImageLuminanceSource(image))); BitArray row = binaryMap.getBlackRow(binaryMap.getHeight() / 2, null);