/hg/gfx-test: Refactored graphics test harness. Methods used for...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Oct 4 08:42:38 PDT 2010
changeset 436d07eb5e5d in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=436d07eb5e5d
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 04 17:43:09 2010 +0200
Refactored graphics test harness. Methods used for run external
command are now stored in separated class, so as dialogs and methods
manipulating with (test) files and directories.
diffstat:
5 files changed, 440 insertions(+), 160 deletions(-)
src/org/gfxtest/harness/Dialogs.java | 93 +++++++++++
src/org/gfxtest/harness/ExternalCommands.java | 171 +++++++++++++++++++++
src/org/gfxtest/harness/FileSystemTools.java | 81 ++++++++++
src/org/gfxtest/harness/MainWindow.java | 202 +++++--------------------
src/org/gfxtest/harness/Paths.java | 53 ++++++
diffs (truncated from 741 to 500 lines):
diff -r 967a5209d4f9 -r 436d07eb5e5d src/org/gfxtest/harness/Dialogs.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/Dialogs.java Mon Oct 04 17:43:09 2010 +0200
@@ -0,0 +1,93 @@
+/*
+ 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 javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
+/**
+ * Various dialog boxes.
+ *
+ * @author Pavel Tisnovsky
+ */
+public class Dialogs
+{
+ private static final String ABOUT_TEXT = "Gfx test harness version 0.1\nAuthor: Pavel Tisnovsky, Red Hat";
+
+ private final String title;
+ private final JFrame window;
+
+ public Dialogs(String title, JFrame window)
+ {
+ this.title = title;
+ this.window = window;
+ }
+
+ private void infoMessage(String message)
+ {
+ JOptionPane.showMessageDialog(this.window, message, this.title, JOptionPane.INFORMATION_MESSAGE);
+ }
+
+ private void errorMessage(String message)
+ {
+ JOptionPane.showMessageDialog(this.window, message, this.title, JOptionPane.ERROR_MESSAGE);
+ }
+
+ public void showNoTestSelectedMessage()
+ {
+ this.errorMessage("No test selected in left list box!");
+ }
+
+ public void showDialogWhenCompilationFailed(Exception e)
+ {
+ this.errorMessage("Error occured during compilation: " + e.getMessage());
+ }
+
+ public void showDialogWhenRunTestFailed(Exception e)
+ {
+ this.errorMessage("Error occured during test run: " + e.getMessage());
+ }
+
+ public void showAboutDialog()
+ {
+ this.infoMessage(ABOUT_TEXT);
+ }
+}
diff -r 967a5209d4f9 -r 436d07eb5e5d src/org/gfxtest/harness/ExternalCommands.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/ExternalCommands.java Mon Oct 04 17:43:09 2010 +0200
@@ -0,0 +1,171 @@
+/*
+ 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.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * This class contains methods used for run external commands: compile selected
+ * test suite and run selected test.
+ *
+ * @author Pavel Tisnovsky
+ */
+public class ExternalCommands
+{
+ private static final String RUN_OPTIONS = "-w=640 -h=480 -t=rgb";
+
+ /**
+ * Read all lines from buffered reader and converts all lines to one string.
+ * @param bufferedReader
+ * @return all lines concatenated into one string
+ * @throws IOException
+ */
+ private static String copyFromBufferedReaderToString(BufferedReader bufferedReader) throws IOException
+ {
+ String line;
+ StringBuffer output = new StringBuffer();
+ while ((line = bufferedReader.readLine()) != null)
+ {
+ output.append(line + "\n");
+ }
+ return output.toString();
+ }
+
+ /**
+ * Read standard output from the command and put it to String
+ * @param process
+ * @return
+ * @throws IOException
+ */
+ private static String fetchStandardOutput(Process process) throws IOException
+ {
+ BufferedReader stdInput = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ return copyFromBufferedReaderToString(stdInput);
+ }
+
+ /**
+ * Read error output from the command and put it to String
+ * @param process
+ * @return
+ * @throws IOException
+ */
+ private static String fetchErrorOutput(Process process) throws IOException
+ {
+ BufferedReader stdError = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+ return copyFromBufferedReaderToString(stdError);
+ }
+
+ private static String constructBuildCommand(String selectedTestSuite)
+ {
+ return "javac -d " + Paths.BUILD_DIRECTORY + " -sourcepath " + Paths.SOURCE_DIRECTORY + "/ "
+ + Paths.PATH_TO_TESTSUITES + "/" + selectedTestSuite + ".java";
+ }
+
+ private static String constructRunCommand(String pathToJava, String selectedTestName, String outputDirectoryForSelectedTest)
+ {
+ return pathToJava + " -cp " + Paths.BUILD_DIRECTORY + " org.gfxtest.testsuites." + selectedTestName + " "
+ + RUN_OPTIONS + " -o=" + outputDirectoryForSelectedTest;
+ }
+
+ public static String compileSelectedTestSuite(String selectedTestSuite) throws IOException, InterruptedException, RuntimeException
+ {
+ FileSystemTools.createDirectory(Paths.BUILD_DIRECTORY);
+ String compilationCommand = constructBuildCommand(selectedTestSuite);
+ Process process = Runtime.getRuntime().exec(compilationCommand);
+ StringBuffer output = new StringBuffer();
+
+ output.append("Compilation command:\n");
+ output.append(compilationCommand + "\n");
+
+ output.append("\n");
+ output.append("Standard output for compilation: \n");
+ output.append("---------------------------------\n");
+
+ output.append(fetchStandardOutput(process));
+
+ output.append("\n");
+ output.append("Error output: \n");
+ output.append("---------------------------------\n");
+
+ output.append(fetchErrorOutput(process));
+ process.waitFor();
+ if (process.exitValue() != 0)
+ {
+ throw new RuntimeException("Exit code = " + process.exitValue());
+ }
+ return output.toString();
+ }
+
+ public static String runTestOnGivenJDK(String pathToJava, String selectedTestName, String outputDirectory) 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);
+ Process process = Runtime.getRuntime().exec(runCommand);
+ StringBuffer output = new StringBuffer();
+
+ output.append("Run command:\n");
+ output.append(runCommand + "\n");
+
+ output.append("\n");
+ output.append("Standard output for test run: \n");
+ output.append("---------------------------------\n");
+
+ output.append(fetchStandardOutput(process));
+
+ output.append("\n");
+ output.append("Error output: \n");
+ output.append("---------------------------------\n");
+
+ output.append(fetchErrorOutput(process));
+ process.waitFor();
+ if (process.exitValue() != 0)
+ {
+ throw new RuntimeException("Exit code = " + process.exitValue());
+ }
+ return output.toString();
+ }
+
+}
diff -r 967a5209d4f9 -r 436d07eb5e5d src/org/gfxtest/harness/FileSystemTools.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/FileSystemTools.java Mon Oct 04 17:43:09 2010 +0200
@@ -0,0 +1,81 @@
+/*
+ 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.File;
+
+/**
+ * Various tools for files and directories manipulation.
+ *
+ * @author Pavel Tisnovsky
+ */
+public class FileSystemTools
+{
+ public static void createDirectory(String directoryName)
+ {
+ File directory = new File(directoryName);
+ if (directory.isFile())
+ {
+ System.err.println("Directory " + directoryName
+ + " can not be created because file with the same name already exists!");
+ throw new RuntimeException("Can't create work directory (please remove file named " + directoryName + ")");
+ }
+ if (!directory.exists())
+ {
+ directory.mkdir();
+ }
+ }
+
+ public static void eraseDirectory(String directoryName)
+ {
+ File directory = new File(directoryName);
+ for (String fileName : directory.list())
+ {
+ new File(directory, fileName).delete();
+ }
+ }
+
+ public static String constructTestDirectoryName(String baseDirectory, String selectedTestName)
+ {
+ return new File(baseDirectory, selectedTestName).getAbsolutePath();
+ }
+
+}
diff -r 967a5209d4f9 -r 436d07eb5e5d src/org/gfxtest/harness/MainWindow.java
--- a/src/org/gfxtest/harness/MainWindow.java Fri Oct 01 17:29:09 2010 +0200
+++ b/src/org/gfxtest/harness/MainWindow.java Mon Oct 04 17:43:09 2010 +0200
@@ -46,16 +46,13 @@ import java.awt.Insets;
import java.awt.Insets;
import java.awt.event.*;
import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.*;
import javax.imageio.ImageIO;
import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
+import javax.swing.event.*;
import javax.swing.table.DefaultTableModel;
/**
@@ -74,16 +71,11 @@ public class MainWindow
public class MainWindow
{
private static final String WINDOW_TITLE = "Gfx test harness";
- protected static final String ABOUT_TEXT = "Gfx test harness version 0.1\nAuthor: Pavel Tisnovsky, Red Hat";
private static final int DEFAULT_WINDOW_WIDTH = 1024;
private static final int DEFAULT_WINDOW_HEIGHT = 768;
- private static final String BUILD_DIRECTORY = "test-build";
- private static final String SOURCE_DIRECTORY = "src";
private static final String SAMPLES_DIRECTORY = "samples";
private static final String OUTPUT_DIRECTORY = "output";
- private static final String PATH_TO_TESTSUITES = SOURCE_DIRECTORY + "/org/gfxtest/testsuites";
- private static final String RUN_OPTIONS = "-w=640 -h=480 -t=rgb";
private String referenceJava = "/usr/lib/jvm/java/bin/java";
private String testedJava = "/usr/lib/jvm/java/bin/java";
@@ -100,10 +92,12 @@ public class MainWindow
private JButton commandRun = new JButton("Run");
protected JList jTestList = null;
protected JTable jResultsTable;
- private boolean tableIsErasing;
private JLabel topRightLabel = new JLabel("sample image");
private JLabel bottomLeftLabel = new JLabel("difference");
private JLabel bottomRightLabel = new JLabel("test image");
+ private Dialogs dialogs = null;
+
+ private boolean tableIsErasing;
private JMenuBar createMainMenu()
{
@@ -147,9 +141,7 @@ public class MainWindow
@Override
public void actionPerformed(ActionEvent e)
{
- JOptionPane.showMessageDialog(getMainWindow(),
- ABOUT_TEXT, WINDOW_TITLE,
- JOptionPane.INFORMATION_MESSAGE);
+ onHelpAboutMenuSelected();
}
});
helpMenu.add(fileHelpAbout);
@@ -214,7 +206,7 @@ public class MainWindow
@Override
public void actionPerformed(ActionEvent e)
{
- compileSelectedTest();
+ onCompileButtonPressed();
}
});
@@ -223,7 +215,7 @@ public class MainWindow
@Override
public void actionPerformed(ActionEvent e)
{
- runSelectedTest();
+ onButtonRunPressed();
}
});
@@ -261,6 +253,8 @@ public class MainWindow
protected void createMainWindow()
{
JFrame window = new JFrame(WINDOW_TITLE);
+ this.dialogs = new Dialogs(WINDOW_TITLE, window);
+
window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
window.setJMenuBar(createMainMenu());
@@ -365,8 +359,8 @@ public class MainWindow
{
String testName = this.selectedTestSuite + "_" + this.resultTable.getValueAt(selectedIndex, 0).toString()
+ ".png";
- String sampleFileName = constructTestDirectoryName(SAMPLES_DIRECTORY, this.selectedTestSuite);
- String testFileName = constructTestDirectoryName(OUTPUT_DIRECTORY, this.selectedTestSuite);
+ String sampleFileName = FileSystemTools.constructTestDirectoryName(SAMPLES_DIRECTORY, this.selectedTestSuite);
+ String testFileName = FileSystemTools.constructTestDirectoryName(OUTPUT_DIRECTORY, this.selectedTestSuite);
File sampleImageFile = new File(sampleFileName, testName);
if (sampleImageFile.exists() && sampleImageFile.isFile())
@@ -411,7 +405,7 @@ public class MainWindow
protected void refreshTestList()
{
this.selectedTestSuite = null;
- File dir = new File(System.getProperty("user.dir"), PATH_TO_TESTSUITES);
+ File dir = new File(System.getProperty("user.dir"), Paths.PATH_TO_TESTSUITES);
Set<String> testNames = new TreeSet<String>();
for (String name : dir.list())
{
@@ -480,186 +474,74 @@ public class MainWindow
this.tableIsErasing = false;
}
- private void showNoTestSelectedMessage()
+ protected void onHelpAboutMenuSelected()
{
- JOptionPane.showMessageDialog(this.getMainWindow(),
- "No test selected!", WINDOW_TITLE,
- JOptionPane.ERROR_MESSAGE);
+ this.dialogs.showAboutDialog();
}
- private String copyFromBufferedReaderToString(BufferedReader stdInput) throws IOException
- {
- String line;
- StringBuffer output = new StringBuffer();
- while ((line = stdInput.readLine()) != null)
- {
- output.append(line + "\n");
- }
- return output.toString();
- }
-
- /**
- * Read standard output from the command and put it to String
- * @param process
- * @return
- * @throws IOException
- */
- private String fetchStandardOutput(Process process) throws IOException
- {
- BufferedReader stdInput = new BufferedReader(new InputStreamReader(process.getInputStream()));
More information about the distro-pkg-dev
mailing list