This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
FYI: MenuBarBorder/ToolBarBorder test fixes
- From: David Gilbert <david dot gilbert at object-refinery dot com>
- To: mauve-patches at sources dot redhat dot com
- Date: Wed, 01 Feb 2006 10:30:13 +0000
- Subject: FYI: MenuBarBorder/ToolBarBorder test fixes
The expected results for these tests depend on the MetalLookAndFeel and
DefaultMetalTheme being used, so this patch sets that up explicitly:
2006-02-01 David Gilbert <david.gilbert@object-refinery.com>
*
gnu/testlet/javax/swing/plaf/metal/MetalBorders/MenuBarBorder/getBorderInsets.java
(test1): Use MetalLookAndFeel with DefaultMetalTheme,
(test2): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalBorders/ToolBarBorder/getBorderInsets.java
(test1): Use MetalLookAndFeel with DefaultMetalTheme,
(test2): Likewise.
Regards,
Dave
Index: gnu/testlet/javax/swing/plaf/metal/MetalBorders/MenuBarBorder/getBorderInsets.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalBorders/MenuBarBorder/getBorderInsets.java,v
retrieving revision 1.1
diff -u -r1.1 getBorderInsets.java
--- gnu/testlet/javax/swing/plaf/metal/MetalBorders/MenuBarBorder/getBorderInsets.java 13 Sep 2005 19:37:53 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalBorders/MenuBarBorder/getBorderInsets.java 1 Feb 2006 10:23:51 -0000
@@ -1,6 +1,6 @@
// Tags: JDK1.4
-// 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.
@@ -16,8 +16,8 @@
// 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. */
+// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301 USA.
package gnu.testlet.javax.swing.plaf.metal.MetalBorders.MenuBarBorder;
@@ -26,6 +26,10 @@
import java.awt.Insets;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.plaf.metal.MetalBorders.MenuBarBorder;
/**
@@ -49,6 +53,16 @@
public void test1(TestHarness harness)
{
harness.checkPoint("getBorderInsets(Component)");
+ // test with DefaultMetalTheme
+ try
+ {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ }
+ catch (UnsupportedLookAndFeelException e)
+ {
+ e.printStackTrace();
+ }
MenuBarBorder b = new MenuBarBorder();
Insets insets = b.getBorderInsets(null);
harness.check(insets, new Insets(1, 0, 1, 0));
@@ -57,6 +71,16 @@
public void test2(TestHarness harness)
{
harness.checkPoint("getBorderInsets(Component, Insets)");
+ // test with DefaultMetalTheme
+ try
+ {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ }
+ catch (UnsupportedLookAndFeelException e)
+ {
+ e.printStackTrace();
+ }
MenuBarBorder b = new MenuBarBorder();
Insets insets = b.getBorderInsets(null, new Insets(1, 2, 3, 4));
harness.check(insets, new Insets(1, 0, 1, 0));
Index: gnu/testlet/javax/swing/plaf/metal/MetalBorders/ToolBarBorder/getBorderInsets.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalBorders/ToolBarBorder/getBorderInsets.java,v
retrieving revision 1.1
diff -u -r1.1 getBorderInsets.java
--- gnu/testlet/javax/swing/plaf/metal/MetalBorders/ToolBarBorder/getBorderInsets.java 30 Sep 2005 21:23:55 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalBorders/ToolBarBorder/getBorderInsets.java 1 Feb 2006 10:23:51 -0000
@@ -1,6 +1,6 @@
// Tags: JDK1.4
-// 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.
@@ -16,8 +16,8 @@
// 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. */
+// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301 USA.
package gnu.testlet.javax.swing.plaf.metal.MetalBorders.ToolBarBorder;
@@ -27,6 +27,10 @@
import java.awt.Insets;
import javax.swing.JToolBar;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.plaf.metal.MetalBorders.ToolBarBorder;
/**
@@ -50,6 +54,16 @@
public void test1(TestHarness harness)
{
harness.checkPoint("getBorderInsets(Component)");
+ // test with DefaultMetalTheme
+ try
+ {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ }
+ catch (UnsupportedLookAndFeelException e)
+ {
+ e.printStackTrace();
+ }
ToolBarBorder b = new ToolBarBorder();
JToolBar tb = new JToolBar(JToolBar.HORIZONTAL);
Insets insets1 = b.getBorderInsets(tb);
@@ -62,6 +76,16 @@
public void test2(TestHarness harness)
{
harness.checkPoint("getBorderInsets(Component, Insets)");
+ // test with DefaultMetalTheme
+ try
+ {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ }
+ catch (UnsupportedLookAndFeelException e)
+ {
+ e.printStackTrace();
+ }
JToolBar tb = new JToolBar(JToolBar.HORIZONTAL);
ToolBarBorder b = new ToolBarBorder();
Insets insets = b.getBorderInsets(tb, new Insets(1, 2, 3, 4));