/hg/gfx-test: Alpha version of graphics test harness.
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Oct 1 08:28:41 PDT 2010
changeset 967a5209d4f9 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=967a5209d4f9
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 01 17:29:09 2010 +0200
Alpha version of graphics test harness.
diffstat:
4 files changed, 693 insertions(+), 3 deletions(-)
Makefile | 10
src/org/gfxtest/framework/GfxTest.java | 2
src/org/gfxtest/framework/TestImage.java | 2
src/org/gfxtest/harness/MainWindow.java | 682 ++++++++++++++++++++++++++++++
diffs (truncated from 751 to 500 lines):
diff -r b86bf2b73222 -r 967a5209d4f9 Makefile
--- a/Makefile Thu Sep 30 11:34:58 2010 +0200
+++ b/Makefile Fri Oct 01 17:29:09 2010 +0200
@@ -47,6 +47,7 @@ TESTSUITE_DIR=org/gfxtest/testsuites
TESTSUITE_DIR=org/gfxtest/testsuites
REPORTER_DIR=org/gfxtest/reporter
IMAGE_DIFFER_DIR=org/gfxtest/ImageDiffer
+HARNESS=org/gfxtest/harness
TEST_PACKAGE=org.gfxtest.testsuites
RUN_OPTIONS=-w=640 -h=480 -t=rgb
@@ -87,7 +88,8 @@ FRAMEWORK_CLASSES = \
$(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
+ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ResultWriters/XmlWriter.class \
+ $(CLASSES)/$(HARNESS)/MainWindow.class
TESTSUITE_CLASSES = \
$(CLASSES)/$(TESTSUITE_DIR)/AALines.class \
@@ -191,6 +193,9 @@ test_suites: $(TESTSUITE_CLASSES)
$(CLASSES)/$(IMAGE_DIFFER_DIR)/%.class: $(SOURCEPATH)/$(IMAGE_DIFFER_DIR)/%.java
$(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+$(CLASSES)/$(HARNESS)/%.class: $(SOURCEPATH)/$(HARNESS)/%.java
+ $(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+
gfxtest.jar: $(FRAMEWORK_CLASSES) $(TESTSUITE_CLASSES)
jar cvf gfxtest.jar -C $(CLASSES) .
@@ -223,6 +228,9 @@ report: compareresults gfxtest.jar
report: compareresults gfxtest.jar
java -cp gfxtest.jar org.gfxtest.reporter.Reporter -i=$(RESULTS) -o=$(RESULTS)
+harness: gfxtest.jar
+ java -cp gfxtest.jar org.gfxtest.harness.MainWindow
+
cleanall: clean clean-output clean-results clean-samples
clean-all: cleanall
diff -r b86bf2b73222 -r 967a5209d4f9 src/org/gfxtest/framework/GfxTest.java
--- a/src/org/gfxtest/framework/GfxTest.java Thu Sep 30 11:34:58 2010 +0200
+++ b/src/org/gfxtest/framework/GfxTest.java Fri Oct 01 17:29:09 2010 +0200
@@ -163,7 +163,7 @@ public abstract class GfxTest
protected void runTestSuite(String[] args)
{
long t1 = System.currentTimeMillis();
- this.log = new Log(this.getClass().getName(), true);
+ this.log = new Log(this.getClass().getName(), false);
this.log.logBegin("testsuite"); //$NON-NLS-1$
fillSuiteName();
GfxTestConfiguration configuration;
diff -r b86bf2b73222 -r 967a5209d4f9 src/org/gfxtest/framework/TestImage.java
--- a/src/org/gfxtest/framework/TestImage.java Thu Sep 30 11:34:58 2010 +0200
+++ b/src/org/gfxtest/framework/TestImage.java Fri Oct 01 17:29:09 2010 +0200
@@ -56,7 +56,7 @@ public class TestImage
public TestImage(GfxTestConfiguration configuration, int zoom)
{
- this.log = new Log(this.getClass().getName(), true);
+ this.log = new Log(this.getClass().getName(), false);
this.createImage(configuration, zoom);
}
diff -r b86bf2b73222 -r 967a5209d4f9 src/org/gfxtest/harness/MainWindow.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/MainWindow.java Fri Oct 01 17:29:09 2010 +0200
@@ -0,0 +1,682 @@
+/*
+ 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.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+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.table.DefaultTableModel;
+
+/**
+ * Main window code and basic application logic for graphic test harness.
+ *
+ * TODO: dialog for setting reference and tested Java
+ * TODO: dialog for setting verbose output
+ * TODO: image comparator
+ * TODO: image viewer
+ * TODO: image zoomer
+ * TODO: grid
+ * TODO: refactoring!
+ *
+ * @author Pavel Tisnovsky
+ */
+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";
+
+ DefaultListModel testList = new DefaultListModel();
+ DefaultTableModel resultTable = new DefaultTableModel(new String[]
+ { "Name", "Sample", "Tested", "Result" }, 1);
+
+ private String selectedTestSuite = null;
+ private JFrame mainWindow;
+ private JLabel testResultsLabel = new JLabel();
+ private JTextArea resultTextArea = new JTextArea(5, 40);
+ private JButton commandCompile = new JButton("Compile");
+ 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 JMenuBar createMainMenu()
+ {
+ JMenuBar mainMenu = new JMenuBar();
+
+ JMenu fileMenu = new JMenu("File");
+ fileMenu.setMnemonic(KeyEvent.VK_F);
+
+ JMenuItem fileMenuQuit = new JMenuItem("Quit", KeyEvent.VK_Q);
+ fileMenuQuit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
+ fileMenuQuit.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ System.exit(0);
+ }
+ });
+ fileMenu.add(fileMenuQuit);
+
+ mainMenu.add(fileMenu);
+
+ JMenu configureMenu = new JMenu("Configure");
+ configureMenu.setMnemonic(KeyEvent.VK_C);
+ mainMenu.add(configureMenu);
+
+ JMenu viewMenu = new JMenu("View");
+ viewMenu.setMnemonic(KeyEvent.VK_V);
+ mainMenu.add(viewMenu);
+
+ JMenu zoomMenu = new JMenu("Zoom");
+ zoomMenu.setMnemonic(KeyEvent.VK_Z);
+ mainMenu.add(zoomMenu);
+
+ 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()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ JOptionPane.showMessageDialog(getMainWindow(),
+ ABOUT_TEXT, WINDOW_TITLE,
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ });
+ helpMenu.add(fileHelpAbout);
+
+ mainMenu.add(helpMenu);
+
+ return mainMenu;
+ }
+
+ private GridBagConstraints constraints(int gridx, int gridy, int gridWidth, int gridHeight, double weightx, double weighty, int fill)
+ {
+ Insets insets = new Insets(2, 2, 2, 2);
+ return new GridBagConstraints(gridx, gridy, gridWidth, gridHeight, weightx, weighty, GridBagConstraints.CENTER, fill, insets, 0, 0);
+ }
+
+ private void createTopLeftPanelControls(JPanel panel)
+ {
+ this.jTestList = new JList(this.testList);
+ this.jTestList.setVisibleRowCount(20);
+ this.jTestList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ this.jTestList.addListSelectionListener(new ListSelectionListener()
+ {
+ @Override
+ public void valueChanged(ListSelectionEvent e)
+ {
+ if (!e.getValueIsAdjusting())
+ {
+ int selectedIndex = MainWindow.this.jTestList.getSelectedIndex();
+ if (selectedIndex != -1)
+ {
+ selectTestSuite(selectedIndex);
+ }
+ }
+ }
+ });
+ JScrollPane testListPane = new JScrollPane(this.jTestList);
+
+ this.jResultsTable = new JTable(this.resultTable);
+ this.jResultsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ this.jResultsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener()
+ {
+ @Override
+ public void valueChanged(ListSelectionEvent e)
+ {
+ if (!e.getValueIsAdjusting())
+ {
+ int selectedIndex = MainWindow.this.jResultsTable.getSelectedRow();
+ if (selectedIndex != -1)
+ {
+ selectTestResult(selectedIndex);
+ }
+ }
+ }
+ });
+ JScrollPane resultsPane = new JScrollPane(this.jResultsTable);
+
+ this.resultTextArea.setEditable(false);
+ JScrollPane resultTextPane = new JScrollPane(this.resultTextArea);
+
+ this.commandCompile.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ compileSelectedTest();
+ }
+ });
+
+ this.commandRun.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ runSelectedTest();
+ }
+ });
+
+ JButton commandRefresh = new JButton("Refresh test list");
+ commandRefresh.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ refreshTestList();
+ }
+ });
+
+ this.resetTestResultsLabel();
+ this.testResultsLabel.setOpaque(true);
+ this.testResultsLabel.setPreferredSize(new Dimension(200, 20));
+ this.testResultsLabel.setMinimumSize(new Dimension(200, 20));
+
+ panel.add(new JLabel("Gfx. test"), constraints(0, 0, 1, 1, 0.4, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(new JLabel("Commands"), constraints(1, 0, 1, 1, 0.3, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(this.testResultsLabel, constraints(2, 0, 1, 1, 0.3, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(testListPane, constraints(0, 1, 1, 6, 0.4, 1.0, GridBagConstraints.BOTH));
+ panel.add(resultsPane, constraints(2, 1, 1, 4, 0.3, 0.5, GridBagConstraints.BOTH));
+ panel.add(resultTextPane, constraints(1, 5, 2, 1, 0.3, 0.5, GridBagConstraints.BOTH));
+
+ panel.add(this.commandCompile, constraints(1, 1, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(this.commandRun, constraints(1, 2, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(commandRefresh, constraints(1, 4, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(new JPanel(), constraints(1, 3, 1, 1, 0.1, 1.0, GridBagConstraints.BOTH));
+ }
+
+ /**
+ * Create and set up the main window.
+ */
+ protected void createMainWindow()
+ {
+ JFrame window = new JFrame(WINDOW_TITLE);
+ window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ window.setJMenuBar(createMainMenu());
+
+ JSplitPane horizontalSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+ horizontalSplitPane.setOneTouchExpandable(true);
+ horizontalSplitPane.setDividerLocation(1. / 2);
+
+ JSplitPane leftVerticalSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+ leftVerticalSplitPane.setOneTouchExpandable(true);
+ leftVerticalSplitPane.setDividerLocation(1. / 2);
+
+ JSplitPane rightVerticalSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+ rightVerticalSplitPane.setOneTouchExpandable(true);
+ rightVerticalSplitPane.setDividerLocation(1. / 2);
+
+ horizontalSplitPane.add(leftVerticalSplitPane);
+ horizontalSplitPane.add(rightVerticalSplitPane);
+
+ JPanel topLeftPanel = new JPanel();
+ topLeftPanel.setLayout(new GridBagLayout());
+ //topLeftPanel.setMinimumSize(new Dimension(320, 240));
+ createTopLeftPanelControls(topLeftPanel);
+ leftVerticalSplitPane.add(topLeftPanel);
+
+ JPanel topRightPanel = new JPanel();
+ topRightPanel.setMinimumSize(new Dimension(320, 240));
+ //topRightPanel.setBackground(Color.green);
+ topRightPanel.add(this.topRightLabel);
+ rightVerticalSplitPane.add(topRightPanel);
+
+ JPanel bottomLeftPanel = new JPanel();
+ bottomLeftPanel.setMinimumSize(new Dimension(320, 240));
+ //bottomLeftPanel.setBackground(Color.blue);
+ bottomLeftPanel.add(this.bottomLeftLabel);
+ leftVerticalSplitPane.add(bottomLeftPanel);
+
+ JPanel bottomRightPanel = new JPanel();
+ bottomRightPanel.setMinimumSize(new Dimension(320, 240));
+ //bottomRightPanel.setBackground(Color.yellow);
+ bottomRightPanel.add(this.bottomRightLabel);
+ rightVerticalSplitPane.add(bottomRightPanel);
+
+ window.getContentPane().add(horizontalSplitPane);
+
+ // Display the window.
+ window.setSize(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT);
+ window.setVisible(true);
+ this.setMainWindow(window);
+ }
+
+ /**
+ * @param mainWindow the mainWindow to set
+ */
+ public void setMainWindow(JFrame mainWindow)
+ {
+ this.mainWindow = mainWindow;
+ }
+
+ /**
+ * @return the mainWindow
+ */
+ public JFrame getMainWindow()
+ {
+ return this.mainWindow;
+ }
+
+ protected void resetTestResultsLabel()
+ {
+ this.testResultsLabel.setText("no test selected");
+ this.commandCompile.setEnabled(false);
+ this.commandRun.setEnabled(false);
+ }
+
+ private void setTestResultsLabel(String selectedTest)
+ {
+ this.testResultsLabel.setText(selectedTest + " results");
+ this.commandCompile.setEnabled(true);
+ this.commandRun.setEnabled(true);
+ }
+
+ protected void selectTestSuite(int selectedIndex)
+ {
+ if (selectedIndex != -1 && this.testList.getSize() > selectedIndex)
+ {
+ eraseResultTable();
+ this.selectedTestSuite = String.valueOf(this.testList.get(selectedIndex));
+ /*
+ JOptionPane.showMessageDialog(this.mainWindow,
+ "Selected test: " + this.selectedTest, WINDOW_TITLE,
+ JOptionPane.INFORMATION_MESSAGE);
+ */
+ setTestResultsLabel(this.selectedTestSuite);
+ refreshTestResults(this.selectedTestSuite);
+ }
+ }
+
+ protected void selectTestResult(int selectedIndex)
+ {
+ if (selectedIndex != -1 && this.resultTable.getRowCount() > selectedIndex && this.selectedTestSuite != null
+ && !this.tableIsErasing)
+ {
+ 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);
+
+ File sampleImageFile = new File(sampleFileName, testName);
+ if (sampleImageFile.exists() && sampleImageFile.isFile())
+ {
+ BufferedImage sampleImage;
+ try
+ {
+ sampleImage = ImageIO.read(new File(sampleFileName, testName));
+ this.topRightLabel.setIcon(new ImageIcon(sampleImage));
+ this.topRightLabel.setText("");
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ this.topRightLabel.setText(e.getMessage());
+ }
+ }
+
+ File testImageFile = new File(testFileName, testName);
+ if (testImageFile.exists() && testImageFile.isFile())
+ {
+ BufferedImage testImage;
+ try
+ {
+ testImage = ImageIO.read(new File(testFileName, testName));
+ this.bottomRightLabel.setIcon(new ImageIcon(testImage));
+ this.bottomRightLabel.setText("");
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ this.bottomRightLabel.setText(e.getMessage());
+ }
+ }
+ /*
+ * JOptionPane.showMessageDialog(this.mainWindow, "Selected test: "
+ * + testName, WINDOW_TITLE, JOptionPane.INFORMATION_MESSAGE);
+ */
+ }
+ }
+
+ protected void refreshTestList()
+ {
+ this.selectedTestSuite = null;
+ File dir = new File(System.getProperty("user.dir"), PATH_TO_TESTSUITES);
+ Set<String> testNames = new TreeSet<String>();
+ for (String name : dir.list())
+ {
+ testNames.add(name.substring(0, name.indexOf('.')));
+ }
+ this.testList.clear();
+ for (String name : testNames)
+ {
+ this.testList.addElement(name);
+ }
+ this.resetTestResultsLabel();
+ eraseResultTable();
+ }
+
+ private String constructTestNameFromFileName(String fileName)
+ {
+ // special cases - it should not happen!
More information about the distro-pkg-dev
mailing list