This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
FYI: JComponent/VetoableChangeSupport
- From: David Gilbert <david dot gilbert at object-refinery dot com>
- To: mauve-patches <mauve-patches at sources dot redhat dot com>
- Date: Wed, 28 Jun 2006 15:31:28 +0100
- Subject: FYI: JComponent/VetoableChangeSupport
This patch (committed) adds new tests for the VetoableChangeListener
support in the JComponent class:
2006-06-28 David Gilbert <david.gilbert@object-refinery.com>
*
gnu/testlet/java/beans/VetoableChangeSupport/addVetoableChangeListener.java:
New test,
* gnu/testlet/javax/swing/JComponent/addVetoableChangeListener.java:
New test,
* gnu/testlet/javax/swing/JComponent/getListeners.java
(MyVetoableChangeListener): New inner class,
(test): Extended to check for VetoableChangeListeners,
* gnu/testlet/javax/swing/JComponent/getVetoableChangeListener.java:
New test,
*
gnu/testlet/javax/swing/JComponent/removeVetoableChangeListener.java:
New test.
I already committed a patch to GNU Classpath to make these tests pass.
Regards,
Dave
Index: gnu/testlet/java/beans/VetoableChangeSupport/addVetoableChangeListener.java
===================================================================
RCS file: gnu/testlet/java/beans/VetoableChangeSupport/addVetoableChangeListener.java
diff -N gnu/testlet/java/beans/VetoableChangeSupport/addVetoableChangeListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/beans/VetoableChangeSupport/addVetoableChangeListener.java 28 Jun 2006 14:25:54 -0000
@@ -0,0 +1,81 @@
+/* addVetoableChangeListener.java -- some checks for the
+ addVetoableChangeListener() method in the VetoableChangeSupport class.
+ Copyright (C) 2006 David Gilbert <david.gilbert@object-refinery.com>
+This file is part of Mauve.
+
+Mauve 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.
+
+Mauve 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 Mauve; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+*/
+
+// Tags: 1.4
+
+package gnu.testlet.java.beans.VetoableChangeSupport;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+import java.beans.VetoableChangeSupport;
+
+public class addVetoableChangeListener
+ implements Testlet, VetoableChangeListener
+{
+ public void vetoableChange(PropertyChangeEvent e)
+ throws PropertyVetoException
+ {
+ }
+
+ public void test(TestHarness harness)
+ {
+ testMethod1(harness);
+ testMethod2(harness);
+ }
+
+ public void testMethod1(TestHarness harness)
+ {
+ harness.checkPoint("(VetoableChangeListener)");
+ VetoableChangeSupport vcs = new VetoableChangeSupport(this);
+ harness.check(vcs.getVetoableChangeListeners().length, 0);
+ vcs.addVetoableChangeListener(this);
+ harness.check(vcs.getVetoableChangeListeners().length, 1);
+ vcs.addVetoableChangeListener(null);
+ harness.check(vcs.getVetoableChangeListeners().length, 1);
+ }
+
+ public void testMethod2(TestHarness harness)
+ {
+ harness.checkPoint("(String, VetoableChangeListener)");
+ VetoableChangeSupport vcs = new VetoableChangeSupport(this);
+ harness.check(vcs.getVetoableChangeListeners().length, 0);
+ vcs.addVetoableChangeListener("A", this);
+ vcs.addVetoableChangeListener("B", this);
+ harness.check(vcs.getVetoableChangeListeners().length, 2);
+ harness.check(vcs.getVetoableChangeListeners("A").length, 1);
+ harness.check(vcs.getVetoableChangeListeners("B").length, 1);
+ vcs.addVetoableChangeListener("B", null);
+ harness.check(vcs.getVetoableChangeListeners().length, 2);
+ harness.check(vcs.getVetoableChangeListeners("B").length, 1);
+
+ // try null property name
+ vcs.addVetoableChangeListener(null, this);
+ harness.check(vcs.getVetoableChangeListeners().length, 2);
+ harness.check(vcs.getVetoableChangeListeners("A").length, 1);
+ harness.check(vcs.getVetoableChangeListeners("B").length, 1);
+ }
+
+}
Index: gnu/testlet/javax/swing/JComponent/addVetoableChangeListener.java
===================================================================
RCS file: gnu/testlet/javax/swing/JComponent/addVetoableChangeListener.java
diff -N gnu/testlet/javax/swing/JComponent/addVetoableChangeListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/JComponent/addVetoableChangeListener.java 28 Jun 2006 14:25:57 -0000
@@ -0,0 +1,54 @@
+/* addVetoableChangeListener.java -- some checks for the
+ addVetoableChangeListener() method in the JComponent class.
+ Copyright (C) 2006 David Gilbert <david.gilbert@object-refinery.com>
+This file is part of Mauve.
+
+Mauve 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.
+
+Mauve 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 Mauve; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+*/
+
+// Tags: JDK1.4
+
+package gnu.testlet.javax.swing.JComponent;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+
+public class addVetoableChangeListener
+ implements Testlet, VetoableChangeListener
+{
+ public void vetoableChange(PropertyChangeEvent e)
+ throws PropertyVetoException
+ {
+ }
+
+public void test(TestHarness harness)
+ {
+ JComponent c = new JButton("ABC");
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ c.addVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 1);
+ c.addVetoableChangeListener(null);
+ harness.check(c.getVetoableChangeListeners().length, 1);
+ }
+}
Index: gnu/testlet/javax/swing/JComponent/getListeners.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/JComponent/getListeners.java,v
retrieving revision 1.2
diff -u -r1.2 getListeners.java
--- gnu/testlet/javax/swing/JComponent/getListeners.java 14 Feb 2006 11:01:59 -0000 1.2
+++ gnu/testlet/javax/swing/JComponent/getListeners.java 28 Jun 2006 14:25:57 -0000
@@ -25,6 +25,8 @@
import java.awt.event.FocusListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
import java.util.EventListener;
import javax.swing.JComponent;
@@ -49,6 +51,15 @@
// ignore
}
}
+
+ class MyVetoableChangeListener implements VetoableChangeListener
+ {
+ public void vetoableChange(PropertyChangeEvent e)
+ throws PropertyVetoException
+ {
+ // ignore
+ }
+ }
/**
* Runs the test using the specified harness.
@@ -80,6 +91,16 @@
else
harness.check(false);
+ // try a VetoableChangeListener
+ VetoableChangeListener vcl = new MyVetoableChangeListener();
+ c.addVetoableChangeListener(vcl);
+ listeners = c.getListeners(VetoableChangeListener.class);
+ harness.check(listeners.length, 1);
+ if (listeners.length > 0)
+ harness.check(listeners[0], vcl);
+ else
+ harness.check(false);
+
// try a null argument
boolean pass = false;
try
Index: gnu/testlet/javax/swing/JComponent/getVetoableChangeListeners.java
===================================================================
RCS file: gnu/testlet/javax/swing/JComponent/getVetoableChangeListeners.java
diff -N gnu/testlet/javax/swing/JComponent/getVetoableChangeListeners.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/JComponent/getVetoableChangeListeners.java 28 Jun 2006 14:25:57 -0000
@@ -0,0 +1,55 @@
+/* getVetoableChangeListeners.java -- some checks for the
+ getVetoableChangeListeners() method in the JComponent class.
+ Copyright (C) 2006 David Gilbert <david.gilbert@object-refinery.com>
+This file is part of Mauve.
+
+Mauve 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.
+
+Mauve 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 Mauve; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+*/
+
+// Tags: JDK1.4
+
+package gnu.testlet.javax.swing.JComponent;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+
+public class getVetoableChangeListeners
+ implements Testlet, VetoableChangeListener
+{
+ public void vetoableChange(PropertyChangeEvent e)
+ throws PropertyVetoException
+ {
+ }
+
+public void test(TestHarness harness)
+ {
+ JComponent c = new JButton("ABC");
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ c.addVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 1);
+ harness.check(c.getVetoableChangeListeners()[0], this);
+ c.removeVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ }
+}
Index: gnu/testlet/javax/swing/JComponent/removeVetoableChangeListener.java
===================================================================
RCS file: gnu/testlet/javax/swing/JComponent/removeVetoableChangeListener.java
diff -N gnu/testlet/javax/swing/JComponent/removeVetoableChangeListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/JComponent/removeVetoableChangeListener.java 28 Jun 2006 14:25:57 -0000
@@ -0,0 +1,58 @@
+/* removeVetoableChangeListener.java -- some checks for the
+ removeVetoableChangeListener() method in the JComponent class.
+ Copyright (C) 2006 David Gilbert <david.gilbert@object-refinery.com>
+This file is part of Mauve.
+
+Mauve 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.
+
+Mauve 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 Mauve; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+*/
+
+// Tags: JDK1.4
+
+package gnu.testlet.javax.swing.JComponent;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+
+public class removeVetoableChangeListener
+ implements Testlet, VetoableChangeListener
+{
+ public void vetoableChange(PropertyChangeEvent e)
+ throws PropertyVetoException
+ {
+ }
+
+public void test(TestHarness harness)
+ {
+ JComponent c = new JButton("ABC");
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ c.addVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 1);
+ c.removeVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ c.removeVetoableChangeListener(this);
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ c.removeVetoableChangeListener(null);
+ harness.check(c.getVetoableChangeListeners().length, 0);
+ }
+}