/hg/gfx-test: Removed lupic.jar from this project, open-source i...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Sep 29 06:16:12 PDT 2010
changeset 1ddd66f68390 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=1ddd66f68390
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Sep 29 15:10:29 2010 +0200
Removed lupic.jar from this project, open-source implementation is
used instead of it.
diffstat:
13 files changed, 1477 insertions(+), 9 deletions(-)
Makefile | 17
src/org/gfxtest/ImageDiffer/ComparisonResult.java | 148 +++++
src/org/gfxtest/ImageDiffer/Configuration.java | 266 +++++++++
src/org/gfxtest/ImageDiffer/ImageComparator.java | 121 ++++
src/org/gfxtest/ImageDiffer/ImageUtils.java | 136 +++++
src/org/gfxtest/ImageDiffer/Main.java | 268 ++++++++++
src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java | 133 ++++
src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java | 159 +++++
src/org/gfxtest/ImageDiffer/ResultWriters/ResultWriter.java | 91 +++
src/org/gfxtest/ImageDiffer/ResultWriters/XmlWriter.java | 122 ++++
src/org/gfxtest/framework/Log.java | 17
template_different_images.html | 4
template_same_images.html | 4
diffs (truncated from 1592 to 500 lines):
diff -r 22665f5502d9 -r 1ddd66f68390 Lupic.jar
Binary file Lupic.jar has changed
diff -r 22665f5502d9 -r 1ddd66f68390 Makefile
--- a/Makefile Wed Sep 29 11:43:48 2010 +0200
+++ b/Makefile Wed Sep 29 15:10:29 2010 +0200
@@ -46,6 +46,7 @@ FRAMEWORK_DIR=org/gfxtest/framework
FRAMEWORK_DIR=org/gfxtest/framework
TESTSUITE_DIR=org/gfxtest/testsuites
REPORTER_DIR=org/gfxtest/reporter
+IMAGE_DIFFER_DIR=org/gfxtest/ImageDiffer
TEST_PACKAGE=org.gfxtest.testsuites
RUN_OPTIONS=-w=640 -h=480 -t=rgb
@@ -77,7 +78,16 @@ FRAMEWORK_CLASSES = \
$(CLASSES)/$(FRAMEWORK_DIR)/GfxTestConfiguration.class \
$(CLASSES)/$(FRAMEWORK_DIR)/TestImage.class \
$(CLASSES)/$(FRAMEWORK_DIR)/GfxTest.class \
- $(CLASSES)/$(FRAMEWORK_DIR)/Log.class
+ $(CLASSES)/$(FRAMEWORK_DIR)/Log.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ComparisonResult.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/Configuration.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ImageComparator.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ImageUtils.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/Main.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ResultWriters/HtmlStructureWriter.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ResultWriters/ResultWriter.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ResultWriters/HtmlWriter.class \
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ResultWriters/XmlWriter.class
TESTSUITE_CLASSES = \
$(CLASSES)/$(TESTSUITE_DIR)/AALines.class \
@@ -178,6 +188,9 @@ test_suites: $(TESTSUITE_CLASSES)
$(CLASSES)/$(REPORTER_DIR)/%.class: $(SOURCEPATH)/$(REPORTER_DIR)/%.java
$(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+$(CLASSES)/$(IMAGE_DIFFER_DIR)/%.class: $(SOURCEPATH)/$(IMAGE_DIFFER_DIR)/%.java
+ $(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+
gfxtest.jar: $(FRAMEWORK_CLASSES) $(TESTSUITE_CLASSES)
jar cvf gfxtest.jar -C $(CLASSES) .
@@ -205,7 +218,7 @@ compareresults: $(COMPARE_RESULTS)
# $* - NormalLines
$(RESULTS)/%: $(OUTPUT)/%
mkdir -p $@
- java -jar Lupic.jar -s1=$(SAMPLES)/$* -s2=$< -m=masks -b=bitmap-masks -o=$@ --html --html-results --xml-results --diff-images --struct-diff-images
+ java -cp gfxtest.jar org.gfxtest.ImageDiffer.Main -s1=$(SAMPLES)/$* -s2=$< -o=$@ --html --html-results --xml-results --diff-images --struct-diff-images
report: compareresults gfxtest.jar
java -cp gfxtest.jar org.gfxtest.reporter.Reporter -i=$(RESULTS) -o=$(RESULTS)
diff -r 22665f5502d9 -r 1ddd66f68390 src/org/gfxtest/ImageDiffer/ComparisonResult.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/ImageDiffer/ComparisonResult.java Wed Sep 29 15:10:29 2010 +0200
@@ -0,0 +1,148 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.ImageDiffer;
+
+import java.awt.Point;
+import java.awt.image.BufferedImage;
+
+public class ComparisonResult
+{
+ private boolean equalsImages;
+ private BufferedImage diffImage;
+ private Point rectangleMin;
+ private Point rectangleMax;
+ private int areaWidth;
+ private int areaHeight;
+ private int totalPixels;
+ private int differentPixels;
+ private int smallDifferences;
+ private int equalPixels;
+ private String testName;
+
+ public ComparisonResult(String testName, boolean equalsImages, BufferedImage diffImage, Point rectangleMin, Point rectangleMax,
+ int areaWidth, int areaHeight, int totalPixels, int differentPixels, int smallDifferences, int equalPixels)
+ {
+ super();
+ this.testName = testName;
+ this.equalsImages = equalsImages;
+ this.diffImage = diffImage;
+ this.rectangleMin = rectangleMin;
+ this.rectangleMax = rectangleMax;
+ this.areaWidth = areaWidth;
+ this.areaHeight = areaHeight;
+ this.totalPixels = totalPixels;
+ this.differentPixels = differentPixels;
+ this.smallDifferences = smallDifferences;
+ this.equalPixels = equalPixels;
+ }
+
+ public boolean isEqualsImages()
+ {
+ return this.equalsImages;
+ }
+
+ public BufferedImage getDiffImage()
+ {
+ return this.diffImage;
+ }
+
+ public Point getRectangleMin()
+ {
+ return this.rectangleMin;
+ }
+
+ public Point getRectangleMax()
+ {
+ return this.rectangleMax;
+ }
+
+ public int getAreaWidth()
+ {
+ return this.areaWidth;
+ }
+
+ public int getAreaHeight()
+ {
+ return this.areaHeight;
+ }
+
+ public int getTotalPixels()
+ {
+ return this.totalPixels;
+ }
+
+ public int getDifferentPixels()
+ {
+ return this.differentPixels;
+ }
+
+ public int getSmallDifferences()
+ {
+ return this.smallDifferences;
+ }
+
+ public int getEqualPixels()
+ {
+ return this.equalPixels;
+ }
+
+ public String getTestName()
+ {
+ return this.testName;
+ }
+
+ public String getComparisonStatus()
+ {
+ return this.isEqualsImages() ? "same" : "different";
+ }
+
+ public String getAreaAsString()
+ {
+ return String.format("%d×%d", Integer.valueOf(this.getAreaWidth()), Integer.valueOf(this.getAreaHeight()));
+ }
+
+ public String getRectangleAsString()
+ {
+ return String.format("[%d, %d] - [%d, %d]", Integer.valueOf(this.getRectangleMin().x),
+ Integer.valueOf(this.getRectangleMin().y), Integer.valueOf(this.getRectangleMax().x),
+ Integer.valueOf(this.getRectangleMax().y));
+ }
+}
diff -r 22665f5502d9 -r 1ddd66f68390 src/org/gfxtest/ImageDiffer/Configuration.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/ImageDiffer/Configuration.java Wed Sep 29 15:10:29 2010 +0200
@@ -0,0 +1,266 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.ImageDiffer;
+
+import java.awt.Color;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.gfxtest.framework.Log;
+
+public class Configuration
+{
+ private boolean convertDiffImageToGrayscale = true;
+
+ private int pixelValueThreshold = 10;
+ private int differentPixelsThreshold = 10;
+
+ private Color diffColorPixelValueUnderThreshold = new Color(0, 0, 255);
+ private Color diffColorPerceptiblePixelDifference = new Color(255, 0, 0);
+ private Color boundaryColor = new Color(0, 128, 255);
+
+ private int boundarySize = 5;
+
+ private File firstSourceDirectory = null;
+ private File secondSourceDirectory = null;
+ private File outputDirectory = null;
+
+ private boolean createHtmlFiles = false;
+ private boolean createHtmlResult = false;
+ private boolean createXmlResult = false;
+ private boolean writeDiffImages = false;
+ private boolean writeStructDiffImages = false;
+
+ private Log log = null;
+
+ public Configuration(String args[])
+ {
+ this.log = new Log(this.getClass().getName(), true);
+ this.log.logConfig("command line parameters: %d", Integer.valueOf(args.length));
+ readCommandLineParameters(args);
+ printParameters();
+ }
+
+ private void printParameters()
+ {
+ this.log.logConfig("first source directory: %s", getAbsolutePath(this.firstSourceDirectory));
+ this.log.logConfig("second source directory: %s", getAbsolutePath(this.secondSourceDirectory));
+ this.log.logConfig("output directory: %s", getAbsolutePath(this.outputDirectory));
+ this.log.logConfig("HTML files creation: %s", enabledFlag(this.isHtmlFilesCreationEnabled()));
+ this.log.logConfig("HTML result creation: %s", enabledFlag(this.isHtmlResultCreationEnabled()));
+ this.log.logConfig("XML result creation: %s", enabledFlag(this.isXmlResultCreationEnabled()));
+ this.log.logConfig("Diff images creation: %s", enabledFlag(this.isDiffImagesCreationEnabled()));
+ this.log.logConfig("Struct. diff images: %s", enabledFlag(this.isStructDiffImagesCreationEnabled()));
+ }
+
+ private String enabledFlag(boolean flag)
+ {
+ return flag ? "enabled" : "disabled";
+ }
+
+ private String getAbsolutePath(File directory)
+ {
+ return directory == null ? "not set" : directory.getAbsolutePath();
+ }
+
+ private void readCommandLineParameters(String args[])
+ {
+ Map<String, String> shortOptions = resolveAllOptions(args, "-");
+ Map<String, String> longOptions = resolveAllOptions(args, "--");
+ this.firstSourceDirectory = getPath(shortOptions, longOptions, "s1", "source1");
+ this.secondSourceDirectory = getPath(shortOptions, longOptions, "s2", "source2");
+ this.outputDirectory = getPath(shortOptions, longOptions, "o", "output");
+ this.createHtmlFiles = getOption(shortOptions, longOptions, "t", "html");
+ this.createHtmlResult = getOption(shortOptions, longOptions, "r", "html-results");
+ this.createXmlResult = getOption(shortOptions, longOptions, "x", "xml-results");
+ this.writeDiffImages = getOption(shortOptions, longOptions, "d", "diff-images");
+ this.writeStructDiffImages = getOption(shortOptions, longOptions, "s", "struct-diff-images");
+ }
+
+ private boolean getOption(Map<String, String> shortOptions, Map<String, String> longOptions, String shortOptionName, String longOptionName)
+ {
+ return shortOptions.containsKey(shortOptionName) || longOptions.containsKey(longOptionName);
+ }
+
+ private File getPath(Map<String, String> shortOptions, Map<String, String> longOptions, String shortOptionName, String longOptionName)
+ {
+ String fileName = shortOptions.get(shortOptionName);
+ if (fileName != null)
+ {
+ return new File(fileName);
+ }
+ fileName = longOptions.get(longOptionName);
+ if (fileName != null)
+ {
+ return new File(fileName);
+ }
+ return null;
+ }
+
+ private Map<String, String> resolveAllOptions(String[] args, String prefix)
+ {
+ Map<String, String> options = new HashMap<String, String>();
+ for (String arg : args)
+ {
+ String[] splittedArg = arg.split("=");
+ if (splittedArg.length >= 1 && splittedArg[0].startsWith(prefix))
+ {
+ this.log.logConfig("found option %s", arg);
+ String optionName = splittedArg[0].substring(prefix.length());
+ String optionValue = splittedArg.length == 2 ? splittedArg[1] : "true";
+ options.put(optionName, optionValue);
+ }
+ }
+ return options;
+ }
+
+ public boolean isConvertDiffImageToGrayscale()
+ {
+ return this.convertDiffImageToGrayscale;
+ }
+
+ public void setConvertDiffImageToGrayscale(boolean convertDiffImageToGrayscale)
+ {
+ this.convertDiffImageToGrayscale = convertDiffImageToGrayscale;
+ }
+
+ public int getPixelValueThreshold()
+ {
+ return this.pixelValueThreshold;
+ }
+
+ public void setPixelValueThreshold(int pixelValueThreshold)
+ {
+ this.pixelValueThreshold = pixelValueThreshold;
+ }
+
+ public int getDifferentPixelsThreshold()
+ {
+ return this.differentPixelsThreshold;
+ }
+
+ public void setDifferentPixelsThreshold(int differentPixelsThreshold)
+ {
+ this.differentPixelsThreshold = differentPixelsThreshold;
+ }
+
+ public Color getDiffColorPixelValueUnderThreshold()
+ {
+ return this.diffColorPixelValueUnderThreshold;
+ }
+
+ public void setDiffColorPixelValueUnderThreshold(Color diffColorPixelValueUnderThreshold)
+ {
+ this.diffColorPixelValueUnderThreshold = diffColorPixelValueUnderThreshold;
+ }
+
+ public Color getDiffColorPerceptiblePixelDifference()
+ {
+ return this.diffColorPerceptiblePixelDifference;
+ }
+
+ public void setDiffColorPerceptiblePixelDifference(Color diffColorPerceptiblePixelDifference)
+ {
+ this.diffColorPerceptiblePixelDifference = diffColorPerceptiblePixelDifference;
+ }
+
+ public int getBoundarySize()
+ {
+ return this.boundarySize;
+ }
+
+ public void setBoundarySize(int boundarySize)
+ {
+ this.boundarySize = boundarySize;
+ }
+
+ public Color getBoundaryColor()
+ {
+ return this.boundaryColor;
+ }
+
+ public void setBoundaryColor(Color boundaryColor)
+ {
+ this.boundaryColor = boundaryColor;
+ }
+
+ public File getFirstSourceDirectory()
+ {
+ return this.firstSourceDirectory;
+ }
+
+ public File getSecondSourceDirectory()
+ {
+ return this.secondSourceDirectory;
+ }
+
+ public File getOutputDirectory()
+ {
+ return this.outputDirectory;
+ }
+
+ public boolean isHtmlFilesCreationEnabled()
+ {
+ return this.createHtmlFiles;
+ }
+
+ public boolean isHtmlResultCreationEnabled()
+ {
+ return this.createHtmlResult;
+ }
+
+ public boolean isXmlResultCreationEnabled()
+ {
+ return this.createXmlResult;
+ }
+
+ public boolean isDiffImagesCreationEnabled()
+ {
+ return this.writeDiffImages;
+ }
+
+ public boolean isStructDiffImagesCreationEnabled()
+ {
+ return this.writeStructDiffImages;
+ }
+
+}
diff -r 22665f5502d9 -r 1ddd66f68390 src/org/gfxtest/ImageDiffer/ImageComparator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/ImageDiffer/ImageComparator.java Wed Sep 29 15:10:29 2010 +0200
@@ -0,0 +1,121 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
More information about the distro-pkg-dev
mailing list