/hg/gfx-test: Added new functionality - preview of test source f...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Jul 13 05:27:52 PDT 2011
changeset 8fd4d88548db in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=8fd4d88548db
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Jul 13 14:28:57 2011 +0200
Added new functionality - preview of test source file.
diffstat:
src/org/gfxtest/harness/Configuration.java | 15 +++-
src/org/gfxtest/harness/MainWindow.java | 47 +++++++---
src/org/gfxtest/harness/SourceViewer.java | 117 +++++++++++++++++++++++++++++
3 files changed, 163 insertions(+), 16 deletions(-)
diffs (274 lines):
diff -r 1c22439b7d07 -r 8fd4d88548db src/org/gfxtest/harness/Configuration.java
--- a/src/org/gfxtest/harness/Configuration.java Tue Jul 12 14:55:44 2011 +0200
+++ b/src/org/gfxtest/harness/Configuration.java Wed Jul 13 14:28:57 2011 +0200
@@ -48,6 +48,8 @@
public class Configuration
{
+ private static final String WINDOW_TITLE = "Gfx test harness";
+
private static final String PROPERTIES_FILE_NAME = "gfx_harness.properties";
private static final int DEFAULT_WINDOW_WIDTH = 1024;
@@ -56,6 +58,7 @@
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 static final String TEST_SOURCES_DIRECTORY = "src/org/gfxtest/testsuites";
private static final String TEST_CLASSES_DIRECTORY = "test-build/org/gfxtest/testsuites";
private String referenceJava;
@@ -237,8 +240,18 @@
this.outputDirectory = outputDirectory;
}
- public String getTestClassesDirectory()
+ public static String getTestSourcesDirectory()
+ {
+ return TEST_SOURCES_DIRECTORY;
+ }
+
+ public static String getTestClassesDirectory()
{
return TEST_CLASSES_DIRECTORY;
}
+
+ public static String getWindowTitle()
+ {
+ return WINDOW_TITLE;
+ }
}
diff -r 1c22439b7d07 -r 8fd4d88548db src/org/gfxtest/harness/MainWindow.java
--- a/src/org/gfxtest/harness/MainWindow.java Tue Jul 12 14:55:44 2011 +0200
+++ b/src/org/gfxtest/harness/MainWindow.java Wed Jul 13 14:28:57 2011 +0200
@@ -73,9 +73,6 @@
*/
public class MainWindow
{
- private static final String WINDOW_TITLE = "Gfx test harness";
-
-
DefaultListModel testList = new DefaultListModel();
DefaultTableModel resultTable = new DefaultTableModel(new String[]
{ "Name", "Sample", "Tested", "Result" }, 1);
@@ -86,6 +83,7 @@
private JTextArea resultTextArea = new JTextArea(5, 40);
private JButton commandCompile = new JButton("Compile");
private JButton commandRun = new JButton("Run");
+ private JButton commandShowSource = new JButton("Show test source code");
private JButton commandDeleteClass = new JButton("Delete test class");
private JButton commandRefresh = new JButton("Refresh test list");
protected JList jTestList = null;
@@ -316,7 +314,15 @@
{
@Override
public void actionPerformed(ActionEvent e) {
- onCommandDeleteClassPressed();
+ onButtonDeleteClassPressed();
+ }
+ });
+
+ this.commandShowSource.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ onButtonShowSourcePressed();
}
});
@@ -341,8 +347,10 @@
panel.add(resultsPane, constraints(2, 1, 1, 6, 0.3, 0.5, GridBagConstraints.BOTH));
panel.add(resultTextPane, constraints(1, 7, 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(this.commandShowSource, constraints(1, 1, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(new JPanel(), constraints(1, 5, 1, 1, 0.1, 1.0, GridBagConstraints.BOTH));
+ panel.add(this.commandCompile, constraints(1, 2, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
+ panel.add(this.commandRun, constraints(1, 3, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
panel.add(this.commandDeleteClass, constraints(1, 4, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
panel.add(this.commandRefresh, constraints(1, 6, 1, 1, 0.1, 0.0, GridBagConstraints.HORIZONTAL));
panel.add(new JPanel(), constraints(1, 5, 1, 1, 0.1, 1.0, GridBagConstraints.BOTH));
@@ -353,8 +361,8 @@
*/
protected void createMainWindow()
{
- JFrame window = new JFrame(WINDOW_TITLE);
- this.dialogs = new Dialogs(WINDOW_TITLE, window);
+ JFrame window = new JFrame(Configuration.getWindowTitle());
+ this.dialogs = new Dialogs(Configuration.getWindowTitle(), window);
window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -429,6 +437,7 @@
this.commandCompile.setEnabled(false);
this.commandRun.setEnabled(false);
this.commandDeleteClass.setEnabled(false);
+ this.commandShowSource.setEnabled(false);
}
private void setTestResultsLabel(String selectedTest)
@@ -437,6 +446,7 @@
this.commandCompile.setEnabled(true);
this.commandRun.setEnabled(true);
this.commandDeleteClass.setEnabled(true);
+ this.commandShowSource.setEnabled(true);
}
protected void selectTestSuite(int selectedIndex)
@@ -720,7 +730,18 @@
refreshTestResults(this.selectedTestSuite);
}
- protected void onCommandDeleteClassPressed() {
+ protected void onButtonShowSourcePressed()
+ {
+ if (this.selectedTestSuite == null)
+ {
+ this.dialogs.showNoTestSelectedMessage();
+ return;
+ }
+ new SourceViewer().showSource(this.selectedTestSuite);
+ }
+
+ protected void onButtonDeleteClassPressed()
+ {
if (this.selectedTestSuite == null)
{
this.dialogs.showNoTestSelectedMessage();
@@ -767,12 +788,8 @@
}
}
- protected void onCommandShowSourcePressed() {
- // TODO Auto-generated method stub
-
- }
-
- protected void onRefreshTestListPressed() {
+ protected void onRefreshTestListPressed()
+ {
refreshTestList();
}
diff -r 1c22439b7d07 -r 8fd4d88548db src/org/gfxtest/harness/SourceViewer.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/harness/SourceViewer.java Wed Jul 13 14:28:57 2011 +0200
@@ -0,0 +1,117 @@
+/*
+ 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.BorderLayout;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.WindowConstants;
+
+public class SourceViewer
+{
+ protected JFrame frame = new JFrame(Configuration.getWindowTitle());
+ private JTextArea textArea = new JTextArea();
+ private JButton buttonClose = new JButton("Close");
+ private Dialogs dialogs = new Dialogs(Configuration.getWindowTitle(), this.frame);
+
+ public void showSource(String selectedTestSuite)
+ {
+ try
+ {
+ readSourceFile(selectedTestSuite);
+ constructFrame();
+ this.frame.setVisible(true);
+ }
+ catch (IOException e)
+ {
+ this.dialogs.showErrorMessage(e.getMessage());
+ }
+ }
+
+ private void readSourceFile(String selectedTestSuite) throws IOException
+ {
+ File fin = new File(Configuration.getTestSourcesDirectory(), selectedTestSuite + ".java");
+ if (!fin.exists())
+ {
+ throw new IOException("File " + fin.getCanonicalPath() + " not found");
+ }
+ BufferedReader reader = new BufferedReader(new FileReader(fin));
+ String line;
+ while ((line=reader.readLine())!=null)
+ {
+ this.textArea.append(line);
+ this.textArea.append("\n");
+ }
+ reader.close();
+ }
+
+ private void constructFrame() {
+ this.textArea.setCaretColor(Color.red);
+ this.textArea.setEditable(false);
+ this.textArea.setFont(new Font("Monospaced", Font.PLAIN, 12));
+ this.frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ this.frame.setSize(640, 480);
+ this.buttonClose.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SourceViewer.this.frame.dispose();
+ }
+ });
+ this.frame.setLayout(new BorderLayout());
+ this.frame.add(new JScrollPane(this.textArea), BorderLayout.CENTER);
+ this.frame.add(this.buttonClose, BorderLayout.SOUTH);
+ }
+
+}
More information about the distro-pkg-dev
mailing list