/hg/gfx-test: Class Configuration and related classes is now abs...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Aug 10 04:58:58 PDT 2010
changeset 6a72cc4964cc in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6a72cc4964cc
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Aug 10 13:59:14 2010 +0200
Class Configuration and related classes is now abstract as its will
be used also by report generator.
diffstat:
34 files changed, 445 insertions(+), 368 deletions(-)
Makefile | 13
src/org/gfxtest/common/Configuration.java | 122 +++++
src/org/gfxtest/common/ConfigurationException.java | 58 ++
src/org/gfxtest/common/InvalidParameterValueException.java | 60 ++
src/org/gfxtest/framework/Configuration.java | 204 ----------
src/org/gfxtest/framework/ConfigurationException.java | 58 --
src/org/gfxtest/framework/GfxTest.java | 38 -
src/org/gfxtest/framework/GfxTestConfiguration.java | 147 +++++++
src/org/gfxtest/framework/InvalidParameterValueException.java | 59 --
src/org/gfxtest/framework/ParameterNotFoundException.java | 2
src/org/gfxtest/framework/TestImage.java | 6
src/org/gfxtest/testsuites/DashedCircles.java | 2
src/org/gfxtest/testsuites/DashedEllipses.java | 2
src/org/gfxtest/testsuites/DashedLines.java | 2
src/org/gfxtest/testsuites/DashedPolylines.java | 2
src/org/gfxtest/testsuites/DashedRectangles.java | 2
src/org/gfxtest/testsuites/FilledArcs.java | 2
src/org/gfxtest/testsuites/FilledCircles.java | 2
src/org/gfxtest/testsuites/FilledEllipses.java | 2
src/org/gfxtest/testsuites/FilledPolygons.java | 2
src/org/gfxtest/testsuites/FilledRectangles.java | 2
src/org/gfxtest/testsuites/FilledRoundRectangles.java | 2
src/org/gfxtest/testsuites/Normal3DRectangles.java | 2
src/org/gfxtest/testsuites/NormalArcs.java | 2
src/org/gfxtest/testsuites/NormalCircles.java | 2
src/org/gfxtest/testsuites/NormalEllipses.java | 2
src/org/gfxtest/testsuites/NormalLines.java | 2
src/org/gfxtest/testsuites/NormalPolygons.java | 2
src/org/gfxtest/testsuites/NormalPolylines.java | 2
src/org/gfxtest/testsuites/NormalRectangles.java | 2
src/org/gfxtest/testsuites/NormalRoundRectangles.java | 2
src/org/gfxtest/testsuites/ScaledLines.java | 2
src/org/gfxtest/testsuites/ScaledPolylines.java | 2
src/org/gfxtest/testsuites/ScaledRectangles.java | 2
diffs (truncated from 1267 to 500 lines):
diff -r ec9ff0e79e84 -r 6a72cc4964cc Makefile
--- a/Makefile Mon Aug 09 17:11:20 2010 +0200
+++ b/Makefile Tue Aug 10 13:59:14 2010 +0200
@@ -41,6 +41,7 @@ OUTPUT=output
OUTPUT=output
SAMPLES=samples
RESULTS=results
+COMMON_DIR=org/gfxtest/common
FRAMEWORK_DIR=org/gfxtest/framework
TESTSUITE_DIR=org/gfxtest/testsuites
TEST_PACKAGE=org.gfxtest.testsuites
@@ -50,6 +51,9 @@ JAVAC=javac
JAVAC=javac
FRAMEWORK_CLASSES = \
+ $(CLASSES)/$(COMMON_DIR)/InvalidParameterValueException.class \
+ $(CLASSES)/$(COMMON_DIR)/ConfigurationException.class \
+ $(CLASSES)/$(COMMON_DIR)/Configuration.class \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitives.class \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitive.class \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/RenderStyles.class \
@@ -58,11 +62,10 @@ FRAMEWORK_CLASSES = \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/TestType.class \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformations.class \
$(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformation.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/EntityRenderingStyle.class \
$(CLASSES)/$(FRAMEWORK_DIR)/TestResult.class \
- $(CLASSES)/$(FRAMEWORK_DIR)/ConfigurationException.class \
- $(CLASSES)/$(FRAMEWORK_DIR)/InvalidParameterValueException.class \
$(CLASSES)/$(FRAMEWORK_DIR)/ParameterNotFoundException.class \
- $(CLASSES)/$(FRAMEWORK_DIR)/Configuration.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/GfxTestConfiguration.class \
$(CLASSES)/$(FRAMEWORK_DIR)/TestImage.class \
$(CLASSES)/$(FRAMEWORK_DIR)/GfxTest.class \
$(CLASSES)/$(FRAMEWORK_DIR)/Log.class
@@ -144,6 +147,9 @@ test_suites: $(TESTSUITE_CLASSES)
mkdir -p $(SAMPLES)
touch $(SAMPLES)/stamp
+$(CLASSES)/$(COMMON_DIR)/%.class: $(SOURCEPATH)/$(COMMON_DIR)/%.java
+ $(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+
$(CLASSES)/$(FRAMEWORK_DIR)/%.class: $(SOURCEPATH)/$(FRAMEWORK_DIR)/%.java
$(JAVAC) -d $(CLASSES) -sourcepath src/ $<
@@ -177,6 +183,7 @@ compare-results: compareresults
compare-results: compareresults
compareresults: $(COMPARE_RESULTS)
+ cp results.html $(RESULTS)
mkdir -p masks
cleanall: clean clean-output clean-results clean-samples
diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/Configuration.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/common/Configuration.java Tue Aug 10 13:59:14 2010 +0200
@@ -0,0 +1,122 @@
+/*
+ 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.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.gfxtest.framework.Log;
+import org.gfxtest.framework.ParameterNotFoundException;
+
+/**
+ * This class is used to store actual configuration of graphics test framework.
+ * Configuration can be changed via command line switches.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class Configuration
+{
+ /**
+ * Instance of logger class.
+ */
+ protected Log log;
+
+ public Configuration(String[] args, Log log) throws ConfigurationException
+ {
+ this.log = log;
+ log.logBegin("read configuration"); //$NON-NLS-1$
+ readCommandLineParameters(args);
+ log.logEnd("read configuration"); //$NON-NLS-1$
+ printParameters();
+ }
+
+ protected abstract void readCommandLineParameters(String[] args) throws ConfigurationException;
+ protected abstract void printParameters();
+
+ protected int getIntegerParameter(Map<String, String> options, String parameterName) throws ConfigurationException
+ {
+ if (!options.containsKey(parameterName))
+ {
+ throw new ParameterNotFoundException(parameterName);
+ }
+ String parameterValue = options.get(parameterName);
+ try
+ {
+ return Integer.parseInt(parameterValue);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new InvalidParameterValueException(parameterName, parameterValue);
+ }
+ }
+
+ protected String getStringParameter(Map<String, String> options, String parameterName) throws ConfigurationException
+ {
+ if (!options.containsKey(parameterName))
+ {
+ throw new ParameterNotFoundException(parameterName);
+ }
+ return options.get(parameterName);
+ }
+
+ @SuppressWarnings("nls")
+ protected Map<String, String> resolveAllOptions(String[] args)
+ {
+ Map<String, String> options = new HashMap<String, String>();
+ for (String arg : args)
+ {
+ String[] splittedArg = arg.split("=");
+ if (splittedArg.length >= 1 && splittedArg[0].length() >= 2)
+ {
+ this.log.log("found option " + arg);
+ String optionName = splittedArg[0].substring(1);
+ String optionValue = splittedArg.length == 2 ? splittedArg[1] : "true";
+ options.put(optionName, optionValue);
+ }
+ else
+ {
+ this.log.logError("unknown option " + arg);
+ }
+ }
+ return options;
+ }
+
+}
diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/ConfigurationException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/common/ConfigurationException.java Tue Aug 10 13:59:14 2010 +0200
@@ -0,0 +1,58 @@
+/*
+ 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.common;
+
+/**
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class ConfigurationException extends Exception
+{
+ /**
+ * Generated serial version ID
+ */
+ private static final long serialVersionUID = -2168810923554713703L;
+
+ public ConfigurationException(String message)
+ {
+ super(message);
+ }
+}
diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/InvalidParameterValueException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/common/InvalidParameterValueException.java Tue Aug 10 13:59:14 2010 +0200
@@ -0,0 +1,60 @@
+/*
+ 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.common;
+
+
+/**
+ *
+ * @author Pavel Tisnovsky
+ */
+public class InvalidParameterValueException extends ConfigurationException
+{
+ /**
+ * Genereated serial version ID.
+ */
+ private static final long serialVersionUID = 3027080845460577282L;
+
+ public InvalidParameterValueException(String parameterName, String value)
+ {
+ super("invalid value of parameter " + parameterName + ": " + value); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+}
diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/framework/Configuration.java
--- a/src/org/gfxtest/framework/Configuration.java Mon Aug 09 17:11:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
- 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.framework;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class is used to store actual configuration of graphics test framework.
- * Configuration can be changed via command line switches.
- *
- * @author Pavel Tisnovsky
- */
-public class Configuration
-{
- /**
- * Instance of logger class.
- */
- private Log log;
-
- /**
- * Path to generated output files.
- */
- private File outputPath;
-
- /**
- * Width (measured in pixels) of the generated images.
- */
- private int imageWidth;
-
- /**
- * Height (measured in pixels) of the generated images.
- */
- private int imageHeight;
-
- /**
- * Image type. Currently are supported these image types:
- * BufferedImage.TYPE_INT_RGB, BufferedImage.TYPE_BYTE_GRAY and
- * BufferedImage.TYPE_BYTE_INDEXED.
- */
- private int imageType;
-
- public Configuration(String[] args, Log log) throws ConfigurationException
- {
- this.log = log;
- log.logBegin("read configuration"); //$NON-NLS-1$
- readCommandLineParameters(args);
- log.logEnd("read configuration"); //$NON-NLS-1$
- printParameters();
- }
-
- @SuppressWarnings("nls")
- private void readCommandLineParameters(String[] args) throws ConfigurationException
- {
- Map<String, String> options = resolveAllOptions(args);
- this.imageWidth = getIntegerParameter(options, "w");
- this.imageHeight = getIntegerParameter(options, "h");
- this.imageType = getImageType(options);
- this.outputPath = new File(getStringParameter(options, "o"));
- }
-
- @SuppressWarnings("nls")
- private int getImageType(Map<String, String> options) throws ConfigurationException
- {
- if (!options.containsKey("t"))
- {
- throw new ParameterNotFoundException("t");
- }
- String imgType = options.get("t");
- if ("rgb".equals(imgType))
- {
- return BufferedImage.TYPE_INT_RGB;
- }
- else if ("gray".equals(imgType))
- {
- return BufferedImage.TYPE_BYTE_GRAY;
- }
- else if ("bw".equals(imgType) || ("bit".equals(imgType)))
- {
- return BufferedImage.TYPE_BYTE_INDEXED;
- }
- else
- {
- throw new InvalidParameterValueException("t", imgType);
- }
- }
-
- private int getIntegerParameter(Map<String, String> options, String parameterName) throws ConfigurationException
- {
- if (!options.containsKey(parameterName))
- {
- throw new ParameterNotFoundException(parameterName);
- }
- String parameterValue = options.get(parameterName);
- try
- {
- return Integer.parseInt(parameterValue);
- }
- catch (NumberFormatException e)
- {
- throw new InvalidParameterValueException(parameterName, parameterValue);
- }
- }
-
- private String getStringParameter(Map<String, String> options, String parameterName) throws ConfigurationException
- {
- if (!options.containsKey(parameterName))
- {
- throw new ParameterNotFoundException(parameterName);
- }
- return options.get(parameterName);
- }
-
- @SuppressWarnings("nls")
- private Map<String, String> resolveAllOptions(String[] args)
- {
- Map<String, String> options = new HashMap<String, String>();
- for (String arg : args)
- {
- String[] splittedArg = arg.split("=");
- if (splittedArg.length >= 1 && splittedArg[0].length() >= 2)
- {
- this.log.log("found option " + arg);
- String optionName = splittedArg[0].substring(1);
- String optionValue = splittedArg.length == 2 ? splittedArg[1] : "true";
- options.put(optionName, optionValue);
- }
- else
- {
- this.log.logError("unknown option " + arg);
- }
- }
- return options;
- }
-
- @SuppressWarnings("nls")
- private void printParameters()
- {
- this.log.logSet("output path", this.outputPath);
- this.log.logSet("image width", Integer.valueOf(this.imageWidth));
- this.log.logSet("image height", Integer.valueOf(this.imageHeight));
- this.log.logSet("image type", Integer.valueOf(this.imageType));
- }
-
- public File getOutputPath()
- {
- return this.outputPath;
- }
-
- public int getImageWidth()
- {
More information about the distro-pkg-dev
mailing list