This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
FYI: DefaultTableColumnModel test updates
- 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 11:09:02 +0100
- Subject: FYI: DefaultTableColumnModel test updates
This patch (committed) updates the tests for the DefaultTableColumnModel
class (I made these changes some time ago, but never got around to
committing them). Following a minor patch to GNU Classpath this
morning, all these tests pass:
2006-06-28 David Gilbert <david.gilbert@object-refinery.com>
* gnu/testlet/javax/swing/table/DefaultTableColumnModel/addColumn.java
(test): Check that no listeners are added to the column,
* gnu/testlet/javax/swing/table/DefaultTableColumnModel/constructor.java
(test): Call new test methods,
(testGeneral): Code from original test method,
(testChangeEventInitialization): Checks for initialization of
changeEvent,
* gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumn.java
(test): Add checks for bad arguments,
*
gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumnSelectionAllowed:
Minor reformat,
*
gnu/testlet/javax/swing/table/DefaultTableColumnModel/getTotalColumnWidth.java:
New test,
*
gnu/testlet/javax/swing/table/DefaultTableColumnModel/MyDefaultTableColumnModel.java:
New support class,
*
gnu/testlet/javax/swing/table/DefaultTableColumnModel/removeColumn.java
(test): Add a check for column not in model,
*
gnu/testlet/javax/swing/table/DefaultTableColumnModel/setSelectionModel.java
(test): Added new listener checks.
Regards,
Dave
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/MyDefaultTableColumnModel.java
===================================================================
RCS file: gnu/testlet/javax/swing/table/DefaultTableColumnModel/MyDefaultTableColumnModel.java
diff -N gnu/testlet/javax/swing/table/DefaultTableColumnModel/MyDefaultTableColumnModel.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/MyDefaultTableColumnModel.java 28 Jun 2006 09:58:37 -0000
@@ -0,0 +1,40 @@
+/* MyDefaultTableColumnModel.java -- a subclass of DefaultTableColumn mode
+ Copyright (C) 2006 FIXME: your info here
+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: not-a-test
+
+package gnu.testlet.javax.swing.table.DefaultTableColumnModel;
+
+import javax.swing.event.ChangeEvent;
+import javax.swing.table.DefaultTableColumnModel;
+
+public class MyDefaultTableColumnModel extends DefaultTableColumnModel
+{
+ public MyDefaultTableColumnModel()
+ {
+ super();
+ }
+
+ public ChangeEvent getChangeEventField()
+ {
+ return changeEvent;
+ }
+}
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/addColumn.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/addColumn.java,v
retrieving revision 1.2
diff -u -r1.2 addColumn.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/addColumn.java 28 Apr 2005 07:37:35 -0000 1.2
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/addColumn.java 28 Jun 2006 09:58:38 -0000
@@ -23,6 +23,8 @@
import gnu.testlet.TestHarness;
import gnu.testlet.Testlet;
+import java.beans.PropertyChangeListener;
+
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
@@ -41,8 +43,12 @@
public void test(TestHarness harness)
{
DefaultTableColumnModel m1 = new DefaultTableColumnModel();
- m1.addColumn(new TableColumn(1, 23));
+ TableColumn c1 = new TableColumn(1, 23);
+ m1.addColumn(c1);
harness.check(m1.getColumnCount(), 1);
+ PropertyChangeListener[] listeners = c1.getPropertyChangeListeners();
+ harness.check(listeners[0], m1);
+
TableColumn c = m1.getColumn(0);
harness.check(c.getWidth(), 23);
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/constructor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/constructor.java,v
retrieving revision 1.1
diff -u -r1.1 constructor.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/constructor.java 24 Apr 2005 21:14:08 -0000 1.1
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/constructor.java 28 Jun 2006 09:58:38 -0000
@@ -22,20 +22,55 @@
import gnu.testlet.TestHarness;
import gnu.testlet.Testlet;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.TableColumnModelEvent;
+import javax.swing.event.TableColumnModelListener;
import javax.swing.table.DefaultTableColumnModel;
/**
* Some tests for the constructor in the {@link DefaultTableColumnModel} class.
*/
-public class constructor implements Testlet
+public class constructor implements Testlet, TableColumnModelListener
{
+ public void columnAdded(TableColumnModelEvent e)
+ {
+ // ignore
+ }
+
+ public void columnMarginChanged(ChangeEvent e)
+ {
+ // ignore
+ }
+
+ public void columnMoved(TableColumnModelEvent e)
+ {
+ // ignore
+ }
+
+ public void columnRemoved(TableColumnModelEvent e)
+ {
+ // ignore
+ }
+
+ public void columnSelectionChanged(ListSelectionEvent e)
+ {
+ // ignore
+ }
+
+ public void test(TestHarness harness)
+ {
+ testGeneral(harness);
+ testChangeEventInitialization(harness);
+ }
+
/**
* Runs the test using the specified harness.
*
* @param harness the test harness (<code>null</code> not permitted).
*/
- public void test(TestHarness harness)
+ public void testGeneral(TestHarness harness)
{
harness.checkPoint("DefaultTableColumnModel()");
DefaultTableColumnModel m1 = new DefaultTableColumnModel();
@@ -44,5 +79,26 @@
harness.check(m1.getColumnSelectionAllowed(), false);
harness.check(m1.getSelectedColumnCount(), 0);
}
+
+ /**
+ * This test confirms that the change event is created lazily.
+ *
+ * @param harness the test harness (<code>null</code> not permitted).
+ */
+ private void testChangeEventInitialization(TestHarness harness)
+ {
+ harness.checkPoint("testChangeEventInitialization()");
+ MyDefaultTableColumnModel m = new MyDefaultTableColumnModel();
+ harness.check(m.getChangeEventField(), null);
+
+ // no listeners, no need to create shared ChangeEvent
+ m.setColumnMargin(99);
+ harness.check(m.getChangeEventField(), null);
+
+ // add a listener, and the event is generated
+ m.addColumnModelListener(this);
+ m.setColumnMargin(100);
+ harness.check(m.getChangeEventField() != null);
+ }
}
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumn.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumn.java,v
retrieving revision 1.1
diff -u -r1.1 getColumn.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumn.java 24 Apr 2005 21:14:08 -0000 1.1
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumn.java 28 Jun 2006 09:58:38 -0000
@@ -1,6 +1,6 @@
// Tags: JDK1.2
-// Copyright (C) 2005 David Gilbert <david.gilbert@object-refinery.com>
+// Copyright (C) 2005, 2006, David Gilbert <david.gilbert@object-refinery.com>
// Mauve is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -45,6 +45,27 @@
TableColumn c = m1.getColumn(0);
harness.check(c, column);
+ boolean pass = false;
+ try
+ {
+ c = m1.getColumn(-1);
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
+ pass = true;
+ }
+ harness.check(pass);
+
+ pass = false;
+ try
+ {
+ c = m1.getColumn(1);
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
+ pass = true;
+ }
+ harness.check(pass);
}
}
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumnSelectionAllowed.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumnSelectionAllowed.java,v
retrieving revision 1.1
diff -u -r1.1 getColumnSelectionAllowed.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumnSelectionAllowed.java 24 Apr 2005 21:14:08 -0000 1.1
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/getColumnSelectionAllowed.java 28 Jun 2006 09:58:38 -0000
@@ -42,6 +42,6 @@
harness.check(m1.getColumnSelectionAllowed(), false);
m1.setColumnSelectionAllowed(true);
harness.check(m1.getColumnSelectionAllowed(), true);
-}
+ }
}
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/getTotalColumnWidth.java
===================================================================
RCS file: gnu/testlet/javax/swing/table/DefaultTableColumnModel/getTotalColumnWidth.java
diff -N gnu/testlet/javax/swing/table/DefaultTableColumnModel/getTotalColumnWidth.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/getTotalColumnWidth.java 28 Jun 2006 09:58:38 -0000
@@ -0,0 +1,53 @@
+/* getTotalColumnWidth.java -- some checks for the getTotalColumnWidth() method
+ in the DefaultTableColumnModel class.
+ Copyright (C) 2006 by 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.2
+
+package gnu.testlet.javax.swing.table.DefaultTableColumnModel;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import javax.swing.table.DefaultTableColumnModel;
+import javax.swing.table.TableColumn;
+
+public class getTotalColumnWidth implements Testlet
+{
+ public void test(TestHarness harness)
+ {
+ DefaultTableColumnModel m = new DefaultTableColumnModel();
+ harness.check(m.getTotalColumnWidth(), 0);
+ TableColumn c1 = new TableColumn(0, 9);
+ m.addColumn(c1);
+ harness.check(m.getTotalColumnWidth(), 9);
+ TableColumn c2 = new TableColumn(1, 12);
+ m.addColumn(c2);
+ harness.check(m.getTotalColumnWidth(), 21);
+
+ // column margin is not included
+ m.setColumnMargin(5);
+ harness.check(m.getTotalColumnWidth(), 21);
+
+ c1.setWidth(99);
+ harness.check(m.getTotalColumnWidth(), 111);
+ }
+}
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/removeColumn.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/removeColumn.java,v
retrieving revision 1.1
diff -u -r1.1 removeColumn.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/removeColumn.java 5 Jul 2005 10:00:45 -0000 1.1
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/removeColumn.java 28 Jun 2006 09:58:38 -0000
@@ -1,7 +1,7 @@
// Tags: JDK1.2
// Uses: MyListener
-// Copyright (C) 2005 David Gilbert <david.gilbert@object-refinery.com>
+// Copyright (C) 2005, 2006, David Gilbert <david.gilbert@object-refinery.com>
// Mauve is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -50,7 +50,14 @@
m1.removeColumn(c1);
harness.check(m1.getColumnCount(), 2);
+ harness.check(c1.getPropertyChangeListeners().length, 0);
+
+ // remove a column that isn't there
+ TableColumn c3 = new TableColumn(3, 99);
+ m1.removeColumn(c3);
+ harness.check(m1.getColumnCount(), 2);
+ // remove a null column
m1.removeColumn(null);
harness.check(m1.getColumnCount(), 2);
Index: gnu/testlet/javax/swing/table/DefaultTableColumnModel/setSelectionModel.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/table/DefaultTableColumnModel/setSelectionModel.java,v
retrieving revision 1.1
diff -u -r1.1 setSelectionModel.java
--- gnu/testlet/javax/swing/table/DefaultTableColumnModel/setSelectionModel.java 24 Apr 2005 21:14:08 -0000 1.1
+++ gnu/testlet/javax/swing/table/DefaultTableColumnModel/setSelectionModel.java 28 Jun 2006 09:58:38 -0000
@@ -1,6 +1,6 @@
// Tags: JDK1.2
-// Copyright (C) 2005 David Gilbert <david.gilbert@object-refinery.com>
+// Copyright (C) 2005, 2006, David Gilbert <david.gilbert@object-refinery.com>
// Mauve is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
import gnu.testlet.Testlet;
import javax.swing.DefaultListSelectionModel;
-import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableColumnModel;
/**
@@ -41,9 +41,17 @@
public void test(TestHarness harness)
{
DefaultTableColumnModel m1 = new DefaultTableColumnModel();
- ListSelectionModel lsm = new DefaultListSelectionModel();
+ DefaultListSelectionModel lsm = new DefaultListSelectionModel();
m1.setSelectionModel(lsm);
harness.check(m1.getSelectionModel(), lsm);
+ ListSelectionListener[] listeners = lsm.getListSelectionListeners();
+ harness.check(listeners[0], m1);
+
+ DefaultListSelectionModel lsm2 = new DefaultListSelectionModel();
+ m1.setSelectionModel(lsm2);
+ harness.check(m1.getSelectionModel(), lsm2);
+ listeners = lsm.getListSelectionListeners();
+ harness.check(listeners.length, 0);
boolean pass = false;
try