FYI: Fixed BasicScrollBarUI tests

["Roman Kennke" <roman dot kennke at aicas dot com>]

I fixed a couple of BasicScrollBarUI tests to test for the JDK1.5
behaviour. Obviously Sun fixed a bug in JDK1.5. Before, the scrollbar
buttons have been created in installDefaults, in JDK1.5 they are created
in installComponents (and rightly so).

I changed the tag for the affected tests to JDK1.5.


2006-02-01  Roman Kennke  <kennke@aicas.com>

        *
gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installDefaults.java:
        (testIncrButton): Fixed to test the JDK1.5 behaviour, which is
        to not install any button in the installDefaults method.
        (testDecrButton): Fixed to test the JDK1.5 behaviour, which is
        to not install any button in the installDefaults method.
        *
gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installComponents.java:
        New test. Checks if the ScrollBar buttons are created here.
        *
gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/MyBasicScrollBarUI.java:
        Added installComponents() method to make protected method visible.

/Roman

Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/MyBasicScrollBarUI.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/MyBasicScrollBarUI.java,v
retrieving revision 1.2
diff -u -r1.2 MyBasicScrollBarUI.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/MyBasicScrollBarUI.java	27 Oct 2005 11:49:17 -0000	1.2
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/MyBasicScrollBarUI.java	1 Feb 2006 11:14:15 -0000
@@ -82,6 +82,14 @@
   }
 
   /**
+   * Overrides installComponents() to enable public access in tests.
+   */
+  public void installComponents()
+  {
+    super.installComponents();
+  }
+
+  /**
    * Returns the value of the (otherwise protected) field incrButton.
    *
    * @return the value of the incrButton field
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installComponents.java
===================================================================
RCS file: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installComponents.java
diff -N gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installComponents.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installComponents.java	1 Feb 2006 11:14:15 -0000
@@ -0,0 +1,77 @@
+// Tags: JDK1.5
+
+// Copyright (C) 2006 Roman Kennke <kennke@aicas.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.
+
+package gnu.testlet.javax.swing.plaf.basic.BasicScrollBarUI;
+
+import javax.swing.JScrollBar;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+/**
+ * Tests if installComponents() works correctly. ATM we check if the fields
+ * incrButton and decrButton are initialized within this method, since we had
+ * a bug with this. There is certainly more that could be checked here.
+ *
+ * @author Roman Kennke (kennke@aicas.com)
+ */
+public class installComponents implements Testlet
+{
+
+  /**
+   * Starts the test run.
+   *
+   * @param harness the test harness to use
+   */
+  public void test(TestHarness harness)
+  {
+    testIncrButton(harness);
+    testDecrButton(harness);
+  }
+
+  /**
+   * Tests if the incrButton field is initialized in this method.
+   *
+   * @param harness the test harness to use
+   */
+  private void testIncrButton(TestHarness harness)
+  {
+    MyBasicScrollBarUI ui = new MyBasicScrollBarUI();
+    ui.setScrollbar(new JScrollBar());
+    harness.check(ui.getIncrButton(), null);
+    ui.installComponents();
+    harness.check(ui.getIncrButton() != null);
+  }
+
+  /**
+   * Tests if the decrButton field is initialized in this method.
+   *
+   * @param harness the test harness to use
+   */
+  private void testDecrButton(TestHarness harness)
+  {
+    MyBasicScrollBarUI ui = new MyBasicScrollBarUI();
+    ui.setScrollbar(new JScrollBar());
+    harness.check(ui.getDecrButton(), null);
+    ui.installComponents();
+    harness.check(ui.getDecrButton() != null);
+  }
+}
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installDefaults.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installDefaults.java,v
retrieving revision 1.1
diff -u -r1.1 installDefaults.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installDefaults.java	27 Oct 2005 11:49:17 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/installDefaults.java	1 Feb 2006 11:14:15 -0000
@@ -1,4 +1,4 @@
-// Tags: JDK1.2
+// Tags: JDK1.5
 
 // Copyright (C) 2005 Roman Kennke <kennke@aicas.com>
 
@@ -58,7 +58,7 @@
     ui.setScrollbar(new JScrollBar());
     harness.check(ui.getIncrButton(), null);
     ui.installDefaults();
-    harness.check(ui.getIncrButton() != null);
+    harness.check(ui.getIncrButton(), null);
   }
 
   /**
@@ -72,6 +72,6 @@
     ui.setScrollbar(new JScrollBar());
     harness.check(ui.getDecrButton(), null);
     ui.installDefaults();
-    harness.check(ui.getDecrButton() != null);
+    harness.check(ui.getDecrButton(), null);
   }
 }