[rfc][icedtea-web] Makefile.am modification for AWTFramework, defaultIcon
Jana Fabrikova
jfabriko at redhat.com
Thu May 2 00:49:17 PDT 2013
Hello, thank you for the feedback, I am sending a slightly modified
patch and more comments to this change.
1) reason for the modification of the Makefile.am:
The AWTFramework may be used to find an application window that is
marked by an icon. This icon can be either given as a parameter
(BufferedImage) to the specific instance of AWTHelper class, or there is
one default icon (marker.png) as a static final attribute of the class
ComponentFinder. This icon is loaded from a file, which is placed in
the /tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch
directory. Therefore the classloader needs to have the
directory /tests/test-extensions/ on classpath.
2) yes, there are all 6 needed changes. More descriptive ChangeLog:
2013-05-02 Jana Fabrikova <jfabriko at redhat.com>
* Makefile.am:
the directory $(TEST_EXTENSIONS_SRCDIR) (i.e. test/test-extensions)
added on classpath for running reproducers, unit tests, and test code
coverage for reproducers and unittests using emma and jacoco, that is
for the following 6 targets:
(stamps/run-netx-dist-tests.stamp)
(stamps/run-netx-unit-tests.stamp)
(stamps/run-unit-test-code-coverage.stamp) with EMMA
(stamps/run-unit-test-code-coverage-jacoco.stamp)
(stamps/run-reproducers-test-code-coverage.stamp) with EMMA
(stamps/run-reproducers-test-code-coverage-jacoco.stamp)
* tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java:
modifying the constructor, the default icon is taken from
ComponentFinder instead of loading from file
*
tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java:
added a block of initialization code - the default icon
*
tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java:
unit test for the initialization code in ComponentFinder
* tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png:
second copy of the default icon in a reproducer with resources only
*
tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp:
jnlp file for displaying the applet
*
tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java:
the applet
*
tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java:
adding 6 testcases testing clicking with different mouse
buttons on the applet
*
tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java:
unit test for the initialization code in ComponentFinder
*
tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png:
first copy of the default icon, will be on classpath
On Wed, 2013-05-01 at 15:02 +0200, Jiri Vanek wrote:
> On 04/30/2013 05:43 PM, Jana Fabrikova wrote:
> > Hi,
> > please see the attached patch with modifications to Makefile and several
> > files in AWTFramework with which the default icon file (marker.png also
> > attached) will be present in ...awt/imagesearch and test-extensions
> > srcdir will be on the classpath,
> >
> > cheers,
> > Jana
> >
> > ChangeLog:
> >
> > 2013-04-30 Jana Fabrikova<jfabriko at redhat.com>
> dont forget to change the date;)
>
> The explanation why this patch is needed is necessary. Everyone who was not during our 1to1 discusiion maybe confused
> >
> > * Makefile.am:
> > test/test-extensions added on classpath for reproducers, unit
> > tests and code coverage tests
> maybe little bitmore of explanation and aspecially enumerate teh affected targets please.
>
> > * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java:
> > modifying the constructor, the default icon is taken from
> > ComponentFinder instead of loading from file
> > *
> > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java:
> > added a block of initialization code - the default icon
> > *
> > tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java:
> > unit test for the initialization code in ComponentFinder *
> > tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png:
> > second copy of the default icon in a reproducer with resources only
> > *
> > tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp:
> > jnlp file for displaying the applet
> > *
> > tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java:
> > the applet
> > *
> > tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java:
> > adding 6 testcases testing clicking with different mouse
> > buttons on the applet
> > *
> > tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java:
> > unit test for the initialization code in ComponentFinder
> > *
> > tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png:
> > first copy of the default icon, will be on classpath
> >
> >
> >
> > marker.png
> >
> >
> >
> > modifying_makefile_defaultIcon.patch
> >
> >
> > diff -r e34db561b7b9 Makefile.am
> > --- a/Makefile.am Mon Apr 29 16:24:37 2013 +0200
> > +++ b/Makefile.am Tue Apr 30 17:20:33 2013 +0200
> > @@ -788,7 +788,7 @@
> > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
> > -d $(TEST_EXTENSIONS_TESTS_DIR) \
> > -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
> > - "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
> > + "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \
>
> This line is irrelevant, is it? If so, please remove from chnageset.
> > done ; \
> > done ; \
> > mkdir -p stamps&& \
> > @@ -843,7 +843,7 @@
> > $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
> > cd $(TEST_EXTENSIONS_DIR) ; \
> > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
> > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
> > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \
> > $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
> > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
> > if WITH_XSLTPROC
> > @@ -1021,7 +1021,7 @@
> > done ; \
> > cd $(NETX_UNIT_TEST_DIR) ; \
> > class_names=`cat $(UNIT_CLASS_NAMES)` ; \
> > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \
> > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \
> > $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
> > if WITH_XSLTPROC
> > -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html
> > @@ -1057,6 +1057,7 @@
> > -cp $(BOOT_DIR)/jre/lib/resources.jar \
> > -cp $(RHINO_RUNTIME) \
> > -cp $(TEST_EXTENSIONS_DIR) \
> > + -cp $(TEST_EXTENSIONS_SRCDIR) \
> > -cp . \
> > -ix "-org.junit.*" \
> > -ix "-junit.*" \
> > @@ -1101,7 +1102,7 @@
> > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
> > done ;\
> > class_names=`cat $(UNIT_CLASS_NAMES)` ; \
> > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):. \
> > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \
> > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \
> > for file in $(EMMA_MODIFIED_FILES) ; do \
> > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
> > @@ -1171,6 +1172,7 @@
> > -cp $(BOOT_DIR)/jre/lib/resources.jar \
> > -cp $(RHINO_RUNTIME) \
> > -cp . \
> > + -cp $(TEST_EXTENSIONS_SRCDIR) \
> > -cp $(TEST_EXTENSIONS_TESTS_DIR) \
> > -ix "-org.junit.*" \
> > -ix "-junit.*" \
> > @@ -1274,7 +1276,7 @@
> > done ; \
> > cd $(TEST_EXTENSIONS_DIR) ; \
> > class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
> > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR) \
> > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \
> > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \
> > -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \
> > if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \
>
> Isn't there missing one case?
>
> should be six of them - run unittests, run reproducers, run unittest with emma, with jacoco, run reproducers with emma and with jacoco.
>
> > diff -r e34db561b7b9 tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java
> > --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> > +++ b/tests/netx/unit/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -0,0 +1,56 @@
> > +/* ComponentFinderTest.java
> > +Copyright (C) 2013 Red Hat, Inc.
> > +
> > +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, version 2.
> > +
> > +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 net.sourceforge.jnlp.awt.imagesearch;
> > +
> > +import java.awt.image.BufferedImage;
> > +import org.junit.Assert;
> > +import org.junit.Test;
> > +
> > +/**
> > + *
> > + * This class is a part of AWTFramework, contains component finding
> > + * by searching for icons.
> > + *
> > + */
> > +public class ComponentFinderTest {
> > +
> > + @Test
> > + public void initialiseDefaultIcon() {
> > + BufferedImage icon = ComponentFinder.defaultIcon;
> > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon);
> > + }
> > +}
> > diff -r e34db561b7b9 tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png
> > Binary file tests/reproducers/simple/AWTCommonResourcesOnly/resources/marker.png has changed
> > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp
> > --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/javaws-awtrobot-usage-sample.jnlp Tue Apr 30 17:20:33 2013 +0200
> > @@ -0,0 +1,57 @@
> > +<!--
> > +
> > +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.
> > +
> > + -->
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<jnlp spec="1.0+" codebase="." href="javaws-awtrobot-usage-sample.jnlp">
> > +<information>
> > +<title>AWTRobot usage sample</title>
> > +<vendor>IcedTea</vendor>
> > +<homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> > +<description>AWTRobot usage sample</description>
> > +</information>
> > +<resources>
> > +<!-- Application Resources -->
> > +<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
> > +<jar href="JavawsAWTRobotUsageSample.jar" main="true" />
> > +</resources>
> > +<applet-desc
> > + name="AWTRobot usage sample"
> > + main-class="JavawsAWTRobotUsageSample"
> > + width="400"
> > + height="400">
> > +</applet-desc>
> > +</jnlp>
> > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java
> > --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/srcs/JavawsAWTRobotUsageSample.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -0,0 +1,176 @@
> > +/* JavawsAWTRobotUsageSample.java
> > +Copyright (C) 2012 Red Hat, Inc.
> > +
> > +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, version 2.
> > +
> > +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.
> > + */
> > +
> > +import java.applet.Applet;
> > +import java.awt.Graphics;
> > +import java.awt.Color;
> > +import java.awt.Image;
> > +import java.awt.Panel;
> > +import java.awt.Button;
> > +import java.awt.Dimension;
> > +import java.awt.event.MouseEvent;
> > +import java.awt.event.MouseListener;
> > +import java.awt.event.MouseMotionListener;
> > +
> > +public class JavawsAWTRobotUsageSample extends Applet {
> > +
> > + private static final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!";
> > + public static final String iconFile = "marker.png";
> > +
> > + public static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender
> > + public static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green
> > +
> > + public Image img;
> > + public Panel panel;
> > +
> > + public void init(){
> > + img = getImage(getCodeBase(), iconFile);
> > +
> > + createGUI();
> > +
> > + writeAppletInitialized();
> > + }
> > +
> > + //this method should be called by the extending applet
> > + //when the whole gui is ready
> > + public void writeAppletInitialized(){
> > + System.out.println(initStr);
> > + }
> > +
> > + //paint the icon in upper left corner
> > + @Override public void paint(Graphics g){
> > + int width = 32;
> > + int height = 32;
> > + int x = 0;
> > + int y = 0;
> > + g.drawImage(img, x, y, width, height, this);
> > + super.paint(g);
> > + }
> > +
> > + private Button createButton(String label, Color color) {
> > + Button b = new Button(label);
> > + b.setBackground(color);
> > + b.setPreferredSize(new Dimension(100, 50));
> > + return b;
> > + }
> > +
> > + // sets background of the applet and adds the panel with one button
> > + private void createGUI() {
> > + setBackground(APPLET_COLOR);
> > +
> > + panel = new Panel();
> > + panel.setBounds(33,33,267,267);
> > +
> > + Button b = createButton("", BUTTON_COLOR1);
> > +
> > + b.addMouseMotionListener(new MouseMotionListener() {
> > + public void mouseDragged(MouseEvent e) {
> > + System.out.println("mouseDragged");
> > + }
> > +
> > + public void mouseMoved(MouseEvent e) {
> > + System.out.println("mouseMoved");
> > + }
> > + });
> > +
> > + b.addMouseListener(new MouseListener() {
> > +
> > + public void mouseClicked(MouseEvent e) {
> > + // figure out which mouse button is pressed
> > + switch (e.getButton()) {
> > + case MouseEvent.BUTTON1:
> > + System.out.println("mouseClickedButton1");
> > + break;
> > + case MouseEvent.BUTTON2:
> > + System.out.println("mouseClickedButton2");
> > + break;
> > + case MouseEvent.BUTTON3:
> > + System.out.println("mouseClickedButton3");
> > + break;
> > + default:
> > + break;
> > + }
> > + }
> > +
> > + public void mouseEntered(MouseEvent e) {
> > + System.out.println("mouseEntered");
> > + }
> > +
> > + public void mouseExited(MouseEvent e) {
> > + System.out.println("mouseExited");
> > + }
> > +
> > + public void mousePressed(MouseEvent e) {
> > + // figure out which mouse button is pressed
> > + switch (e.getButton()) {
> > + case MouseEvent.BUTTON1:
> > + System.out.println("mousePressedButton1");
> > + break;
> > + case MouseEvent.BUTTON2:
> > + System.out.println("mousePressedButton2");
> > + break;
> > + case MouseEvent.BUTTON3:
> > + System.out.println("mousePressedButton3");
> > + break;
> > + default:
> > + break;
> > + }
> > + }
> > +
> > + public void mouseReleased(MouseEvent e) {
> > + // figure out which mouse button was pressed
> > + switch (e.getButton()) {
> > + case MouseEvent.BUTTON1:
> > + System.out.println("mouseReleasedButton1");
> > + break;
> > + case MouseEvent.BUTTON2:
> > + System.out.println("mouseReleasedButton2");
> > + break;
> > + case MouseEvent.BUTTON3:
> > + System.out.println("mouseReleasedButton3");
> > + break;
> > + default:
> > + break;
> > + }
> > + }
> > + });
> > +
> > + panel.add(b);
> > +
> > + this.add(panel);
> > + }
> > +}
> > diff -r e34db561b7b9 tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java
> > --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> > +++ b/tests/reproducers/simple/JavawsAWTRobotUsageSample/testcases/JavawsAWTRobotUsageSampleTest.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -0,0 +1,248 @@
> > +/* JavawsAWTRobotUsageSampleTest.java
> > +Copyright (C) 2012 Red Hat, Inc.
> > +
> > +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, version 2.
> > +
> > +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.
> > + */
> > +
> > +import java.awt.Color;
> > +import java.awt.event.InputEvent;
> > +import java.awt.image.BufferedImage;
> > +import java.io.File;
> > +import java.io.IOException;
> > +
> > +import javax.imageio.ImageIO;
> > +
> > +import net.sourceforge.jnlp.ProcessResult;
> > +import net.sourceforge.jnlp.ServerAccess;
> > +import net.sourceforge.jnlp.annotations.NeedsDisplay;
> > +import net.sourceforge.jnlp.awt.AWTFrameworkException;
> > +import net.sourceforge.jnlp.awt.AWTHelper;
> > +import net.sourceforge.jnlp.awt.imagesearch.ComponentNotFoundException;
> > +import net.sourceforge.jnlp.browsertesting.BrowserTest;
> > +import net.sourceforge.jnlp.closinglisteners.Rule;
> > +
> > +import org.junit.Assert;
> > +import org.junit.Test;
> > +
> > +public class JavawsAWTRobotUsageSampleTest extends BrowserTest {
> > +
> > + private final String initStr = "JavawsAWTRobotUsageSample is ready for awt tests!";
> > +
> > + private static final Color APPLET_COLOR = new Color(230, 230, 250); // lavender
> > + private static final Color BUTTON_COLOR1 = new Color(32, 178, 170); // light sea green
> > +
> > + private abstract class AWTHelperImpl extends AWTHelper{
> > +
> > + public AWTHelperImpl() {
> > + super(initStr, 400, 400);
> > +
> > + this.setAppletColor(APPLET_COLOR);
> > + }
> > +
> > + }
> > +
> > + private class AWTHelperImpl_EnterExit extends AWTHelperImpl {
> > +
> > + @Override
> > + public void run() {
> > + // move mouse into the button area and out
> > + try {
> > + moveToMiddleOfColoredRectangle(BUTTON_COLOR1);
> > + moveOutsideColoredRectangle(BUTTON_COLOR1);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > + private class AWTHelperImpl_MouseClick1 extends AWTHelperImpl{
> > +
> > + @Override
> > + public void run() {
> > + // click in the middle of the button
> > +
> > + try {
> > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON1_MASK);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > + private class AWTHelperImpl_MouseClick2 extends AWTHelperImpl{
> > + @Override
> > + public void run() {
> > + // move mouse in the middle of the button and click 2nd
> > + // button
> > + try {
> > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON2_MASK);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > + private class AWTHelperImpl_MouseClick3 extends AWTHelperImpl{
> > + @Override
> > + public void run() {
> > + // move mouse in the middle of the button and click 3rd
> > + // button
> > + try {
> > + clickOnColoredRectangle(BUTTON_COLOR1, InputEvent.BUTTON3_MASK);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > + private class AWTHelperImpl_MouseDrag extends AWTHelperImpl{
> > + @Override
> > + public void run() {
> > + // move into the rectangle, press 1st button, drag out
> > + try {
> > + dragFromColoredRectangle(BUTTON_COLOR1);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > + private class AWTHelperImpl_MouseMove extends AWTHelperImpl{
> > + @Override
> > + public void run() {
> > + clickInTheMiddleOfApplet();
> > + try {
> > + moveInsideColoredRectangle(BUTTON_COLOR1);
> > + } catch (ComponentNotFoundException e) {
> > + Assert.fail("Button not found: "+e.getMessage());
> > + } catch (AWTFrameworkException e2){
> > + Assert.fail("AWTFrameworkException: "+e2.getMessage());
> > + }
> > + }
> > + }
> > +
> > +
> > + private void evaluateStdoutContents(ProcessResult pr, AWTHelper helper) {
> > +
> > + // Assert that the applet was initialized.
> > + Rule i = helper.getInitStrAsRule();
> > + Assert.assertTrue(i.toPassingString(), i.evaluate(initStr));
> > +
> > + // Assert there are all the test messages from applet
> > + for (Rule r : helper.getRules() ) {
> > + Assert.assertTrue(r.toPassingString(), r.evaluate(pr.stdout));
> > + }
> > +
> > + }
> > +
> > +
> > + private void appletAWTMouseTest(String url, AWTHelper helper)
> > + throws Exception {
> > +
> > + String strURL = "/" + url;
> > +
> > + try {
> > + ServerAccess.PROCESS_TIMEOUT = 40 * 1000;// ms
> > + ProcessResult pr = server.executeJavaws(strURL, helper, helper);
> > + evaluateStdoutContents(pr, helper);
> > + } finally {
> > + ServerAccess.PROCESS_TIMEOUT = 20 * 1000;// ms
> > + }
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_EnterAndExit_Test() throws Exception {
> > + // display the page, activate applet, move over the button
> > + AWTHelper helper = new AWTHelperImpl_EnterExit();
> > + helper.addClosingRulesFromStringArray(new String[] { "mouseEntered", "mouseExited"});
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_ClickButton1_Test() throws Exception {
> > + // display the page, activate applet, click on button
> > + AWTHelper helper = new AWTHelperImpl_MouseClick1();
> > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton1", "mouseReleasedButton1", "mouseClickedButton1" });
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_ClickButton2_Test() throws Exception {
> > + // display the page, activate applet, click on button
> > + AWTHelper helper = new AWTHelperImpl_MouseClick2();
> > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton2", "mouseReleasedButton2", "mouseClickedButton2" });
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_ClickButton3_Test() throws Exception {
> > + // display the page, activate applet, click on button
> > + AWTHelper helper = new AWTHelperImpl_MouseClick3();
> > + helper.addClosingRulesFromStringArray(new String[] { "mousePressedButton3", "mouseReleasedButton3", "mouseClickedButton3" });
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_Drag_Test() throws Exception {
> > +
> > + // display the page, activate applet, click on button
> > + AWTHelper helper = new AWTHelperImpl_MouseDrag();
> > + helper.addClosingRulesFromStringArray(new String[] { "mouseDragged" });
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +
> > + @Test
> > + @NeedsDisplay
> > + public void AppletAWTMouse_Move_Test() throws Exception {
> > + // display the page, activate applet, click on button
> > + AWTHelper helper = new AWTHelperImpl_MouseMove();
> > + helper.addClosingRulesFromStringArray(new String[] { "mouseMoved" });
> > + appletAWTMouseTest("javaws-awtrobot-usage-sample.jnlp", helper);
> > + }
> > +}
> > diff -r e34db561b7b9 tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java
> > --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> > +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/awt/imagesearch/ComponentFinderTest.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -0,0 +1,56 @@
> > +/* ComponentFinderTest.java
> > +Copyright (C) 2013 Red Hat, Inc.
> > +
> > +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, version 2.
> > +
> > +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 net.sourceforge.jnlp.awt.imagesearch;
> > +
> > +import java.awt.image.BufferedImage;
> > +import org.junit.Assert;
> > +import org.junit.Test;
> > +
> > +/**
> > + *
> > + * This class is a part of AWTFramework, contains component finding
> > + * by searching for icons.
> > + *
> > + */
> > +public class ComponentFinderTest {
> > +
> > + @Test
> > + public void initialiseDefaultIcon() {
> > + BufferedImage icon = ComponentFinder.defaultIcon;
> > + Assert.assertNotNull("The default icon marker.png was not initialized.", icon);
> > + }
> > +}
> > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java
> > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 16:24:37 2013 +0200
> > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -164,13 +164,9 @@
> >
> > String test_server_dir_path = System.getProperty("test.server.dir");
> >
> > - try {
> > - this.marker = ImageIO.read(new File(test_server_dir_path + "/marker.png"));
> > - this.markerPosition = new Point(0,0);
> > - this.markerGiven = true;
> > - } catch (IOException e) {
> > - throw new RuntimeException("AWTHelper could not read marker.png.",e);
> > - }
> > + this.marker = ComponentFinder.defaultIcon;
> > + this.markerPosition = new Point(0,0);
> > + this.markerGiven = true;
> >
> > this.appletWidth = appletWidth;
> > this.appletHeight = appletHeight;
> > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java
> > --- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 16:24:37 2013 +0200
> > +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Tue Apr 30 17:20:33 2013 +0200
> > @@ -42,8 +42,18 @@
> > import java.awt.Point;
> > import java.awt.Rectangle;
> > import java.awt.image.BufferedImage;
> > +import java.io.IOException;
> > +import javax.imageio.ImageIO;
> >
> > public class ComponentFinder {
> > + public static final BufferedImage defaultIcon;
>
> please add empty line here
>
> > + static{
> > + try {
> > + defaultIcon = ImageIO.read(ComponentFinder.class.getClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png"));
> > + } catch (IOException e) {
> > + throw new RuntimeException("ComponentFinder - problem initializing defaultIcon",e);
> > + }
> > + }
> >
> > /**
> > * method findColoredRectangle determines coordinates of a rectangle colored
> > diff -r e34db561b7b9 tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png
> > Binary file tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/marker.png has changed
>
> Except the (maybe) missing target, looks more then ok to me.
>
> J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: modifying_makefile_awtframework_defaulticon.patch
Type: text/x-patch
Size: 30030 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130502/de59c075/modifying_makefile_awtframework_defaulticon.patch
More information about the distro-pkg-dev
mailing list