FYI: new ScrollPane test

FYI: new ScrollPane test

[Thomas Fitzsimmons]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

Hi,

I committed and expanded a new test:

gnu/testlet/java/awt/ScrollPane/add.java

in two separate commits.  Patches attached.

Tom

2006-12-05  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/testlet/java/awt/ScrollPane/add.java: New test.

2006-12-06  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/testlet/java/awt/ScrollPane/add.java: Expand test.

[-- Attachment #2: mauve-scrollpane-add.patch --]
[-- Type: text/x-patch, Size: 1751 bytes --]

Index: gnu/testlet/java/awt/ScrollPane/add.java
===================================================================
RCS file: gnu/testlet/java/awt/ScrollPane/add.java
diff -N gnu/testlet/java/awt/ScrollPane/add.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/awt/ScrollPane/add.java	5 Dec 2006 23:31:58 -0000
@@ -0,0 +1,53 @@
+// Tags: 1.4
+
+// Copyright (C) 2006 Red Hat
+
+// 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.java.awt.ScrollPane;
+
+import java.awt.*;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+/**
+ * Test whether adding a child to a ScrollPane causes layout to be
+ * called.
+ */
+public class add implements Testlet
+{
+  private static boolean layoutCalled;
+
+  public void test(TestHarness harness)
+  {
+    ScrollPane pane = new ScrollPane()
+      {
+        public void layout()
+        {
+          layoutCalled = true;
+        };
+      };
+
+    Button child = new Button ("Hello");
+
+    pane.add(child);
+
+    harness.check(!layoutCalled);
+  }
+}

[-- Attachment #3: mauve-scrollpane-add-2.patch --]
[-- Type: text/x-patch, Size: 1999 bytes --]

Index: gnu/testlet/java/awt/ScrollPane/add.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/awt/ScrollPane/add.java,v
retrieving revision 1.1
diff -u -r1.1 add.java
--- gnu/testlet/java/awt/ScrollPane/add.java	5 Dec 2006 23:32:58 -0000	1.1
+++ gnu/testlet/java/awt/ScrollPane/add.java	6 Dec 2006 19:09:36 -0000
@@ -27,8 +27,7 @@
 import gnu.testlet.Testlet;
 
 /**
- * Test whether adding a child to a ScrollPane causes layout to be
- * called.
+ * Test ScrollPane's add method.
  */
 public class add implements Testlet
 {
@@ -36,7 +35,7 @@
 
   public void test(TestHarness harness)
   {
-    ScrollPane pane = new ScrollPane()
+    ScrollPane pane = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS)
       {
         public void layout()
         {
@@ -44,10 +43,53 @@
         };
       };
 
-    Button child = new Button ("Hello");
+    Button b = new Button ("Hello");
+    b.setSize(400, 400);
+    pane.add(b);
 
-    pane.add(child);
+    harness.check(!layoutCalled);
+
+    Frame f = new Frame("add");
+
+    f.setSize(300, 300);
+    f.add(pane);
 
     harness.check(!layoutCalled);
+
+    f.show();
+
+    harness.check(layoutCalled);
+
+    harness.check(!(b.getParent() instanceof Panel));
+
+    // Check parent when adding a Panel.
+    ScrollPane pane2 = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
+
+    Frame f2 = new Frame("add2");
+
+    Panel p = new Panel();
+
+    p.setSize(400, 400);
+    pane2.add(p);
+    f2.setSize(300, 300);
+    f2.add(pane2);
+
+    f2.show();
+    harness.check(!(p.getParent() instanceof Panel));
+
+    // Check parent when adding a lightweight component.
+    ScrollPane pane3 = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
+
+    Frame f3 = new Frame("add2");
+
+    Component c = new Component() {};
+
+    c.setSize(400, 400);
+    pane3.add(c);
+    f3.setSize(300, 300);
+    f3.add(pane3);
+
+    f3.show();
+    harness.check(c.getParent() instanceof Panel);
   }
 }