/hg/gfx-test: Harness configuration can now be stored and restor...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Oct 7 07:34:32 PDT 2010
changeset 0e7637965815 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0e7637965815
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 07 16:34:58 2010 +0200
Harness configuration can now be stored and restored from property
file 'gfx_harness.properties'.
diffstat:
4 files changed, 283 insertions(+), 35 deletions(-)
gfx_harness.properties | 9 +
src/org/gfxtest/harness/Configuration.java | 222 +++++++++++++++++++++++++
src/org/gfxtest/harness/ExternalCommands.java | 21 +-
src/org/gfxtest/harness/MainWindow.java | 66 ++++---
diffs (456 lines):
diff -r 436d07eb5e5d -r 0e7637965815 gfx_harness.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx_harness.properties Thu Oct 07 16:34:58 2010 +0200
@@ -0,0 +1,9 @@
+#Thu Oct 07 15:15:51 CEST 2010
+paths.samplesDirectory=samples
+paths.outputDirectory=output
+compile.verbose=false
+jre.tested=/usr/lib/jvm/java/bin/java
+jre.reference=/usr/lib/jvm/java/bin/java
+run.verbose=false
+mainWindow.height=768
+mainWindow.width=1024
diff -r 436d07eb5e5d -r 0e7637965815 src/org/gfxtest/harness/Configuration.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/Configuration.java Thu Oct 07 16:34:58 2010 +0200
@@ -0,0 +1,222 @@
+/*
+ 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.harness;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+public class Configuration
+{
+ private static final String PROPERTIES_FILE_NAME = "gfx_harness.properties";
+
+ private static final int DEFAULT_WINDOW_WIDTH = 1024;
+ private static final int DEFAULT_WINDOW_HEIGHT = 768;
+ private static final String DEFAULT_REFERENCE_JAVA = "/usr/lib/jvm/java/bin/java";
+ private static final String DEFAULT_TESTED_JAVA = "/usr/lib/jvm/java/bin/java";
+ private static final String DEFAULT_SAMPLES_DIRECTORY = "samples";
+ private static final String DEFAULT_OUTPUT_DIRECTORY = "output";
+
+ private String referenceJava;
+ private String testedJava;
+ private boolean verboseCompile;
+ private boolean verboseRun;
+ private int mainWindowWidth;
+ private int mainWindowHeight;
+ private String samplesDirectory;
+ private String outputDirectory;
+
+ public Configuration()
+ {
+ this.setDefaultValues();
+ }
+
+ private void setDefaultValues()
+ {
+ this.referenceJava = DEFAULT_REFERENCE_JAVA;
+ this.testedJava = DEFAULT_TESTED_JAVA;
+ this.verboseCompile = false;
+ this.verboseRun = false;
+ this.mainWindowWidth = DEFAULT_WINDOW_WIDTH;
+ this.mainWindowHeight = DEFAULT_WINDOW_HEIGHT;
+ this.samplesDirectory = DEFAULT_SAMPLES_DIRECTORY;
+ this.outputDirectory = DEFAULT_OUTPUT_DIRECTORY;
+ }
+
+ private void printErrorMessage(Exception e)
+ {
+ System.err.println("Cannot access configuration file " + e.getMessage());
+ e.printStackTrace();
+ }
+
+ public void readConfiguration()
+ {
+ // Read properties file.
+ Properties properties = new Properties();
+ try
+ {
+ properties.load(new FileInputStream(PROPERTIES_FILE_NAME));
+ }
+ catch (FileNotFoundException e)
+ {
+ this.printErrorMessage(e);
+ this.setDefaultValues();
+ }
+ catch (IOException e)
+ {
+ this.printErrorMessage(e);
+ this.setDefaultValues();
+ }
+ this.setReferenceJava(properties.getProperty("jre.reference"));
+ this.setTestedJava(properties.getProperty("jre.tested"));
+ this.setVerboseCompile("true".equals(properties.getProperty("compile.verbose")));
+ this.setVerboseRun("true".equals(properties.getProperty("run.verbose")));
+ this.setMainWindowWidth(Integer.parseInt(properties.getProperty("mainWindow.width")));
+ this.setMainWindowHeight(Integer.parseInt(properties.getProperty("mainWindow.height")));
+ this.setSamplesDirectory(properties.getProperty("paths.samplesDirectory"));
+ this.setOutputDirectory(properties.getProperty("paths.outputDirectory"));
+ }
+
+ public void writeConfiguration()
+ {
+ // Write properties file.
+ Properties properties = new Properties();
+ properties.setProperty("jre.reference", this.getReferenceJava());
+ properties.setProperty("jre.tested", this.getTestedJava());
+ properties.setProperty("compile.verbose", this.isVerboseCompile() ? "true" : "false");
+ properties.setProperty("run.verbose", this.isVerboseRun() ? "true" : "false");
+ properties.setProperty("mainWindow.width", "" + this.getMainWindowWidth());
+ properties.setProperty("mainWindow.height", "" + this.getMainWindowHeight());
+ properties.setProperty("paths.samplesDirectory", this.getSamplesDirectory());
+ properties.setProperty("paths.outputDirectory", this.getOutputDirectory());
+
+ try
+ {
+ properties.store(new FileOutputStream(PROPERTIES_FILE_NAME), null);
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public String getReferenceJava()
+ {
+ return this.referenceJava;
+ }
+
+ public void setReferenceJava(String referenceJava)
+ {
+ this.referenceJava = referenceJava;
+ }
+
+ public String getTestedJava()
+ {
+ return this.testedJava;
+ }
+
+ public void setTestedJava(String testedJava)
+ {
+ this.testedJava = testedJava;
+ }
+
+ public boolean isVerboseCompile()
+ {
+ return this.verboseCompile;
+ }
+
+ public void setVerboseCompile(boolean verboseCompile)
+ {
+ this.verboseCompile = verboseCompile;
+ }
+
+ public boolean isVerboseRun()
+ {
+ return this.verboseRun;
+ }
+
+ public void setVerboseRun(boolean verboseRun)
+ {
+ this.verboseRun = verboseRun;
+ }
+
+ public int getMainWindowWidth()
+ {
+ return this.mainWindowWidth;
+ }
+
+ public void setMainWindowWidth(int mainWindowWidth)
+ {
+ this.mainWindowWidth = mainWindowWidth;
+ }
+
+ public int getMainWindowHeight()
+ {
+ return this.mainWindowHeight;
+ }
+
+ public void setMainWindowHeight(int mainWindowHeight)
+ {
+ this.mainWindowHeight = mainWindowHeight;
+ }
+
+ public String getSamplesDirectory()
+ {
+ return this.samplesDirectory;
+ }
+
+ public void setSamplesDirectory(String samplesDirectory)
+ {
+ this.samplesDirectory = samplesDirectory;
+ }
+
+ public String getOutputDirectory()
+ {
+ return this.outputDirectory;
+ }
+
+ public void setOutputDirectory(String outputDirectory)
+ {
+ this.outputDirectory = outputDirectory;
+ }
+}
diff -r 436d07eb5e5d -r 0e7637965815 src/org/gfxtest/harness/ExternalCommands.java
--- a/src/org/gfxtest/harness/ExternalCommands.java Mon Oct 04 17:43:09 2010 +0200
+++ b/src/org/gfxtest/harness/ExternalCommands.java Thu Oct 07 16:34:58 2010 +0200
@@ -95,22 +95,23 @@ public class ExternalCommands
return copyFromBufferedReaderToString(stdError);
}
- private static String constructBuildCommand(String selectedTestSuite)
+ private static String constructBuildCommand(String selectedTestSuite, boolean verboseOperation)
{
- return "javac -d " + Paths.BUILD_DIRECTORY + " -sourcepath " + Paths.SOURCE_DIRECTORY + "/ "
- + Paths.PATH_TO_TESTSUITES + "/" + selectedTestSuite + ".java";
+ return "javac -d " + Paths.BUILD_DIRECTORY + (verboseOperation ? " -verbose " : "") + " -sourcepath "
+ + Paths.SOURCE_DIRECTORY + "/ " + Paths.PATH_TO_TESTSUITES + "/" + selectedTestSuite + ".java";
}
- private static String constructRunCommand(String pathToJava, String selectedTestName, String outputDirectoryForSelectedTest)
+ private static String constructRunCommand(String pathToJava, String selectedTestName, String outputDirectoryForSelectedTest, boolean verboseOperation)
{
- return pathToJava + " -cp " + Paths.BUILD_DIRECTORY + " org.gfxtest.testsuites." + selectedTestName + " "
- + RUN_OPTIONS + " -o=" + outputDirectoryForSelectedTest;
+ return pathToJava + (verboseOperation ? " -verbose " : "") + " -cp " + Paths.BUILD_DIRECTORY
+ + " org.gfxtest.testsuites." + selectedTestName + " " + RUN_OPTIONS +
+ " -o=" + outputDirectoryForSelectedTest;
}
- public static String compileSelectedTestSuite(String selectedTestSuite) throws IOException, InterruptedException, RuntimeException
+ public static String compileSelectedTestSuite(String selectedTestSuite, boolean verboseOperation) throws IOException, InterruptedException, RuntimeException
{
FileSystemTools.createDirectory(Paths.BUILD_DIRECTORY);
- String compilationCommand = constructBuildCommand(selectedTestSuite);
+ String compilationCommand = constructBuildCommand(selectedTestSuite, verboseOperation);
Process process = Runtime.getRuntime().exec(compilationCommand);
StringBuffer output = new StringBuffer();
@@ -136,13 +137,13 @@ public class ExternalCommands
return output.toString();
}
- public static String runTestOnGivenJDK(String pathToJava, String selectedTestName, String outputDirectory) throws IOException, InterruptedException, RuntimeException
+ public static String runTestOnGivenJDK(String pathToJava, String selectedTestName, String outputDirectory, boolean verboseOperation) throws IOException, InterruptedException, RuntimeException
{
String outputDirectoryForSelectedTest = FileSystemTools.constructTestDirectoryName(outputDirectory, selectedTestName);
FileSystemTools.createDirectory(outputDirectory);
FileSystemTools.createDirectory(outputDirectoryForSelectedTest);
FileSystemTools.eraseDirectory(outputDirectoryForSelectedTest);
- String runCommand = constructRunCommand(pathToJava, selectedTestName, outputDirectoryForSelectedTest);
+ String runCommand = constructRunCommand(pathToJava, selectedTestName, outputDirectoryForSelectedTest, verboseOperation);
Process process = Runtime.getRuntime().exec(runCommand);
StringBuffer output = new StringBuffer();
diff -r 436d07eb5e5d -r 0e7637965815 src/org/gfxtest/harness/MainWindow.java
--- a/src/org/gfxtest/harness/MainWindow.java Mon Oct 04 17:43:09 2010 +0200
+++ b/src/org/gfxtest/harness/MainWindow.java Thu Oct 07 16:34:58 2010 +0200
@@ -71,14 +71,7 @@ public class MainWindow
public class MainWindow
{
private static final String WINDOW_TITLE = "Gfx test harness";
- private static final int DEFAULT_WINDOW_WIDTH = 1024;
- private static final int DEFAULT_WINDOW_HEIGHT = 768;
- private static final String SAMPLES_DIRECTORY = "samples";
- private static final String OUTPUT_DIRECTORY = "output";
-
- private String referenceJava = "/usr/lib/jvm/java/bin/java";
- private String testedJava = "/usr/lib/jvm/java/bin/java";
DefaultListModel testList = new DefaultListModel();
DefaultTableModel resultTable = new DefaultTableModel(new String[]
@@ -96,13 +89,23 @@ public class MainWindow
private JLabel bottomLeftLabel = new JLabel("difference");
private JLabel bottomRightLabel = new JLabel("test image");
private Dialogs dialogs = null;
+ private Configuration configuration = null;
private boolean tableIsErasing;
- private JMenuBar createMainMenu()
+ private JMenuBar createMainMenuBar()
{
JMenuBar mainMenu = new JMenuBar();
+ mainMenu.add(createMenuFile());
+ mainMenu.add(createMenuConfigure());
+ mainMenu.add(createMenuView());
+ mainMenu.add(createMenuZoom());
+ mainMenu.add(createMenuHelp());
+ return mainMenu;
+ }
+ private JMenu createMenuFile()
+ {
JMenu fileMenu = new JMenu("File");
fileMenu.setMnemonic(KeyEvent.VK_F);
@@ -117,23 +120,35 @@ public class MainWindow
}
});
fileMenu.add(fileMenuQuit);
+ return fileMenu;
+ }
- mainMenu.add(fileMenu);
-
+ private JMenu createMenuConfigure()
+ {
JMenu configureMenu = new JMenu("Configure");
configureMenu.setMnemonic(KeyEvent.VK_C);
- mainMenu.add(configureMenu);
+ return configureMenu;
+ }
+ private JMenu createMenuView()
+ {
JMenu viewMenu = new JMenu("View");
viewMenu.setMnemonic(KeyEvent.VK_V);
- mainMenu.add(viewMenu);
+ return viewMenu;
+ }
+ private JMenu createMenuZoom()
+ {
JMenu zoomMenu = new JMenu("Zoom");
zoomMenu.setMnemonic(KeyEvent.VK_Z);
- mainMenu.add(zoomMenu);
+ return zoomMenu;
+ }
+ private JMenu createMenuHelp()
+ {
JMenu helpMenu = new JMenu("Help");
helpMenu.setMnemonic(KeyEvent.VK_H);
+
JMenuItem fileHelpAbout = new JMenuItem("About", KeyEvent.VK_A);
fileHelpAbout.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, ActionEvent.CTRL_MASK));
fileHelpAbout.addActionListener(new ActionListener()
@@ -146,9 +161,7 @@ public class MainWindow
});
helpMenu.add(fileHelpAbout);
- mainMenu.add(helpMenu);
-
- return mainMenu;
+ return helpMenu;
}
private GridBagConstraints constraints(int gridx, int gridy, int gridWidth, int gridHeight, double weightx, double weighty, int fill)
@@ -257,7 +270,7 @@ public class MainWindow
window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- window.setJMenuBar(createMainMenu());
+ window.setJMenuBar(createMainMenuBar());
JSplitPane horizontalSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
horizontalSplitPane.setOneTouchExpandable(true);
@@ -301,7 +314,7 @@ public class MainWindow
window.getContentPane().add(horizontalSplitPane);
// Display the window.
- window.setSize(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT);
+ window.setSize(this.configuration.getMainWindowWidth(), this.configuration.getMainWindowHeight());
window.setVisible(true);
this.setMainWindow(window);
}
@@ -359,8 +372,8 @@ public class MainWindow
{
String testName = this.selectedTestSuite + "_" + this.resultTable.getValueAt(selectedIndex, 0).toString()
+ ".png";
- String sampleFileName = FileSystemTools.constructTestDirectoryName(SAMPLES_DIRECTORY, this.selectedTestSuite);
- String testFileName = FileSystemTools.constructTestDirectoryName(OUTPUT_DIRECTORY, this.selectedTestSuite);
+ String sampleFileName = FileSystemTools.constructTestDirectoryName(this.configuration.getOutputDirectory(), this.selectedTestSuite);
+ String testFileName = FileSystemTools.constructTestDirectoryName(this.configuration.getOutputDirectory(), this.selectedTestSuite);
File sampleImageFile = new File(sampleFileName, testName);
if (sampleImageFile.exists() && sampleImageFile.isFile())
@@ -450,8 +463,8 @@ public class MainWindow
private void refreshTestResults(String selectedTestName)
{
eraseResultTable();
- Set<String> samples = getResultList(SAMPLES_DIRECTORY, selectedTestName);
- Set<String> output = getResultList(OUTPUT_DIRECTORY, selectedTestName);
+ Set<String> samples = getResultList(this.configuration.getSamplesDirectory(), selectedTestName);
+ Set<String> output = getResultList(this.configuration.getOutputDirectory(), selectedTestName);
Set<String> allResults = new TreeSet<String>();
allResults.addAll(samples);
allResults.addAll(output);
@@ -488,7 +501,7 @@ public class MainWindow
}
try
{
- String output = ExternalCommands.compileSelectedTestSuite(this.selectedTestSuite);
+ String output = ExternalCommands.compileSelectedTestSuite(this.selectedTestSuite, this.configuration.isVerboseCompile());
this.resultTextArea.setText(output);
}
catch (IOException e)
@@ -514,9 +527,9 @@ public class MainWindow
}
try
{
- String output = ExternalCommands.runTestOnGivenJDK(this.referenceJava, this.selectedTestSuite, SAMPLES_DIRECTORY);
+ String output = ExternalCommands.runTestOnGivenJDK(this.configuration.getReferenceJava(), this.selectedTestSuite, this.configuration.getSamplesDirectory(), this.configuration.isVerboseRun());
this.resultTextArea.setText(output);
- output = ExternalCommands.runTestOnGivenJDK(this.testedJava, this.selectedTestSuite, OUTPUT_DIRECTORY);
+ output = ExternalCommands.runTestOnGivenJDK(this.configuration.getTestedJava(), this.selectedTestSuite, this.configuration.getOutputDirectory(), this.configuration.isVerboseRun());
this.resultTextArea.append(output);
}
catch (IllegalThreadStateException e)
@@ -540,6 +553,9 @@ public class MainWindow
private void runTestHarness()
{
+ this.configuration = new Configuration();
+ this.configuration.readConfiguration();
+
refreshTestList();
// Schedule a job for the event-dispatching thread:
More information about the distro-pkg-dev
mailing list