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: BasicScrollBarUI tests


These tests set a TestLookAndFeel which can interfere with other tests that are run subsequently, so this patch cleans up by setting the MetalLookAndFeel at the end:

2006-02-01 David Gilbert <david.gilbert@object-refinery.com>

* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/constructor.java
(test): Set MetalLookAndFeel at end of test,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumSize.java
(test): Likewise,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumThumbSize.java
(test): Likewise,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumSize.java
(test): Likewise,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumThumbSize.java
(test): Likewise,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getPreferredSize.java
(test): Likewise,
* gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/layoutContainer.java
(test): Likewise.


Regards,

Dave
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/constructor.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/constructor.java,v
retrieving revision 1.1
diff -u -r1.1 constructor.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/constructor.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/constructor.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -32,6 +32,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the constructor in the {@link BasicScrollBarUI} class.  
@@ -78,6 +79,17 @@
     ui.layoutContainer(scrollBar);
     harness.check(ui.getTrackBounds(), new Rectangle(16, 0, 68, 20));    
     harness.check(ui.getThumbBounds(), new Rectangle(16, 0, 8, 20));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumSize.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumSize.java,v
retrieving revision 1.1
diff -u -r1.1 getMaximumSize.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumSize.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumSize.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the getMaximumSize() method in the {@link BasicScrollBarUI} 
@@ -68,6 +69,16 @@
     scrollBar2.setUI(ui2);
     harness.check(ui2.getMaximumSize(scrollBar2), 
             new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumThumbSize.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumThumbSize.java,v
retrieving revision 1.1
diff -u -r1.1 getMaximumThumbSize.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumThumbSize.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMaximumThumbSize.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the getMaximumThumbSize() method in the 
@@ -66,6 +67,16 @@
     JScrollBar scrollBar2 = new JScrollBar(JScrollBar.VERTICAL);
     scrollBar2.setUI(ui2);
     harness.check(ui2.getMaximumThumbSize(), new Dimension(4096, 4096));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumSize.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumSize.java,v
retrieving revision 1.1
diff -u -r1.1 getMinimumSize.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumSize.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumSize.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the getMinimumSize() method in the {@link BasicScrollBarUI} 
@@ -66,6 +67,16 @@
     JScrollBar scrollBar2 = new JScrollBar(JScrollBar.VERTICAL);
     scrollBar2.setUI(ui2);
     harness.check(ui2.getMinimumSize(scrollBar2), new Dimension(16, 48));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumThumbSize.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumThumbSize.java,v
retrieving revision 1.1
diff -u -r1.1 getMinimumThumbSize.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumThumbSize.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getMinimumThumbSize.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the getMinimumThumbSize() method in the 
@@ -66,6 +67,16 @@
     JScrollBar scrollBar2 = new JScrollBar(JScrollBar.VERTICAL);
     scrollBar2.setUI(ui2);
     harness.check(ui2.getMinimumThumbSize(), new Dimension(8, 8));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getPreferredSize.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getPreferredSize.java,v
retrieving revision 1.1
diff -u -r1.1 getPreferredSize.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getPreferredSize.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/getPreferredSize.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the getPreferredSize() method in the {@link BasicScrollBarUI} 
@@ -66,6 +67,16 @@
     JScrollBar scrollBar2 = new JScrollBar(JScrollBar.VERTICAL);
     scrollBar2.setUI(ui2);
     harness.check(ui2.getPreferredSize(scrollBar2), new Dimension(16, 48));
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
   }
 
 }
Index: gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/layoutContainer.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/layoutContainer.java,v
retrieving revision 1.1
diff -u -r1.1 layoutContainer.java
--- gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/layoutContainer.java	24 Oct 2005 21:16:06 -0000	1.1
+++ gnu/testlet/javax/swing/plaf/basic/BasicScrollBarUI/layoutContainer.java	1 Feb 2006 14:39:44 -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>
 
 // This file is part of Mauve.
 
@@ -30,6 +30,7 @@
 import javax.swing.JScrollBar;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicScrollBarUI;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 /**
  * Some checks for the layoutContainer() method in the 
@@ -56,6 +57,17 @@
     }
     testHorizontal(harness);
     testVertical(harness);
+    
+    // restore a sane look and feel
+    try
+    {
+      UIManager.setLookAndFeel(new MetalLookAndFeel());
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
   }
   
   public void testHorizontal(TestHarness harness)  

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