This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
FYI: DefaultComboBoxModel.addElement()
- From: David Gilbert <david dot gilbert at object-refinery dot com>
- To: mauve-patches at sources dot redhat dot com
- Date: Sat, 24 Sep 2005 21:38:09 +0000
- Subject: FYI: DefaultComboBoxModel.addElement()
I committed this patch:
2005-09-24 David Gilbert <david.gilbert@object-refinery.com>
* gnu/testlet/javax/swing/DefaultComboBoxModel/addElement.java
(index0, index1, eventType): removed fields,
(events): new field,
(contentsChanged): use new events field,
(intervalAdded): likewise,
(intervalRemoved): likewise,
(test): check for multiple events.
Regards,
Dave Gilbert
Index: gnu/testlet/javax/swing/DefaultComboBoxModel/addElement.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/DefaultComboBoxModel/addElement.java,v
retrieving revision 1.1
diff -u -r1.1 addElement.java
--- gnu/testlet/javax/swing/DefaultComboBoxModel/addElement.java 23 Sep 2005 16:18:05 -0000 1.1
+++ gnu/testlet/javax/swing/DefaultComboBoxModel/addElement.java 24 Sep 2005 20:30:40 -0000
@@ -22,6 +22,8 @@
import gnu.testlet.TestHarness;
import gnu.testlet.Testlet;
+import java.util.List;
+
import javax.swing.DefaultComboBoxModel;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
@@ -33,29 +35,21 @@
public class addElement
implements Testlet, ListDataListener
{
- int index0;
- int index1;
- int eventType;
+ List events = new java.util.ArrayList();
public void contentsChanged(ListDataEvent event)
{
- eventType = event.getType();
- index0 = event.getIndex0();
- index1 = event.getIndex1();
+ events.add(event);
}
-
+
public void intervalAdded(ListDataEvent event)
{
- eventType = event.getType();
- index0 = event.getIndex0();
- index1 = event.getIndex1();
+ events.add(event);
}
public void intervalRemoved(ListDataEvent event)
{
- eventType = event.getType();
- index0 = event.getIndex0();
- index1 = event.getIndex1();
+ events.add(event);
}
/**
@@ -72,25 +66,38 @@
harness.check(m.getSize(), 1);
harness.check(m.getElementAt(0), "A");
harness.check(m.getSelectedItem(), "A");
- harness.check(eventType, ListDataEvent.CONTENTS_CHANGED);
- harness.check(index0, -1);
- harness.check(index1, -1);
+ harness.check(events.size(), 2);
+ ListDataEvent e = (ListDataEvent) events.get(0);
+ harness.check(e.getType(), ListDataEvent.INTERVAL_ADDED);
+ harness.check(e.getIndex0(), 0);
+ harness.check(e.getIndex1(), 0);
+ e = (ListDataEvent) events.get(1);
+ harness.check(e.getType(), ListDataEvent.CONTENTS_CHANGED);
+ harness.check(e.getIndex0(), -1);
+ harness.check(e.getIndex1(), -1);
+ events.clear();
m.addElement("B");
harness.check(m.getSize(), 2);
harness.check(m.getElementAt(1), "B");
harness.check(m.getSelectedItem(), "A");
- harness.check(eventType, ListDataEvent.INTERVAL_ADDED);
- harness.check(index0, 1);
- harness.check(index1, 1);
+ harness.check(events.size(), 1);
+ e = (ListDataEvent) events.get(0);
+ harness.check(e.getType(), ListDataEvent.INTERVAL_ADDED);
+ harness.check(e.getIndex0(), 1);
+ harness.check(e.getIndex1(), 1);
+ events.clear();
m.addElement(null);
harness.check(m.getSize(), 3);
harness.check(m.getElementAt(2), null);
harness.check(m.getSelectedItem(), "A");
- harness.check(eventType, ListDataEvent.INTERVAL_ADDED);
- harness.check(index0, 2);
- harness.check(index1, 2);
+ harness.check(events.size(), 1);
+ e = (ListDataEvent) events.get(0);
+ harness.check(e.getType(), ListDataEvent.INTERVAL_ADDED);
+ harness.check(e.getIndex0(), 2);
+ harness.check(e.getIndex1(), 2);
+ events.clear();
}
}