This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
FYI: MetalIconFactory tests
- From: David Gilbert <david dot gilbert at object-refinery dot com>
- To: mauve-patches <mauve-patches at sources dot redhat dot com>
- Date: Fri, 07 Jul 2006 12:56:55 +0100
- Subject: FYI: MetalIconFactory tests
This patch (committed) updates most of the icon tests to check that the
UIResource interface is implemented:
2006-07-07 David Gilbert <david.gilbert@object-refinery.com>
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxIcon.java
(test): Add check for UIResource,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxMenuItemIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserDetailViewIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserHomeFolderIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserListViewIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserNewFolderIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserUpFolderIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getHorizontalSliderThumbIcon.java
(test): Add check for UIResource, change test for cached result,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameAltMaximizeIcon.java
(test): Add check for UIResource,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameCloseIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameDefaultMenuIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMaximizeIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMinimizeIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuArrowIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuItemArrowIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonMenuItemIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeComputerIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeControlIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFloppyDriveIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFolderIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeHardDriveIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeLeafIcon.java
(test): Likewise,
*
gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getVerticalSliderThumbIcon.java
(test): Add check for UIResource, change test for cached result.
Regards,
Dave
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getCheckBoxIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,7 +44,8 @@
Icon icon = MetalIconFactory.getCheckBoxIcon();
harness.check(icon.getIconWidth(), 13);
harness.check(icon.getIconHeight(), 13);
-
+ harness.check(icon instanceof UIResource);
+
// check that a shared instance is returned
Icon icon2 = MetalIconFactory.getCheckBoxIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxMenuItemIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxMenuItemIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getCheckBoxMenuItemIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxMenuItemIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getCheckBoxMenuItemIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getCheckBoxMenuItemIcon();
harness.check(icon.getIconWidth(), 10);
harness.check(icon.getIconHeight(), 10);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getCheckBoxMenuItemIcon();
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserDetailViewIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserDetailViewIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getFileChooserDetailViewIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserDetailViewIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserDetailViewIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getFileChooserDetailViewIcon();
harness.check(icon.getIconWidth(), 18);
harness.check(icon.getIconHeight(), 18);
+ harness.check(icon instanceof UIResource);
// check that the method returns a shared instance
Icon icon2 = MetalIconFactory.getFileChooserDetailViewIcon();
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserHomeFolderIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserHomeFolderIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getFileChooserHomeFolderIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserHomeFolderIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserHomeFolderIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getFileChooserHomeFolderIcon();
harness.check(icon.getIconWidth(), 18);
harness.check(icon.getIconHeight(), 18);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getFileChooserHomeFolderIcon();
harness.check(icon == icon2);
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserListViewIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserListViewIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getFileChooserListViewIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserListViewIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserListViewIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getFileChooserListViewIcon();
harness.check(icon.getIconWidth(), 18);
harness.check(icon.getIconHeight(), 18);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getFileChooserListViewIcon();
harness.check(icon == icon2);
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserNewFolderIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserNewFolderIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getFileChooserNewFolderIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserNewFolderIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserNewFolderIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getFileChooserNewFolderIcon();
harness.check(icon.getIconWidth(), 18);
harness.check(icon.getIconHeight(), 18);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getFileChooserNewFolderIcon();
harness.check(icon == icon2);
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserUpFolderIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserUpFolderIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getFileChooserUpFolderIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserUpFolderIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getFileChooserUpFolderIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getFileChooserUpFolderIcon();
harness.check(icon.getIconWidth(), 18);
harness.check(icon.getIconHeight(), 18);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getFileChooserUpFolderIcon();
harness.check(icon == icon2);
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getHorizontalSliderThumbIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getHorizontalSliderThumbIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getHorizontalSliderThumbIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getHorizontalSliderThumbIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getHorizontalSliderThumbIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,10 +44,11 @@
Icon icon = MetalIconFactory.getHorizontalSliderThumbIcon();
harness.check(icon.getIconWidth(), 15);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
- // check that a new instance is returned each time
+ // check that the same instance is returned each time
Icon icon2 = MetalIconFactory.getHorizontalSliderThumbIcon();
- harness.check(icon != icon2);
+ harness.check(icon == icon2);
}
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameAltMaximizeIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameAltMaximizeIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getInternalFrameAltMaximizeIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameAltMaximizeIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameAltMaximizeIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getInternalFrameAltMaximizeIcon(12);
harness.check(icon.getIconWidth(), 12);
harness.check(icon.getIconHeight(), 12);
+ harness.check(icon instanceof UIResource);
// check that a new instance is returned each time
Icon icon2 = MetalIconFactory.getInternalFrameAltMaximizeIcon(12);
harness.check(icon != icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameCloseIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameCloseIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getInternalFrameCloseIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameCloseIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameCloseIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,8 @@
Icon icon = MetalIconFactory.getInternalFrameCloseIcon(8);
harness.check(icon.getIconWidth(), 8);
harness.check(icon.getIconHeight(), 8);
+ harness.check(icon instanceof UIResource);
+
// check that a new instance is returned each time
Icon icon2 = MetalIconFactory.getInternalFrameCloseIcon(8);
harness.check(icon != icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameDefaultMenuIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameDefaultMenuIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getInternalFrameDefaultMenuIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameDefaultMenuIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameDefaultMenuIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getInternalFrameDefaultMenuIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getInternalFrameDefaultMenuIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMaximizeIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMaximizeIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getInternalFrameMaximizeIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMaximizeIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMaximizeIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getInternalFrameMaximizeIcon(16);
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
// check that a new instance is returned each time
Icon icon2 = MetalIconFactory.getInternalFrameMaximizeIcon(16);
harness.check(icon != icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMinimizeIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMinimizeIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getInternalFrameMinimizeIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMinimizeIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getInternalFrameMinimizeIcon.java 7 Jul 2006 11:45:35 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getInternalFrameMinimizeIcon(16);
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
// check that a new instance is returned each time
Icon icon2 = MetalIconFactory.getInternalFrameMinimizeIcon(16);
harness.check(icon != icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuArrowIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuArrowIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getMenuArrowIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuArrowIcon.java 23 Nov 2005 20:26:18 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuArrowIcon.java 7 Jul 2006 11:45:35 -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.
@@ -27,6 +27,7 @@
import javax.swing.Icon;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
import javax.swing.plaf.metal.MetalLookAndFeel;
@@ -47,6 +48,7 @@
Icon icon = MetalIconFactory.getMenuArrowIcon();
harness.check(icon.getIconWidth(), 4);
harness.check(icon.getIconHeight(), 8);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getMenuArrowIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuItemArrowIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuItemArrowIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getMenuItemArrowIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuItemArrowIcon.java 23 Nov 2005 20:26:18 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getMenuItemArrowIcon.java 7 Jul 2006 11:45:36 -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.
@@ -27,6 +27,7 @@
import javax.swing.Icon;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
import javax.swing.plaf.metal.MetalLookAndFeel;
@@ -47,6 +48,7 @@
Icon icon = MetalIconFactory.getMenuItemArrowIcon();
harness.check(icon.getIconWidth(), 4);
harness.check(icon.getIconHeight(), 8);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getMenuItemArrowIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getRadioButtonIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getRadioButtonIcon();
harness.check(icon.getIconWidth(), 13);
harness.check(icon.getIconHeight(), 13);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getRadioButtonIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonMenuItemIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonMenuItemIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getRadioButtonMenuItemIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonMenuItemIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getRadioButtonMenuItemIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getRadioButtonMenuItemIcon();
harness.check(icon.getIconWidth(), 10);
harness.check(icon.getIconHeight(), 10);
+ harness.check(icon instanceof UIResource);
// check that a shared instance is returned each time
Icon icon2 = MetalIconFactory.getRadioButtonMenuItemIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeComputerIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeComputerIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getTreeComputerIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeComputerIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeComputerIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getTreeComputerIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
// check that the method returns a shared instance...
Icon icon2 = MetalIconFactory.getTreeComputerIcon();
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeControlIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeControlIcon.java,v
retrieving revision 1.2
diff -u -r1.2 getTreeControlIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeControlIcon.java 12 Oct 2005 13:05:57 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeControlIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,9 +44,11 @@
Icon icon1 = MetalIconFactory.getTreeControlIcon(false);
harness.check(icon1.getIconWidth(), 18);
harness.check(icon1.getIconHeight(), 18);
+ harness.check(!(icon1 instanceof UIResource));
Icon icon2 = MetalIconFactory.getTreeControlIcon(true);
harness.check(icon2.getIconWidth(), 18);
harness.check(icon2.getIconHeight(), 18);
+ harness.check(!(icon2 instanceof UIResource));
}
}
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFloppyDriveIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFloppyDriveIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getTreeFloppyDriveIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFloppyDriveIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFloppyDriveIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getTreeFloppyDriveIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getTreeFloppyDriveIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFolderIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFolderIcon.java,v
retrieving revision 1.2
diff -u -r1.2 getTreeFolderIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFolderIcon.java 12 Oct 2005 13:05:57 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeFolderIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getTreeFolderIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 18);
+ harness.check(!(icon instanceof UIResource));
// check that the method returns a new instance each time
Icon icon2 = MetalIconFactory.getTreeFolderIcon();
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeHardDriveIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeHardDriveIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getTreeHardDriveIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeHardDriveIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeHardDriveIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getTreeHardDriveIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 16);
+ harness.check(icon instanceof UIResource);
Icon icon2 = MetalIconFactory.getTreeHardDriveIcon();
harness.check(icon == icon2);
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeLeafIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeLeafIcon.java,v
retrieving revision 1.2
diff -u -r1.2 getTreeLeafIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeLeafIcon.java 12 Oct 2005 13:05:57 -0000 1.2
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getTreeLeafIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,6 +44,7 @@
Icon icon = MetalIconFactory.getTreeLeafIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 20);
+ harness.check(!(icon instanceof UIResource));
// check that a new instance is returned each time
Icon icon2 = MetalIconFactory.getTreeLeafIcon();
Index: gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getVerticalSliderThumbIcon.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getVerticalSliderThumbIcon.java,v
retrieving revision 1.1
diff -u -r1.1 getVerticalSliderThumbIcon.java
--- gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getVerticalSliderThumbIcon.java 12 Oct 2005 13:05:57 -0000 1.1
+++ gnu/testlet/javax/swing/plaf/metal/MetalIconFactory/getVerticalSliderThumbIcon.java 7 Jul 2006 11:45:36 -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.
@@ -25,6 +25,7 @@
import gnu.testlet.Testlet;
import javax.swing.Icon;
+import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalIconFactory;
/**
@@ -43,9 +44,11 @@
Icon icon = MetalIconFactory.getVerticalSliderThumbIcon();
harness.check(icon.getIconWidth(), 16);
harness.check(icon.getIconHeight(), 15);
- // check that a new instance is returned each time
+ harness.check(icon instanceof UIResource);
+
+ // check that the same instance is returned each time
Icon icon2 = MetalIconFactory.getVerticalSliderThumbIcon();
- harness.check(icon != icon2);
+ harness.check(icon == icon2);
}
}