/hg/gfx-test: Fixed issue: each test suite can be called from co...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Aug 1 03:04:34 PDT 2011
changeset a7c8d2ce958c in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a7c8d2ce958c
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Aug 01 12:06:10 2011 +0200
Fixed issue: each test suite can be called from command line without
the needing to specify any configuration parameters.
diffstat:
ChangeLog | 7 +
src/org/gfxtest/framework/GfxTestConfiguration.java | 178 +++++++++++++++++++-
src/org/gfxtest/harness/ExternalCommands.java | 14 +-
3 files changed, 191 insertions(+), 8 deletions(-)
diffs (292 lines):
diff -r ffd2c01dbe1d -r a7c8d2ce958c ChangeLog
--- a/ChangeLog Mon Aug 01 11:14:46 2011 +0200
+++ b/ChangeLog Mon Aug 01 12:06:10 2011 +0200
@@ -1,3 +1,10 @@
+2011-08-01 Pavel Tisnovsky <ptisnovs at redhat.com>
+ * src/org/gfxtest/harness/ExternalCommands.java:
+ * src/org/gfxtest/framework/GfxTestConfiguration.java:
+ Fixed issue: each test suite can be called from command line without
+ the needing to specify any configuration parameters. Default values
+ are used instead. Code refactoring, added missing JavaDoc.
+
2011-08-01 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/harness/ExternalCommands.java:
Code refactoring and added missing JavaDoc.
diff -r ffd2c01dbe1d -r a7c8d2ce958c src/org/gfxtest/framework/GfxTestConfiguration.java
--- a/src/org/gfxtest/framework/GfxTestConfiguration.java Mon Aug 01 11:14:46 2011 +0200
+++ b/src/org/gfxtest/framework/GfxTestConfiguration.java Mon Aug 01 12:06:10 2011 +0200
@@ -48,8 +48,39 @@
import org.gfxtest.common.ConfigurationException;
import org.gfxtest.common.InvalidParameterValueException;
+
+
+/**
+ * Configuration set by gfx-test harness for each test suite. Configuration
+ * parameters could be specified as command line arguments.
+ *
+ * @author Pavel Tisnovsky
+ */
public class GfxTestConfiguration extends Configuration
{
+ /**
+ * Default width of the test image (measured in pixels).
+ * This value is used in case the "-w" parameter is not used.
+ */
+ public static final int DEFAULT_IMAGE_WIDTH = 640;
+
+ /**
+ * Default height of the test image (measured in pixels).
+ * This value is used in case the "-h" parameter is not used.
+ */
+ public static final int DEFAULT_IMAGE_HEIGHT = 480;
+
+ /**
+ * Default image type.
+ * This value is used in case the "-t" parameter is not used.
+ */
+ public static final String DEFAULT_IMAGE_TYPE = "rgb";
+
+ /**
+ * Default output directory.
+ * This value is used in case the "-o" parameter is not used.
+ */
+ private static final String DEFAULT_OUTPUT_DIRECTORY = ".";
/**
* Path to generated output files.
@@ -73,21 +104,128 @@
*/
private int imageType;
+ /**
+ * Constructor called indirectly when the test suite are started.
+ *
+ * @param args
+ * command line arguments
+ * @param log
+ * logger object
+ * @throws ConfigurationException
+ */
public GfxTestConfiguration(String[] args, Log log) throws ConfigurationException
{
super(args, log);
}
+ /**
+ * This method reads and process all command line parameters.
+ *
+ * @param args
+ * command line arguments
+ */
@Override
protected void readCommandLineParameters(String[] args) throws ConfigurationException
{
Map<String, String> options = resolveAllOptions(args);
- this.imageWidth = getIntegerParameter(options, "w"); //$NON-NLS-1$
- this.imageHeight = getIntegerParameter(options, "h"); //$NON-NLS-1$
- this.imageType = getImageType(options);
- this.outputPath = new File(getStringParameter(options, "o")); //$NON-NLS-1$
+ this.imageWidth = processImageWidthArgument(options);
+ this.imageHeight = processImageHeightArgument(options);
+ this.imageType = processImageTypeArgument(options);
+ this.outputPath = processOutputPathArgument(options);
}
+ /**
+ * Process argument used for setting image width.
+ *
+ * @param options
+ * command line options
+ * @return image width
+ * @throws ConfigurationException
+ */
+ private int processImageWidthArgument(Map<String, String> options) throws ConfigurationException
+ {
+ try
+ {
+ return getIntegerParameter(options, "w"); //$NON-NLS-1$
+ }
+ catch (ParameterNotFoundException e)
+ {
+ this.log.logWarning("image width not specified in command line, using default setting: "
+ + DEFAULT_IMAGE_WIDTH);
+ return DEFAULT_IMAGE_WIDTH;
+ }
+ }
+
+ /**
+ * Process argument used for setting image height.
+ *
+ * @param options
+ * command line options
+ * @return image height
+ * @throws ConfigurationException
+ */
+ private int processImageHeightArgument(Map<String, String> options) throws ConfigurationException
+ {
+ try
+ {
+ return getIntegerParameter(options, "h"); //$NON-NLS-1$
+ }
+ catch (ParameterNotFoundException e)
+ {
+ this.log.logWarning("image height not specified in command line, using default setting: "
+ + DEFAULT_IMAGE_HEIGHT);
+ return DEFAULT_IMAGE_HEIGHT;
+ }
+ }
+
+ /**
+ * Process argument used for setting image type (RGB, GrayScale, etc.)
+ *
+ * @param options
+ * command line options
+ * @return image type
+ * @throws ConfigurationException
+ */
+ private int processImageTypeArgument(Map<String, String> options) throws ConfigurationException
+ {
+ try
+ {
+ return getImageType(options);
+ }
+ catch (ParameterNotFoundException e)
+ {
+ this.log.logWarning("image type not specified in command line, using default setting: "
+ + BufferedImage.TYPE_INT_RGB);
+ return BufferedImage.TYPE_INT_RGB;
+ }
+ }
+
+ /**
+ * Process argument used for setting output path (the name of directory
+ * where test images are stored).
+ *
+ * @param options
+ * command line options
+ * @return output path
+ * @throws ConfigurationException
+ */
+ private File processOutputPathArgument(Map<String, String> options) throws ConfigurationException
+ {
+ try
+ {
+ return new File(getStringParameter(options, "o")); //$NON-NLS-1$;
+ }
+ catch (ParameterNotFoundException e)
+ {
+ this.log.logWarning("output path not specified in command line, using default setting: "
+ + DEFAULT_OUTPUT_DIRECTORY);
+ return new File(DEFAULT_OUTPUT_DIRECTORY);
+ }
+ }
+
+ /**
+ * This method prints all test suite parameters.
+ */
@Override
@SuppressWarnings("nls")
protected void printParameters()
@@ -98,6 +236,14 @@
this.log.logSet("image type", Integer.valueOf(this.imageType));
}
+ /**
+ * Process image type parameter.
+ *
+ * @param options
+ * command line options
+ * @return image type
+ * @throws ConfigurationException
+ */
@SuppressWarnings("nls")
private int getImageType(Map<String, String> options) throws ConfigurationException
{
@@ -112,7 +258,7 @@
}
else if ("gray".equals(imgType))
{
- return BufferedImage.TYPE_BYTE_GRAY;
+ return BufferedImage.TYPE_BYTE_GRAY;
}
else if ("bw".equals(imgType) || ("bit".equals(imgType)))
{
@@ -120,25 +266,45 @@
}
else
{
- throw new InvalidParameterValueException("t", imgType);
+ throw new InvalidParameterValueException("t", imgType);
}
}
+ /**
+ * Getter for outputPath attribute.
+ *
+ * @return current value of attribute outputPath.
+ */
public File getOutputPath()
{
return this.outputPath;
}
+ /**
+ * Getter for imageWidth attribute.
+ *
+ * @return current value of attribute imageWidth.
+ */
public int getImageWidth()
{
return this.imageWidth;
}
+ /**
+ * Getter for imageHeight attribute.
+ *
+ * @return current value of attribute imageHeight.
+ */
public int getImageHeight()
{
return this.imageHeight;
}
+ /**
+ * Getter for imageType attribute.
+ *
+ * @return current value of attribute imageType.
+ */
public int getImageType()
{
return this.imageType;
diff -r ffd2c01dbe1d -r a7c8d2ce958c src/org/gfxtest/harness/ExternalCommands.java
--- a/src/org/gfxtest/harness/ExternalCommands.java Mon Aug 01 11:14:46 2011 +0200
+++ b/src/org/gfxtest/harness/ExternalCommands.java Mon Aug 01 12:06:10 2011 +0200
@@ -44,6 +44,10 @@
import java.io.IOException;
import java.io.InputStreamReader;
+
+
+import org.gfxtest.framework.GfxTestConfiguration;
+
/**
* This class contains methods used for run external commands: compile selected
* test suite and run selected test.
@@ -52,8 +56,14 @@
*/
public class ExternalCommands
{
- private static final String RUN_OPTIONS = "-w=640 -h=480 -t=rgb";
-
+ /**
+ * Run options used to start each test suite.
+ */
+ private static final String RUN_OPTIONS =
+ "-w=" + GfxTestConfiguration.DEFAULT_IMAGE_WIDTH + " " +
+ "-h=" + GfxTestConfiguration.DEFAULT_IMAGE_HEIGHT + " " +
+ "-t=" + GfxTestConfiguration.DEFAULT_IMAGE_TYPE;
+
/**
* Read all lines from buffered reader and converts all lines to one string.
*
More information about the distro-pkg-dev
mailing list