You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/05 10:35:05 UTC
svn commit: r951676 [11/20] - in /harmony/enhanced/java/branches/mrh:
classlib/make/ classlib/modules/accessibility/make/
classlib/modules/annotation/make/ classlib/modules/applet/make/
classlib/modules/archive/make/ classlib/modules/auth/make/ classli...
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java Sat Jun 5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.GridLayout;
import javax.swing.plaf.ComboBoxUI;
-import tests.support.Support_Excludes;
public class LayoutFocusTraversalPolicyTest extends BasicSwingTestCase {
private LayoutFocusTraversalPolicy policy;
@@ -64,10 +63,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testAccept() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
frame.setVisible(true);
SwingWaitTestCase.isRealized(frame);
Component invisible = new JPanel();
@@ -108,10 +103,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetComponentBefore() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
assertEquals(button1, policy.getComponentBefore(cycleRoot, button2));
assertEquals(button2, policy.getComponentBefore(cycleRoot, button3));
@@ -125,10 +116,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetComponentBefore_Null() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
try {
@@ -154,10 +141,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetComponentAfter() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
assertEquals(button1, policy.getComponentAfter(cycleRoot, button4));
assertEquals(button2, policy.getComponentAfter(cycleRoot, button1));
@@ -171,10 +154,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetComponentAfter_Null() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
try {
@@ -200,10 +179,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetLastComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
assertEquals(button1, policy.getLastComponent(cycleRoot));
cycleRoot = createTestPanel(ComponentOrientation.RIGHT_TO_LEFT);
@@ -211,10 +186,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetLastComponent_Null() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
try {
@@ -226,10 +197,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetFirstComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
assertEquals(button2, policy.getFirstComponent(cycleRoot));
cycleRoot = createTestPanel(ComponentOrientation.RIGHT_TO_LEFT);
@@ -237,10 +204,6 @@ public class LayoutFocusTraversalPolicyT
}
public void testGetFirstComponent_Null() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
try {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java Sat Jun 5 08:34:57 2010
@@ -33,7 +33,6 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import javax.swing.border.EmptyBorder;
-import tests.support.Support_Excludes;
public class OverlayLayoutTest extends SwingTestCase {
protected OverlayLayout layout = null;
@@ -43,10 +42,6 @@ public class OverlayLayoutTest extends S
}
public void testOverlayLayout() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
boolean thrown = false;
try {
@@ -68,10 +63,6 @@ public class OverlayLayoutTest extends S
* Class under test for void addLayoutComponent(Component, Object)
*/
public void testAddLayoutComponentComponentObject() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -96,10 +87,6 @@ public class OverlayLayoutTest extends S
}
public void testPreferredLayoutSize() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -151,10 +138,6 @@ public class OverlayLayoutTest extends S
}
public void testMinimumLayoutSize() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -206,10 +189,6 @@ public class OverlayLayoutTest extends S
}
public void testMaximumLayoutSize() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -264,10 +243,6 @@ public class OverlayLayoutTest extends S
* Class under test for void addLayoutComponent(String, Component)
*/
public void testAddLayoutComponentStringComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -304,10 +279,6 @@ public class OverlayLayoutTest extends S
}
public void testLayoutContainer1() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -357,10 +328,6 @@ public class OverlayLayoutTest extends S
@SuppressWarnings("deprecation")
public void testLayoutContainer2() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JWindow window = new JWindow();
JComponent panel = new JPanel();
JComponent panel1 = new JPanel();
@@ -395,10 +362,6 @@ public class OverlayLayoutTest extends S
}
public void testInvalidateLayout() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -421,10 +384,6 @@ public class OverlayLayoutTest extends S
}
public void testGetLayoutAlignmentY() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -463,10 +422,6 @@ public class OverlayLayoutTest extends S
}
public void testGetLayoutAlignmentX() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -505,10 +460,6 @@ public class OverlayLayoutTest extends S
}
public void testRemoveLayoutComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
JComponent component1 = new JPanel();
JComponent component2 = new JPanel();
@@ -540,10 +491,6 @@ public class OverlayLayoutTest extends S
// Layout sharing testcases and so on
public void testSharingLayout() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
layout = new OverlayLayout(container);
boolean thrown = false;
@@ -619,10 +566,6 @@ public class OverlayLayoutTest extends S
}
public void testWriteObject() throws IOException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new JPanel();
OverlayLayout layout1 = new OverlayLayout(container);
ByteArrayOutputStream fo = new ByteArrayOutputStream();
@@ -632,10 +575,6 @@ public class OverlayLayoutTest extends S
}
public void testReadObject() throws ClassNotFoundException, IOException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = new Panel();
OverlayLayout layout1 = new OverlayLayout(container);
ByteArrayOutputStream fo = new ByteArrayOutputStream();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java Sat Jun 5 08:34:57 2010
@@ -19,18 +19,12 @@
*/
package javax.swing;
-import tests.support.Support_Excludes;
-
public class PopupFactoryRTest extends BasicSwingTestCase {
public PopupFactoryRTest(final String name) {
super(name);
}
public void testGetPopup() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Popup p1 = PopupFactory.getSharedInstance().getPopup(null, new JPanel(), 10, 10);
p1.show();
p1.hide();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java Sat Jun 5 08:34:57 2010
@@ -20,7 +20,6 @@
package javax.swing;
import java.awt.Window;
-import tests.support.Support_Excludes;
public class PopupFactoryTest extends BasicSwingTestCase {
public PopupFactoryTest(final String name) {
@@ -28,10 +27,6 @@ public class PopupFactoryTest extends Ba
}
public void testGetSetSharedInstance() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNotNull(PopupFactory.getSharedInstance());
PopupFactory factory = new PopupFactory();
PopupFactory.setSharedInstance(factory);
@@ -45,10 +40,6 @@ public class PopupFactoryTest extends Ba
}
public void testGetPopup() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JButton content1 = new JButton();
Popup p1 = PopupFactory.getSharedInstance().getPopup(null, content1, 10, 10);
p1.show();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java Sat Jun 5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing;
import java.awt.Component;
import java.awt.Point;
-import tests.support.Support_Excludes;
public class PopupTest extends BasicSwingTestCase {
private Popup popup;
@@ -36,10 +35,6 @@ public class PopupTest extends BasicSwin
}
public void testPopup() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component content = new JButton("content");
assertNull(content.getParent());
popup = new Popup(null, content, 10, 10);
@@ -76,10 +71,6 @@ public class PopupTest extends BasicSwin
}
public void testShowHide() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component content = new JButton("content");
assertNull(SwingUtilities.getWindowAncestor(content));
popup = new Popup(null, content, 100, 200);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java Sat Jun 5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
-import tests.support.Support_Excludes;
public class ProgressMonitorInputStreamTest extends BasicSwingTestCase {
private JFrame window;
@@ -67,10 +66,6 @@ public class ProgressMonitorInputStreamT
}
public void testProgressMonitorInputStream() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
assertNotNull(in.getProgressMonitor());
in.read();
@@ -81,10 +76,6 @@ public class ProgressMonitorInputStreamT
}
public void testMaximum() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
in = new ProgressMonitorInputStream(window, "Here we go...", new ErrorStream(realIn));
assertEquals(0, in.getProgressMonitor().getMaximum());
in.read();
@@ -96,10 +87,6 @@ public class ProgressMonitorInputStreamT
}
public void testReset() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
ProgressMonitor pm = in.getProgressMonitor();
in.read();
@@ -111,10 +98,6 @@ public class ProgressMonitorInputStreamT
}
public void testInterrupted() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
in.read();
Thread.sleep(600);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java Sat Jun 5 08:34:57 2010
@@ -20,7 +20,6 @@
package javax.swing;
import java.awt.event.WindowEvent;
-import tests.support.Support_Excludes;
public class ProgressMonitorTest extends BasicSwingTestCase {
private ProgressMonitor progressMonitor;
@@ -41,20 +40,12 @@ public class ProgressMonitorTest extends
}
public void testProgressMonitor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
assertEquals(progressMonitor.getMillisToDecideToPopup(), 500);
assertEquals(progressMonitor.getMillisToPopup(), 2000);
}
public void testSetProgress() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
assertEquals(0, window.getOwnedWindows().length);
progressMonitor.setProgress(1);
@@ -78,10 +69,6 @@ public class ProgressMonitorTest extends
}
public void testGetSetMaximum() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 300);
progressMonitor.setProgress(1);
Thread.sleep(500 + 100);
@@ -95,10 +82,6 @@ public class ProgressMonitorTest extends
}
public void testGetSetMinimum() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 300);
progressMonitor.setProgress(1);
Thread.sleep(500 + 100);
@@ -112,10 +95,6 @@ public class ProgressMonitorTest extends
}
public void testIsCancelled() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
progressMonitor.setProgress(1);
Thread.sleep(500 + 100);
@@ -138,10 +117,6 @@ public class ProgressMonitorTest extends
}
public void testClose() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
progressMonitor.setProgress(1);
Thread.sleep(500 + 100);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java Sat Jun 5 08:34:57 2010
@@ -31,7 +31,6 @@ import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.InvocationEvent;
import org.apache.harmony.awt.ComponentInternals;
-import tests.support.Support_Excludes;
public class RepaintManagerTest extends BasicSwingTestCase {
private Dimension dbMaxSize;
@@ -54,10 +53,6 @@ public class RepaintManagerTest extends
}
public void testCurrentManager() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
RepaintManager inst1 = RepaintManager.currentManager(new JButton());
assertNotNull(inst1);
RepaintManager inst2 = RepaintManager.currentManager(new Button());
@@ -69,10 +64,6 @@ public class RepaintManagerTest extends
}
public void testSetCurrentManager() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
RepaintManager newInst = new RepaintManager();
RepaintManager.setCurrentManager(newInst);
assertTrue(RepaintManager.currentManager(null) == newInst);
@@ -82,10 +73,6 @@ public class RepaintManagerTest extends
}
public void testAddRemoveInvalidComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Frame f = new Frame();
final JPanel rootPanel = new JPanel(new BorderLayout()) {
private static final long serialVersionUID = 1L;
@@ -182,10 +169,6 @@ public class RepaintManagerTest extends
}
public void testValidateInvalidComponents() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Frame f = new Frame();
final JPanel rootPanel = new JPanel(new BorderLayout()) {
private static final long serialVersionUID = 1L;
@@ -230,10 +213,6 @@ public class RepaintManagerTest extends
}
public void testAddDirtyRegion() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel root = new JPanel(new BorderLayout());
JFrame f = new JFrame();
f.getContentPane().add(root);
@@ -269,10 +248,6 @@ public class RepaintManagerTest extends
}
public void testMarkCompletelyDirtyClean() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel root = new JPanel(new BorderLayout());
JFrame f = new JFrame();
f.getContentPane().add(root);
@@ -321,10 +296,6 @@ public class RepaintManagerTest extends
}
public void testIsCompletelyDirty() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel root = new JPanel(new BorderLayout());
JFrame f = new JFrame();
f.getContentPane().add(root);
@@ -367,10 +338,6 @@ public class RepaintManagerTest extends
}
public void testGetDirtyRegion() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel root = new JPanel(new BorderLayout());
JFrame f = new JFrame();
f.getContentPane().add(root);
@@ -400,10 +367,6 @@ public class RepaintManagerTest extends
}
public void testPaintDirtyRegions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Marker rootPaintMarker = new Marker();
final Marker rootPaintImmediatelyMarker = new Marker();
final JPanel root = new JPanel(null) {
@@ -620,20 +583,12 @@ public class RepaintManagerTest extends
}
public void testIsDoubleBufferingEnabled() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(RepaintManager.currentManager(null).isDoubleBufferingEnabled());
RepaintManager.currentManager(null).setDoubleBufferingEnabled(false);
assertFalse(RepaintManager.currentManager(null).isDoubleBufferingEnabled());
}
public void testGetDoubleBufferMaximumSize() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(Toolkit.getDefaultToolkit().getScreenSize(), RepaintManager
.currentManager(null).getDoubleBufferMaximumSize());
Dimension bufferSize = new Dimension(100, 100);
@@ -643,10 +598,6 @@ public class RepaintManagerTest extends
}
public void testGetOffscreenBuffer() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel root = new JPanel();
JFrame f = new JFrame();
f.getContentPane().add(root);
@@ -706,10 +657,6 @@ public class RepaintManagerTest extends
}
public void testGetVolatileOffscreenBuffer() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel root = new JPanel();
JFrame f = new JFrame();
f.getContentPane().add(root);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java Sat Jun 5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing;
import java.awt.Component;
import java.util.Comparator;
-import tests.support.Support_Excludes;
public class SortingFocusTraversalPolicyRTest extends BasicSwingTestCase {
private SortingFocusTraversalPolicy policy;
@@ -61,10 +60,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterInNonDisplayableHierarchy() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame f = new JFrame();
f.setVisible(true);
SwingWaitTestCase.isRealized(f);
@@ -85,10 +80,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeAfterNotAcceptable() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame f = new JFrame();
f.setVisible(true);
SwingWaitTestCase.isRealized(f);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java Sat Jun 5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing;
import java.awt.Component;
import java.util.Comparator;
-import tests.support.Support_Excludes;
@SuppressWarnings("unchecked")
public class SortingFocusTraversalPolicyTest extends BasicSwingTestCase {
@@ -65,30 +64,18 @@ public class SortingFocusTraversalPolicy
}
public void testSortingFocusTraversalPolicy() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Comparator cmp = new TestComparator();
policy = new SortingFocusTraversalPolicy(cmp);
assertEquals(cmp, policy.getComparator());
}
public void testSetComparator() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Comparator cmp = new TestComparator();
policy.setComparator(cmp);
assertEquals(cmp, policy.getComparator());
}
public void testAccept() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
frame.setVisible(true);
SwingWaitTestCase.isRealized(frame);
Component invisible = new JPanel();
@@ -111,10 +98,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeNoInnerCycleRoots() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -128,10 +111,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNotCycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -141,10 +120,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNullCycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -154,10 +129,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNullComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -173,10 +144,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterNoInnerCycleRoots() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame f = new JFrame();
f.setVisible(true);
SwingWaitTestCase.isRealized(f);
@@ -191,10 +158,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNotCycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -204,10 +167,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNullCycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -217,10 +176,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNullComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame f = new JFrame();
f.setVisible(true);
final JPanel cycleRoot = createPanelWithButtons();
@@ -236,10 +191,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetLastComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -250,10 +201,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetLastComponentForNotCycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -263,10 +210,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetFirstComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -277,10 +220,6 @@ public class SortingFocusTraversalPolicy
}
public void testGetDefaultComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -291,10 +230,6 @@ public class SortingFocusTraversalPolicy
}
public void testComponentIsInACycleRoot() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final JPanel cycleRoot = createPanelWithButtons();
JPanel innerCycleRoot = new JPanel();
innerCycleRoot.setName("9 - the latest");
@@ -316,10 +251,6 @@ public class SortingFocusTraversalPolicy
}
public void testInnerCycleRootsProcessingWithImplicitTraversal() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel cycleRoot = createPanelWithButtons();
JPanel innerCycleRoot = new JPanel();
innerCycleRoot.setName("9 - the latest");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java Sat Jun 5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import tests.support.Support_Excludes;
public class SpinnerDateModelTest extends BasicSwingTestCase {
private SpinnerDateModel model;
@@ -60,10 +59,6 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testSpinnerDateModel() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(model.getDate().getDay(), (now.getDay() + 1) % 7);
assertEquals(Calendar.DAY_OF_MONTH, model.getCalendarField());
assertNull(model.getStart());
@@ -95,10 +90,6 @@ public class SpinnerDateModelTest extend
}
public void testSetGetStart() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setStart(past);
assertTrue(chl.isChanged());
assertSame(past, model.getStart());
@@ -111,10 +102,6 @@ public class SpinnerDateModelTest extend
}
public void testSetGetEnd() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setEnd(future);
assertTrue(chl.isChanged());
assertSame(future, model.getEnd());
@@ -127,10 +114,6 @@ public class SpinnerDateModelTest extend
}
public void testSetGetValue() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setValue(now);
assertTrue(chl.isChanged());
assertNotSame(now, model.getValue());
@@ -157,20 +140,12 @@ public class SpinnerDateModelTest extend
}
public void testGetDate() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setValue(now);
assertNotSame(now, model.getDate());
assertEquals(model.getDate(), model.getValue());
}
public void testSetGetCalendarField() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setCalendarField(Calendar.ERA);
assertTrue(chl.isChanged());
assertEquals(Calendar.ERA, model.getCalendarField());
@@ -188,10 +163,6 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testGetNextValue() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setValue(now.clone());
model.setEnd(future);
now.setDate(now.getDate() + 1);
@@ -206,10 +177,6 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testGetPreviousValue() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
model.setValue(now.clone());
model.setStart(past);
now.setDate(now.getDate() - 1);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java Sat Jun 5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.awt.Rectangle;
import java.awt.TextField;
import javax.swing.SpringLayout.Constraints;
-import tests.support.Support_Excludes;
public class SpringLayoutTest extends SwingTestCase {
private Component component;
@@ -68,10 +67,6 @@ public class SpringLayoutTest extends Sw
}
public void testSpringLayout() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
SpringLayout.Constraints constrains = new SpringLayout.Constraints();
assertNull(constrains.getX());
assertNull(constrains.getY());
@@ -118,30 +113,18 @@ public class SpringLayoutTest extends Sw
}
public void testGetLayoutAlignmentX() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel container = new JPanel(layout);
assertEquals(0.5f, layout.getLayoutAlignmentX(null), 0.01);
assertEquals(0.5f, layout.getLayoutAlignmentX(container), 0.01);
}
public void testGetLayoutAlignmentY() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPanel container = new JPanel(layout);
assertEquals(0.5f, layout.getLayoutAlignmentY(null), 0.01);
assertEquals(0.5f, layout.getLayoutAlignmentY(container), 0.01);
}
public void testGetConstraints() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Constraints constraints = layout.getConstraints(null);
assertNotNull(constraints);
layout.addLayoutComponent(component, "not_constraints");
@@ -179,10 +162,6 @@ public class SpringLayoutTest extends Sw
}
public void testGetConstraint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.putConstraint(SpringLayout.SOUTH, button, Spring.constant(5),
SpringLayout.NORTH, container);
layout.putConstraint(SpringLayout.EAST, button, Spring.constant(5),
@@ -200,10 +179,6 @@ public class SpringLayoutTest extends Sw
}
public void testPutConstraint_Cycles() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (isHarmony()) {
layout.putConstraint(SpringLayout.EAST, button, 5, SpringLayout.WEST, panel);
layout.putConstraint(SpringLayout.EAST, panel, 5, SpringLayout.WEST, textField);
@@ -223,10 +198,6 @@ public class SpringLayoutTest extends Sw
}
public void testPutConstraint() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame frame = new JFrame("testPutConstraint");
container.setLayout(layout);
layout.putConstraint(SpringLayout.SOUTH, button, 5, SpringLayout.NORTH, container);
@@ -310,10 +281,6 @@ public class SpringLayoutTest extends Sw
}
public void testAddLayoutComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Constraints constraints = new Constraints(Spring.constant(1), Spring.constant(2),
Spring.constant(3), Spring.constant(4));
layout.addLayoutComponent(null, constraints);
@@ -335,10 +302,6 @@ public class SpringLayoutTest extends Sw
}
public void testRemoveLayoutComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.removeLayoutComponent(null);
layout.removeLayoutComponent(new JLabel());
@@ -375,10 +338,6 @@ public class SpringLayoutTest extends Sw
}
public void testInvalidateLayout() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame frame = new JFrame("testMinimumLayoutSize");
frame.setContentPane(container);
layout = new SpringLayout();
@@ -412,10 +371,6 @@ public class SpringLayoutTest extends Sw
}
public void testLayoutContainer() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
button.setPreferredSize(new Dimension(11, 12));
Constraints buttonConstraints = layout.getConstraints(button);
@@ -486,10 +441,6 @@ public class SpringLayoutTest extends Sw
}
public void testMinimumLayoutSize() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
//container
setComponentSizes(button, Spring.constant(2, 5, 100), Spring.constant(3, 6, 101));
Constraints buttonConstraints = layout.getConstraints(button);
@@ -558,10 +509,6 @@ public class SpringLayoutTest extends Sw
}
public void testPreferredLayoutSize() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
//container
setComponentSizes(button,
Spring.constant(2, 5, 100),
@@ -663,10 +610,6 @@ public class SpringLayoutTest extends Sw
}
public void testMaximumLayoutSize() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
//container
setComponentSizes(button,
Spring.constant(2, 5, 100),
@@ -775,10 +718,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_Constraints() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Constraints constraints;
//SpringLayout.Constraints()
@@ -847,10 +786,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetConstraint() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Constraints constraints;
layout.getConstraints(container).setConstraint(SpringLayout.WEST,
Spring.constant(5));
@@ -907,10 +842,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetConstraint() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Constraints constraints;
layout.getConstraints(container).setConstraint(SpringLayout.WEST,
Spring.constant(5));
@@ -996,10 +927,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetHeight() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setHeight(Spring.constant(5));
layout.getConstraints(button).setHeight(Spring.constant(6));
layout.getConstraints(button).setHeight(Spring.constant(8));
@@ -1026,10 +953,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetHeight() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setHeight(Spring.constant(5));
layout.getConstraints(button).setHeight(Spring.constant(6));
layout.getConstraints(button).setHeight(Spring.constant(8));
@@ -1067,10 +990,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetWidth() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setWidth(Spring.constant(5));
layout.getConstraints(button).setWidth(Spring.constant(6));
layout.getConstraints(button).setWidth(Spring.constant(8));
@@ -1097,10 +1016,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetWidth() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setWidth(Spring.constant(5));
layout.getConstraints(button).setWidth(Spring.constant(6));
layout.getConstraints(button).setWidth(Spring.constant(8));
@@ -1137,10 +1052,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetX() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setX(Spring.constant(5));
layout.getConstraints(button).setX(Spring.constant(6));
layout.getConstraints(button).setX(Spring.constant(7));
@@ -1167,10 +1078,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetX() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setX(Spring.constant(5));
layout.getConstraints(button).setX(Spring.constant(6));
layout.getConstraints(button).setX(Spring.constant(7));
@@ -1207,10 +1114,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetY() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setY(Spring.constant(5));
layout.getConstraints(button).setY(Spring.constant(6));
layout.getConstraints(button).setY(Spring.constant(8));
@@ -1237,10 +1140,6 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetY() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
layout.getConstraints(container).setY(Spring.constant(5));
layout.getConstraints(button).setY(Spring.constant(6));
layout.getConstraints(button).setY(Spring.constant(8));
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java Sat Jun 5 08:34:57 2010
@@ -28,14 +28,9 @@ import java.awt.Frame;
import java.awt.Rectangle;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
-import tests.support.Support_Excludes;
public class SwingUtilitiesRTest extends SwingTestCase {
public void testLayoutCompoundLabel() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent c = new JButton();
FontMetrics fm = c.getFontMetrics(c.getFont());
Rectangle viewRectangle = new Rectangle(1000, 1000);
@@ -50,10 +45,6 @@ public class SwingUtilitiesRTest extends
}
public void testIsLeftMiddleRightMouseButton() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent button1DownEvent = new MouseEvent(panel, 100, 0,
@@ -110,20 +101,12 @@ public class SwingUtilitiesRTest extends
}
public void testGetAncestorOfClass() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Frame f = new Frame();
final JDialog dialog = new JDialog(f);
assertSame(f, SwingUtilities.getAncestorOfClass(Frame.class, dialog));
}
public void testDeadLoop_4820() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final int DEAD_LOOP_TIMEOUT = 1000;
final int VALID_NUMBER_OF_CALLS = 15;
final int counter[] = {0};
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java Sat Jun 5 08:34:57 2010
@@ -48,7 +48,6 @@ import javax.accessibility.AccessibleSta
import javax.swing.border.EmptyBorder;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
-import tests.support.Support_Excludes;
public class SwingUtilitiesTest extends SwingTestCase implements SwingConstants {
class UIActionMap extends ActionMap implements UIResource {
@@ -63,10 +62,6 @@ public class SwingUtilitiesTest extends
* Class under test for String layoutCompoundLabel(JComponent, FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle, Rectangle, int)
*/
public void testLayoutCompoundLabelJComponentFontMetricsStringIconintintintintRectangleRectangleRectangleint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent panel = new JPanel();
Font font = new Font("Fixed", Font.PLAIN, 12);
FontMetrics metrics = getFontMetrics(font);
@@ -135,10 +130,6 @@ public class SwingUtilitiesTest extends
* Class under test for String layoutCompoundLabel(FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle, Rectangle, int)
*/
public void testLayoutCompoundLabelFontMetricsStringIconintintintintRectangleRectangleRectangleint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Font font = new Font("Fixed", Font.PLAIN, 12);
FontMetrics metrics = getFontMetrics(font);
Rectangle viewR = new Rectangle(0, 0, 10, 10);
@@ -270,10 +261,6 @@ public class SwingUtilitiesTest extends
}
public void testNotifyAction() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
class NATestAction implements Action {
public boolean enabled = true;
@@ -372,10 +359,6 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testConvertMouseEvent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
MouseEvent eventBefore, eventToPass, eventAfter;
JWindow window1 = new JWindow();
JWindow window2 = new JWindow();
@@ -470,10 +453,6 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testConvertRectangle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int width = 100;
int height = 200;
Rectangle rectBefore, rectToPass, rectAfter;
@@ -547,10 +526,6 @@ public class SwingUtilitiesTest extends
* this function is being tested by testConvertPointComponentPointComponent()
*/
public void testConvertPointComponentintintComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
/*
@@ -558,10 +533,6 @@ public class SwingUtilitiesTest extends
*/
@SuppressWarnings("deprecation")
public void testConvertPointComponentPointComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Point pointBefore, pointToPass, pointAfter;
JWindow window1 = new JWindow();
JWindow window2 = new JWindow();
@@ -622,10 +593,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleAt() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// TODO uncomment when Accessibility is implemented
/*
class JComponentInaccessible extends JComponent {
@@ -695,10 +662,6 @@ public class SwingUtilitiesTest extends
}
public void testCalculateInnerArea() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JWindow window = new JWindow();
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -745,10 +708,6 @@ public class SwingUtilitiesTest extends
}
public void testComputeDifference() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Rectangle rect11 = new Rectangle(0, 0, 300, 300);
Rectangle rect12 = new Rectangle(100, 100, 100, 100);
// different null testcases
@@ -804,10 +763,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAncestorNamed() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
String name1 = "name1";
String name2 = "name2";
String name3 = "name3";
@@ -847,10 +802,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAncestorOfClass() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -885,20 +836,12 @@ public class SwingUtilitiesTest extends
* this method is being tested by testPaintComponentGraphicsComponentContainerintintintint()
*/
public void testPaintComponentGraphicsComponentContainerRectangle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
/*
* Class under test for void paintComponent(Graphics, Component, Container, int, int, int, int)
*/
public void testPaintComponentGraphicsComponentContainerintintintint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// final JComponent component = new JButton("JButton");
// JFrame window = new JFrame() {
// public void paint(Graphics g) {
@@ -918,10 +861,6 @@ public class SwingUtilitiesTest extends
}
public void testGetRootPane() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNull(SwingUtilities.getRootPane(null));
assertNull(SwingUtilities.getRootPane(new JButton()));
JWindow window = new JWindow(new Frame());
@@ -945,10 +884,6 @@ public class SwingUtilitiesTest extends
}
public void testReplaceUIInputMap() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UIInputMap uiInputMap1 = new UIInputMap();
UIInputMap uiInputMap2 = new UIInputMap();
JComponent component = new JPanel();
@@ -981,10 +916,6 @@ public class SwingUtilitiesTest extends
}
public void testGetUIInputMap() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UIInputMap uiInputMap1 = new UIInputMap();
UIInputMap uiInputMap2 = new UIInputMap();
JComponent component = new JPanel();
@@ -1017,10 +948,6 @@ public class SwingUtilitiesTest extends
}
public void testReplaceUIActionMap() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UIActionMap uiActionMap1 = new UIActionMap();
UIActionMap uiActionMap2 = new UIActionMap();
JComponent component = new JPanel();
@@ -1042,10 +969,6 @@ public class SwingUtilitiesTest extends
}
public void testGetUIActionMap() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UIActionMap uiActionMap1 = new UIActionMap();
UIActionMap uiActionMap2 = new UIActionMap();
JComponent component = new JPanel();
@@ -1071,10 +994,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleStateSet() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component component1 = new JPanel();
Component component3 = new JDialog();
AccessibleStateSet stateSet = SwingUtilities.getAccessibleStateSet(component1);
@@ -1091,10 +1010,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleChild() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(SwingUtilities.getAccessibleIndexInParent(new JButton()) == -1);
JPanel panel = new JPanel();
assertTrue(SwingUtilities.getAccessibleIndexInParent(panel) == -1);
@@ -1115,10 +1030,6 @@ public class SwingUtilitiesTest extends
}
public void testComputeStringWidth() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JFrame frame = new JFrame();
JWindow window = new JWindow(frame);
window.setVisible(true);
@@ -1147,10 +1058,6 @@ public class SwingUtilitiesTest extends
}
public void testWindowForComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1171,10 +1078,6 @@ public class SwingUtilitiesTest extends
}
public void testGetWindowAncestor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1204,10 +1107,6 @@ public class SwingUtilitiesTest extends
}
public void testIsRectangleContainingRectangle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Rectangle rect1 = new Rectangle(100, 100, 100, 100);
Rectangle rect2 = new Rectangle(150, 150, 30, 30);
Rectangle rect3 = new Rectangle(150, 150, 50, 50);
@@ -1224,10 +1123,6 @@ public class SwingUtilitiesTest extends
}
public void testComputeUnion() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(SwingUtilities.computeUnion(0, 0, 100, 100,
new Rectangle(100, 100, 100, 100)).equals(new Rectangle(0, 0, 200, 200)));
assertTrue(SwingUtilities.computeUnion(100, 100, 100, 100,
@@ -1243,10 +1138,6 @@ public class SwingUtilitiesTest extends
}
public void testComputeIntersection() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(new Dimension(0, 0), SwingUtilities.computeIntersection(0, 0, 100, 100,
new Rectangle(100, 100, 100, 100)).getSize());
assertEquals(new Rectangle(150, 150, 20, 20), SwingUtilities.computeIntersection(100,
@@ -1266,10 +1157,6 @@ public class SwingUtilitiesTest extends
}
public void testGetLocalBounds() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int width = 200;
int height = 200;
Component component = new JPanel();
@@ -1288,10 +1175,6 @@ public class SwingUtilitiesTest extends
}
public void testConvertPointToScreen() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Point point;
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -1312,10 +1195,6 @@ public class SwingUtilitiesTest extends
}
public void testConvertPointFromScreen() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Point point;
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -1336,10 +1215,6 @@ public class SwingUtilitiesTest extends
}
public void testIsDescendingFrom() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1371,10 +1246,6 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testGetDeepestComponentAt() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (isHarmony()) {
return;
}
@@ -1401,10 +1272,6 @@ public class SwingUtilitiesTest extends
}
public void testGetRoot() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JWindow window1 = new JWindow();
// Code should be enabled when JApplet is supported.
//JApplet window2 = new JApplet();
@@ -1441,37 +1308,21 @@ public class SwingUtilitiesTest extends
* this method is supposed to be tested by FocusManager.getCurrentManager().getFocusOwner()
*/
public void testFindFocusOwner() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
/**
* this method is supposed to be tested by EventQueue.invokeLater()
*/
public void testInvokeLater() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
/**
* this method is supposed to be tested by EventQueue.invokeAndWait()
*/
public void testInvokeAndWait() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
public void testIsRightMouseButton() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1486,10 +1337,6 @@ public class SwingUtilitiesTest extends
}
public void testIsMiddleMouseButton() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1504,10 +1351,6 @@ public class SwingUtilitiesTest extends
}
public void testIsLeftMouseButton() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1522,10 +1365,6 @@ public class SwingUtilitiesTest extends
}
public void testProcessKeyBindings() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
class ActionListenerDummy implements ActionListener {
public ActionEvent event = null;
@@ -1627,10 +1466,6 @@ public class SwingUtilitiesTest extends
}
public void testUpdateComponentTreeUI() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LookAndFeel laf = UIManager.getLookAndFeel();
try {
JPanel panel1 = new JPanel();
@@ -1674,10 +1509,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleIndexInParent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(SwingUtilities.getAccessibleIndexInParent(new JButton()) == -1);
JPanel panel = new JPanel();
assertTrue(SwingUtilities.getAccessibleIndexInParent(panel) == -1);
@@ -1698,10 +1529,6 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleChildrenCount() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new NullPointerCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -1722,10 +1549,6 @@ public class SwingUtilitiesTest extends
}
public void testIsEventDispatchThread() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(SwingUtilities.isEventDispatchThread());
}
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java Sat Jun 5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.io.OutputStream;
import java.io.PrintStream;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
public class Timer_MultithreadedTest extends TestCase {
private Timer timer;
@@ -134,10 +133,6 @@ public class Timer_MultithreadedTest ext
}
public void testFireActionPerformed() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener1 = new ConcreteActionListener("1");
ConcreteActionListener listener2 = new ConcreteActionListener("2");
ConcreteActionListener listener3 = new ConcreteActionListener("3");
@@ -159,10 +154,6 @@ public class Timer_MultithreadedTest ext
}
public void testSetRepeats() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener1 = new ConcreteActionListener("1");
timer = new Timer(10, listener1);
timer.setRepeats(true);
@@ -220,10 +211,6 @@ public class Timer_MultithreadedTest ext
}
public void testSetInitialDelay() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener1 = new ConcreteActionListener("1");
timer = new Timer(10, listener1);
timer.setInitialDelay(100);
@@ -252,10 +239,6 @@ public class Timer_MultithreadedTest ext
}
public void testSetDelay() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
timer.setDelay(100);
@@ -283,10 +266,6 @@ public class Timer_MultithreadedTest ext
}
public void testIsRunning() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -315,10 +294,6 @@ public class Timer_MultithreadedTest ext
}
public void testStop() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -333,10 +308,6 @@ public class Timer_MultithreadedTest ext
}
public void testStart() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener = new ConcreteActionListener("listener");
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -391,10 +362,6 @@ public class Timer_MultithreadedTest ext
}
public void testRestart() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -412,10 +379,6 @@ public class Timer_MultithreadedTest ext
}
public void testSetLogTimers() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
class LogOutputStream extends OutputStream {
public boolean written = false;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java Sat Jun 5 08:34:57 2010
@@ -25,17 +25,12 @@ import java.awt.Color;
import java.awt.Insets;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
public class CompoundBorderTest extends SwingTestCase {
/*
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 10, false);
LineBorder border2 = new LineBorder(Color.red, 3, false);
CompoundBorder border4 = new CompoundBorder(border1, border2);
@@ -64,10 +59,6 @@ public class CompoundBorderTest extends
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 10, false);
LineBorder border2 = new LineBorder(Color.red, 3, false);
EmptyBorder border3 = new EmptyBorder(101, 102, 103, 104);
@@ -96,10 +87,6 @@ public class CompoundBorderTest extends
}
public void testPaintBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// JPanel panel1 = new JPanel();
// JPanel panel2 = new JPanel();
// JPanel panel3 = new JPanel();
@@ -131,10 +118,6 @@ public class CompoundBorderTest extends
}
public void testIsBorderOpaque() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, false);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -154,10 +137,6 @@ public class CompoundBorderTest extends
* Class under test for void CompoundBorder(Border, Border)
*/
public void testCompoundBorderBorderBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -179,20 +158,12 @@ public class CompoundBorderTest extends
* Class under test for void CompoundBorder()
*/
public void testCompoundBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
CompoundBorder border = new CompoundBorder();
assertNull(border.getInsideBorder());
assertNull(border.getOutsideBorder());
}
public void testGetOutsideBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -209,10 +180,6 @@ public class CompoundBorderTest extends
}
public void testGetInsideBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -229,10 +196,6 @@ public class CompoundBorderTest extends
}
public void testReadWriteObject() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
EmptyBorder border2 = new EmptyBorder(1, 1, 1, 1);
CompoundBorder border3 = new CompoundBorder(border1, border2);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java Sat Jun 5 08:34:57 2010
@@ -26,7 +26,6 @@ import java.awt.Insets;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
public class EtchedBorderTest extends SwingTestCase {
public static void main(final String[] args) {
@@ -37,10 +36,6 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder()
*/
public void testEtchedBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int etchType = EtchedBorder.LOWERED;
Color shadowColor = null;
Color highlightedColor = null;
@@ -55,10 +50,6 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(int)
*/
public void testEtchedBorderint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int etchType = EtchedBorder.LOWERED;
Color shadowColor = null;
Color highlightedColor = null;
@@ -79,10 +70,6 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(Color, Color)
*/
public void testEtchedBorderColorColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int etchType = EtchedBorder.LOWERED;
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
@@ -104,10 +91,6 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(int, Color, Color)
*/
public void testEtchedBorderintColorColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int etchType = EtchedBorder.LOWERED;
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
@@ -130,10 +113,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness1 = 2;
int thickness2 = 22;
int thickness3 = 33;
@@ -168,10 +147,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness1 = 2;
int thickness2 = 22;
int thickness3 = 33;
@@ -199,10 +174,6 @@ public class EtchedBorderTest extends Sw
}
public void testPaintBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// JPanel panel1 = new JPanel();
// JPanel panel2 = new JPanel();
// JPanel panel3 = new JPanel();
@@ -227,10 +198,6 @@ public class EtchedBorderTest extends Sw
}
public void testIsBorderOpaque() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Color shadowColor = Color.GREEN;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -243,10 +210,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getShadowColor(Component)
*/
public void testGetShadowColorComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent c1 = new JPanel();
JComponent c2 = new JPanel();
c1.setBackground(new Color(110, 110, 110));
@@ -267,10 +230,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getHighlightColor(Component)
*/
public void testGetHighlightColorComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JComponent c1 = new JPanel();
JComponent c2 = new JPanel();
c1.setBackground(new Color(110, 110, 110));
@@ -295,10 +254,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getShadowColor()
*/
public void testGetShadowColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -313,10 +268,6 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getHighlightColor()
*/
public void testGetHighlightColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -330,10 +281,6 @@ public class EtchedBorderTest extends Sw
}
public void testGetEtchType() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int etchType = EtchedBorder.LOWERED;
EtchedBorder border = new EtchedBorder(etchType);
assertEquals("Etch type coinsides", etchType, border.getEtchType());
@@ -343,10 +290,6 @@ public class EtchedBorderTest extends Sw
}
public void testReadWriteObject() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Color shadowColor1 = Color.RED;
Color shadowColor2 = Color.BLUE;
Color highlightedColor1 = Color.YELLOW;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java Sat Jun 5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.awt.Color;
import java.awt.Insets;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
public class LineBorderTest extends SwingTestCase {
public static void main(final String[] args) {
@@ -36,10 +35,6 @@ public class LineBorderTest extends Swin
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness1 = 11;
int thickness2 = 22;
int thickness3 = 33;
@@ -70,10 +65,6 @@ public class LineBorderTest extends Swin
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness = 11;
LineBorder border = new LineBorder(Color.black, thickness);
Insets insets = null;
@@ -93,10 +84,6 @@ public class LineBorderTest extends Swin
}
public void testPaintBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// JPanel panel = new JPanel();
//
// panel.setBorder(new LineBorder(Color.red, 10, true));
@@ -110,10 +97,6 @@ public class LineBorderTest extends Swin
}
public void testIsBorderOpaque() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.black);
LineBorder border2 = new LineBorder(Color.black, 11, true);
LineBorder border3 = new LineBorder(Color.black, 13, false);
@@ -126,10 +109,6 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color, int, boolean)
*/
public void testLineBorderColorintboolean() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness = 11;
boolean roundedCorners = true;
Color color = Color.yellow;
@@ -157,10 +136,6 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color, int)
*/
public void testLineBorderColorint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness = 11;
boolean roundedCorners = false;
Color color = Color.yellow;
@@ -186,10 +161,6 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color)
*/
public void testLineBorderColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness = 1;
boolean roundedCorners = false;
Color color = Color.yellow;
@@ -210,10 +181,6 @@ public class LineBorderTest extends Swin
}
public void testGetLineColor() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Color color = Color.yellow;
LineBorder border = new LineBorder(color, 1, true);
assertEquals("Colors coinsides", color, border.getLineColor());
@@ -226,10 +193,6 @@ public class LineBorderTest extends Swin
}
public void testGetRoundedCorners() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
boolean roundedCorners = true;
LineBorder border = new LineBorder(Color.black, 1, roundedCorners);
assertEquals("RoundedCorners coinsides", roundedCorners, border.getRoundedCorners());
@@ -241,10 +204,6 @@ public class LineBorderTest extends Swin
}
public void testGetThickness() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int thickness = 11;
LineBorder border = new LineBorder(Color.black, thickness);
assertEquals("Thickness coinsides", thickness, border.getThickness());
@@ -257,10 +216,6 @@ public class LineBorderTest extends Swin
}
public void testCreateGrayLineBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border = (LineBorder) LineBorder.createGrayLineBorder();
assertEquals("Thickness coinsides", 1, border.getThickness());
assertFalse("RoundedCorners coinsides", border.getRoundedCorners());
@@ -268,10 +223,6 @@ public class LineBorderTest extends Swin
}
public void testCreateBlackLineBorder() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border = (LineBorder) LineBorder.createBlackLineBorder();
assertEquals("Thickness coinsides", 1, border.getThickness());
assertFalse("RoundedCorners coinsides", border.getRoundedCorners());
@@ -279,10 +230,6 @@ public class LineBorderTest extends Swin
}
public void testReadWriteObject() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.yellow, 47, true);
LineBorder resurrectedBorder = (LineBorder) serializeObject(border1);