X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fcommon%2FAbstractBlackBoxTestCase.java;h=2ef12b43dda2e70a5b990fc345b97a2920d57f37;hb=608fe313d82bb79f0f5a96856697bdfb4a6305d3;hp=44a7af71ec674252d42639e439467bb15c8c5ae8;hpb=b7ccbb32d993009d7d4f023f7306dccf28dd0f7d;p=zxing.git diff --git a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java index 44a7af71..2ef12b43 100644 --- a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java +++ b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 Google Inc. + * 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. @@ -17,15 +17,16 @@ package com.google.zxing.common; import com.google.zxing.BarcodeFormat; +import com.google.zxing.BinaryBitmap; import com.google.zxing.DecodeHintType; -import com.google.zxing.MonochromeBitmapSource; +import com.google.zxing.LuminanceSource; import com.google.zxing.Reader; import com.google.zxing.ReaderException; import com.google.zxing.Result; -import com.google.zxing.client.j2se.BufferedImageMonochromeBitmapSource; +import com.google.zxing.client.j2se.BufferedImageLuminanceSource; + import junit.framework.TestCase; -import javax.imageio.ImageIO; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; @@ -35,11 +36,15 @@ import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Hashtable; -import java.util.Vector; +import java.util.List; + +import javax.imageio.ImageIO; /** - * @author srowen@google.com (Sean Owen) + * @author Sean Owen * @author dswitkin@google.com (Daniel Switkin) */ public abstract class AbstractBlackBoxTestCase extends TestCase { @@ -58,16 +63,51 @@ public abstract class AbstractBlackBoxTestCase extends TestCase { } }; + public static class SummaryResults { + private int totalFound; + private int totalMustPass; + private int totalTests; + + public SummaryResults() { + totalFound = 0; + totalMustPass = 0; + totalTests = 0; + } + + public SummaryResults(int found, int mustPass, int total) { + totalFound = found; + totalMustPass = mustPass; + totalTests = total; + } + + public void add(SummaryResults other) { + totalFound += other.totalFound; + totalMustPass += other.totalMustPass; + totalTests += other.totalTests; + } + + public String toString() { + return "\nSUMMARY RESULTS:\n Decoded " + totalFound + " images out of " + totalTests + + " (" + (totalFound * 100 / totalTests) + "%, " + totalMustPass + " required)"; + } + } + private static class TestResult { private final int mustPassCount; + private final int tryHarderCount; private final float rotation; - TestResult(int mustPassCount, float rotation) { + + TestResult(int mustPassCount, int tryHarderCount, float rotation) { this.mustPassCount = mustPassCount; + this.tryHarderCount = tryHarderCount; this.rotation = rotation; } public int getMustPassCount() { return mustPassCount; } + public int getTryHarderCount() { + return tryHarderCount; + } public float getRotation() { return rotation; } @@ -76,25 +116,32 @@ public abstract class AbstractBlackBoxTestCase extends TestCase { private final File testBase; private final Reader barcodeReader; private final BarcodeFormat expectedFormat; - private Vector testResults; + private final List testResults; - protected AbstractBlackBoxTestCase(File testBase, + protected AbstractBlackBoxTestCase(String testBasePathSuffix, Reader barcodeReader, BarcodeFormat expectedFormat) { + // A little workaround to prevent aggravation in my IDE + File testBase = new File(testBasePathSuffix); + if (!testBase.exists()) { + // try starting with 'core' since the test base is often given as the project root + testBase = new File("core/" + testBasePathSuffix); + } this.testBase = testBase; this.barcodeReader = barcodeReader; this.expectedFormat = expectedFormat; - testResults = new Vector(); + testResults = new ArrayList(); } /** * Adds a new test for the current directory of images. * * @param mustPassCount The number of images which must decode for the test to pass. + * @param tryHarderCount The number of images which must pass using the try harder flag. * @param rotation The rotation in degrees clockwise to use for this test. */ - protected void addTest(int mustPassCount, float rotation) { - testResults.add(new TestResult(mustPassCount, rotation)); + protected void addTest(int mustPassCount, int tryHarderCount, float rotation) { + testResults.add(new TestResult(mustPassCount, tryHarderCount, rotation)); } protected File[] getImageFiles() { @@ -106,11 +153,23 @@ public abstract class AbstractBlackBoxTestCase extends TestCase { return barcodeReader; } + protected Hashtable getHints() { + return null; + } + + // This workaround is used because AbstractNegativeBlackBoxTestCase overrides this method but does + // not return SummaryResults. public void testBlackBox() throws IOException { + testBlackBoxCountingResults(true); + } + + public SummaryResults testBlackBoxCountingResults(boolean assertOnFailure) throws IOException { assertFalse(testResults.isEmpty()); File[] imageFiles = getImageFiles(); - int[] passedCounts = new int[testResults.size()]; + int testCount = testResults.size(); + int[] passedCounts = new int[testCount]; + int[] tryHarderCounts = new int[testCount]; for (File testImage : imageFiles) { System.out.println("Starting " + testImage.getAbsolutePath()); @@ -121,66 +180,97 @@ public abstract class AbstractBlackBoxTestCase extends TestCase { testImageFileName.substring(0, testImageFileName.indexOf('.')) + ".txt"); String expectedText = readFileAsString(expectedTextFile); - for (int x = 0; x < testResults.size(); x++) { - if (doTestOneImage(image, testResults.get(x).getRotation(), expectedText)) { + for (int x = 0; x < testCount; x++) { + float rotation = testResults.get(x).getRotation(); + BufferedImage rotatedImage = rotateImage(image, rotation); + LuminanceSource source = new BufferedImageLuminanceSource(rotatedImage); + BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); + if (decode(bitmap, rotation, expectedText, false)) { passedCounts[x]++; } + if (decode(bitmap, rotation, expectedText, true)) { + tryHarderCounts[x]++; + } } } - for (int x = 0; x < testResults.size(); x++) { - System.out.println("Rotation " + testResults.get(x).getRotation() + " degrees: " + passedCounts[x] + - " of " + imageFiles.length + " images passed (" + testResults.get(x).getMustPassCount() + + // Print the results of all tests first + int totalFound = 0; + int totalMustPass = 0; + for (int x = 0; x < testCount; x++) { + System.out.println("Rotation " + testResults.get(x).getRotation() + " degrees:"); + System.out.println(" " + passedCounts[x] + " of " + imageFiles.length + " images passed (" + + testResults.get(x).getMustPassCount() + " required)"); + System.out.println(" " + tryHarderCounts[x] + " of " + imageFiles.length + + " images passed with try harder (" + testResults.get(x).getTryHarderCount() + " required)"); - assertTrue("Rotation " + testResults.get(x).getRotation() + " degrees: Too many images failed", - passedCounts[x] >= testResults.get(x).getMustPassCount()); + totalFound += passedCounts[x]; + totalFound += tryHarderCounts[x]; + totalMustPass += testResults.get(x).getMustPassCount(); + totalMustPass += testResults.get(x).getTryHarderCount(); + } + + int totalTests = imageFiles.length * testCount * 2; + System.out.println("TOTALS:\n Decoded " + totalFound + " images out of " + totalTests + + " (" + (totalFound * 100 / totalTests) + "%, " + totalMustPass + " required)"); + if (totalFound > totalMustPass) { + System.out.println(" *** Test too lax by " + (totalFound - totalMustPass) + " images"); + } else if (totalFound < totalMustPass) { + System.out.println(" *** Test failed by " + (totalMustPass - totalFound) + " images"); } + + // Then run through again and assert if any failed + if (assertOnFailure) { + for (int x = 0; x < testCount; x++) { + assertTrue("Rotation " + testResults.get(x).getRotation() + + " degrees: Too many images failed", + passedCounts[x] >= testResults.get(x).getMustPassCount()); + assertTrue("Try harder, Rotation " + testResults.get(x).getRotation() + + " degrees: Too many images failed", + tryHarderCounts[x] >= testResults.get(x).getTryHarderCount()); + } + } + return new SummaryResults(totalFound, totalMustPass, totalTests); } - private boolean doTestOneImage(BufferedImage image, float rotationInDegrees, String expectedText) { - BufferedImage rotatedImage = rotateImage(image, rotationInDegrees); - MonochromeBitmapSource source = new BufferedImageMonochromeBitmapSource(rotatedImage); + private boolean decode(BinaryBitmap source, float rotation, String expectedText, + boolean tryHarder) { Result result; + String suffix = " (" + (tryHarder ? "try harder, " : "") + "rotation: " + rotation + ')'; + try { - result = barcodeReader.decode(source); + Hashtable hints = getHints(); + if (tryHarder) { + if (hints == null) { + hints = TRY_HARDER_HINT; + } else { + hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE); + } + } + result = barcodeReader.decode(source, hints); } catch (ReaderException re) { - System.out.println(re + " (rotation: " + rotationInDegrees + ')'); + System.out.println(re + suffix); return false; } if (!expectedFormat.equals(result.getBarcodeFormat())) { System.out.println("Format mismatch: expected '" + expectedFormat + "' but got '" + - result.getBarcodeFormat() + "' (rotation: " + rotationInDegrees + ')'); + result.getBarcodeFormat() + '\'' + suffix); return false; } String resultText = result.getText(); if (!expectedText.equals(resultText)) { System.out.println("Mismatch: expected '" + expectedText + "' but got '" + resultText + - "' (rotation: " + rotationInDegrees + ')'); + '\'' + suffix); return false; } - - // Try "try harder" mode - try { - result = barcodeReader.decode(source, TRY_HARDER_HINT); - } catch (ReaderException re) { - fail("Normal mode succeeded but \"try harder\" failed (rotation: " + rotationInDegrees + ')'); - return false; - } - if (!expectedFormat.equals(result.getBarcodeFormat())) { - System.out.println("Try Harder Format mismatch: expected '" + expectedFormat + "' but got '" + - result.getBarcodeFormat() + "' (rotation: " + rotationInDegrees + ')'); - } else if (!expectedText.equals(resultText)) { - System.out.println("Try Harder Mismatch: expected '" + expectedText + "' but got '" + - resultText + "' (rotation: " + rotationInDegrees + ')'); - } return true; } private static String readFileAsString(File file) throws IOException { StringBuilder result = new StringBuilder((int) file.length()); - InputStreamReader reader = new InputStreamReader(new FileInputStream(file), "UTF-8"); + InputStreamReader reader = new InputStreamReader(new FileInputStream(file), Charset.forName("UTF8")); try { char[] buffer = new char[256]; int charsRead; @@ -198,10 +288,10 @@ public abstract class AbstractBlackBoxTestCase extends TestCase { return original; } else { AffineTransform at = new AffineTransform(); - at.rotate(Math.toRadians(degrees), original.getWidth() / 2.0f, original.getHeight() / 2.0f); + at.rotate(Math.toRadians(degrees), original.getWidth() / 2.0, original.getHeight() / 2.0); BufferedImageOp op = new AffineTransformOp(at, AffineTransformOp.TYPE_BICUBIC); return op.filter(original, null); } } -} \ No newline at end of file +}