This is the mail archive of the mauve-patches@sourceware.org mailing list for the Mauve project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI: DefaultBoundedRangeModel test updates


This patch (committed) adds a new test for basic serialization of the DefaultBoundedRangeModel class (to cover a fix committed to GNU Classpath earlier today), and renames an existing test (because it had the same name as the class being tested, which gets in the way for other tests):

2006-07-11 David Gilbert <david.gilbert@object-refinery.com>

* gnu/testlet/javax/swing/DefaultBoundedRangeModel/DefaultBoundedRangeModel.java:
Renamed general.java,
* gnu/testlet/javax/swing/DefaultBoundedRangeModel/general.java:
New file,
* gnu/testlet/javax/swing/DefaultBoundedRangeModel/serialization.java:
New file.


Regards,

Dave
Index: gnu/testlet/javax/swing/DefaultBoundedRangeModel/DefaultBoundedRangeModel.java
===================================================================
RCS file: gnu/testlet/javax/swing/DefaultBoundedRangeModel/DefaultBoundedRangeModel.java
diff -N gnu/testlet/javax/swing/DefaultBoundedRangeModel/DefaultBoundedRangeModel.java
--- gnu/testlet/javax/swing/DefaultBoundedRangeModel/DefaultBoundedRangeModel.java	7 Jan 2004 12:39:55 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-// Tags: JDK1.2
-// Uses: setRangeProperties
-
-// Copyright (C) 2003 Sascha Brawer <brawer@dandelis.ch>
-
-// 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, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-package gnu.testlet.javax.swing.DefaultBoundedRangeModel;
-
-import gnu.testlet.Testlet;
-import gnu.testlet.TestHarness;
-
-/**
- * Checks whether the DefaultBoundedRangeModel.toString
- * method works correctly.
- *
- * @author Sascha Brawer (brawer@dandelis.ch)
- */
-public class DefaultBoundedRangeModel
-  implements Testlet
-{
-  public void test(TestHarness harness)
-  {
-    javax.swing.DefaultBoundedRangeModel dbrm;
-    Throwable caught;
-
-    // Check #1.
-    dbrm = new javax.swing.DefaultBoundedRangeModel();
-    setRangeProperties.check(harness, dbrm, 0, 0, 0, 100, false);
-
-    // Check #2.
-    dbrm = new javax.swing.DefaultBoundedRangeModel(5, 2, -1234, 4321);
-    setRangeProperties.check(harness, dbrm, 5, 2, -1234, 4321, false);
-
-    // Check #3.
-    caught = null;
-    try
-      {
-        dbrm = new javax.swing.DefaultBoundedRangeModel(-2, 0, 10, 20);
-      }
-    catch (Exception ex)
-      {
-        caught = ex;
-      }
-    harness.check(caught instanceof IllegalArgumentException);
-  }
-}
Index: gnu/testlet/javax/swing/DefaultBoundedRangeModel/general.java
===================================================================
RCS file: gnu/testlet/javax/swing/DefaultBoundedRangeModel/general.java
diff -N gnu/testlet/javax/swing/DefaultBoundedRangeModel/general.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/DefaultBoundedRangeModel/general.java	11 Jul 2006 15:11:00 -0000
@@ -0,0 +1,62 @@
+// Tags: JDK1.2
+// Uses: setRangeProperties
+
+// Copyright (C) 2003 Sascha Brawer <brawer@dandelis.ch>
+
+// 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, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+package gnu.testlet.javax.swing.DefaultBoundedRangeModel;
+
+import gnu.testlet.Testlet;
+import gnu.testlet.TestHarness;
+
+/**
+ * Checks whether the DefaultBoundedRangeModel.toString
+ * method works correctly.
+ *
+ * @author Sascha Brawer (brawer@dandelis.ch)
+ */
+public class general
+  implements Testlet
+{
+  public void test(TestHarness harness)
+  {
+    javax.swing.DefaultBoundedRangeModel dbrm;
+    Throwable caught;
+
+    // Check #1.
+    dbrm = new javax.swing.DefaultBoundedRangeModel();
+    setRangeProperties.check(harness, dbrm, 0, 0, 0, 100, false);
+
+    // Check #2.
+    dbrm = new javax.swing.DefaultBoundedRangeModel(5, 2, -1234, 4321);
+    setRangeProperties.check(harness, dbrm, 5, 2, -1234, 4321, false);
+
+    // Check #3.
+    caught = null;
+    try
+      {
+        dbrm = new javax.swing.DefaultBoundedRangeModel(-2, 0, 10, 20);
+      }
+    catch (Exception ex)
+      {
+        caught = ex;
+      }
+    harness.check(caught instanceof IllegalArgumentException);
+  }
+}
Index: gnu/testlet/javax/swing/DefaultBoundedRangeModel/serialization.java
===================================================================
RCS file: gnu/testlet/javax/swing/DefaultBoundedRangeModel/serialization.java
diff -N gnu/testlet/javax/swing/DefaultBoundedRangeModel/serialization.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/DefaultBoundedRangeModel/serialization.java	11 Jul 2006 15:11:00 -0000
@@ -0,0 +1,77 @@
+/* serialization.java -- some checks for object serialization.
+   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.DefaultBoundedRangeModel;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+
+import javax.swing.DefaultBoundedRangeModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class serialization implements Testlet, ChangeListener
+{
+  public void stateChanged(ChangeEvent e) 
+  {
+    // TODO Auto-generated method stub
+  }
+
+  public void test(TestHarness harness)
+  {
+      DefaultBoundedRangeModel m1 = new DefaultBoundedRangeModel(1, 2, 0, 99);
+      m1.addChangeListener(this);
+      DefaultBoundedRangeModel m2 = null;
+
+      try {
+          ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+          ObjectOutput out = new ObjectOutputStream(buffer);
+          out.writeObject(m1);
+          out.close();
+
+          ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(
+                  buffer.toByteArray()));
+          m2 = (DefaultBoundedRangeModel) in.readObject();
+          in.close();
+      }
+      catch (Exception e) {
+          e.printStackTrace();
+      }
+           
+      harness.check(m1.getValue(), m2.getValue());
+      harness.check(m1.getMinimum(), m2.getMinimum());
+      harness.check(m1.getMaximum(), m2.getMaximum());
+      harness.check(m1.getExtent(), m2.getExtent());
+      
+      // the listeners are not restored
+      harness.check(m1.getChangeListeners().length, 1);
+      harness.check(m2.getChangeListeners().length, 0);
+  }
+}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]