harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [2/21] - 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/archive/src/test/ja...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ToolkitRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ToolkitRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ToolkitRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ToolkitRTest.java Wed May 26 09:31:07 2010
@@ -20,10 +20,15 @@
 package java.awt;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class ToolkitRTest extends TestCase {
 
     public void testGetScreenInsets() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // regression test HARMONY-1339
         Toolkit tlk = Toolkit.getDefaultToolkit();
         GraphicsConfiguration gc = new Frame().getGraphicsConfiguration();
@@ -32,6 +37,10 @@ public class ToolkitRTest extends TestCa
     }
 
     public void testGetScreenInsetsNull() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         boolean npe = false;
         Toolkit tlk = Toolkit.getDefaultToolkit();
         GraphicsConfiguration gc = null;
@@ -44,6 +53,10 @@ public class ToolkitRTest extends TestCa
     }
 
     public void testGetPropertyWithNullName() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         boolean npe = false;
         try {
             Toolkit.getProperty(null, "text");
@@ -54,6 +67,10 @@ public class ToolkitRTest extends TestCa
     }
 
     public void testInitializeDesktopProperties() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-1483
         Toolkit.getDefaultToolkit().initializeDesktopProperties();
     }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/WindowTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/WindowTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/WindowTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/WindowTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import java.util.Enumeration;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class WindowTest extends TestCase {
     Frame f;
@@ -68,6 +69,10 @@ public class WindowTest extends TestCase
 
     @SuppressWarnings("deprecation")
     public void testSetLocationRelativeTo() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Rectangle screenRect = f.getGraphicsConfiguration().getBounds();
         Point centerScreen = screenRect.getLocation();
         centerScreen.translate((screenRect.width - 1) / 2,
@@ -174,11 +179,19 @@ public class WindowTest extends TestCase
      * Check if getFont() returns null for if font wasn't set before.
      */
     public void testGetFont_Default(){
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // regression test for Harmony-1605
         assertEquals(null, w.getFont());
     }
 
     public void testPack() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Button b = new Button();
 
         assertNull(b.getFont());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/datatransfer/ClipboardTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/datatransfer/ClipboardTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/datatransfer/ClipboardTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/datatransfer/ClipboardTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import java.util.Arrays;
 import java.awt.*;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class ClipboardTest extends TestCase {
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/event/ContainerEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/event/ContainerEventTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/event/ContainerEventTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/event/ContainerEventTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import java.awt.Button;
 import java.awt.Container;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class ContainerEventTest extends TestCase {
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/LineBreakMeasurerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/LineBreakMeasurerTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/LineBreakMeasurerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/LineBreakMeasurerTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import java.awt.image.BufferedImage;
 import java.awt.*;
 import java.text.AttributedString;
 import java.text.AttributedCharacterIterator;
+import tests.support.Support_Excludes;
 
 public class LineBreakMeasurerTest extends TestCase
 {
@@ -68,6 +69,10 @@ public class LineBreakMeasurerTest exten
 
     public void testDeleteChar() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String s1 = "I TestItalic estPlain I";
 
         AttributedString as = new AttributedString(s1);
@@ -92,6 +97,10 @@ public class LineBreakMeasurerTest exten
 
     public void testGetPosition() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, measurer.getPosition());
         measurer.nextLayout(1000, 5, false);
         assertEquals(5, measurer.getPosition());
@@ -99,6 +108,10 @@ public class LineBreakMeasurerTest exten
 
     public void testInsertChar() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int offset = measurer.nextOffset(30); // This won't change
         measurer.setPosition(12);
         int offset1 = measurer.nextOffset(500); // And this should change
@@ -121,6 +134,10 @@ public class LineBreakMeasurerTest exten
 
     public void testNextLayout() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextLayout l1 = measurer.nextLayout(100);
         TextLayout l2 = measurer.nextLayout(100);
         TextLayout l3 = measurer.nextLayout(500);
@@ -134,6 +151,10 @@ public class LineBreakMeasurerTest exten
 
     public void testNextLayout1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextLayout l1 = measurer.nextLayout(100, 5, false);
         TextLayout l2 = measurer.nextLayout(15, 20, true);
         TextLayout l3 = measurer.nextLayout(600, 20, true);
@@ -149,6 +170,10 @@ public class LineBreakMeasurerTest exten
 
     public void testNextOffset() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int o1 = measurer.nextOffset(40);
         int o2 = measurer.nextOffset(60);
         measurer.setPosition(o1);
@@ -167,6 +192,10 @@ public class LineBreakMeasurerTest exten
 
     public void testNextOffset1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int o1 = measurer.nextOffset(40, 5, true);
         int o2 = measurer.nextOffset(60, 5, true);
         measurer.setPosition(o1);
@@ -187,6 +216,10 @@ public class LineBreakMeasurerTest exten
 
     public void testSetPosition() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         measurer.setPosition(10);
         assertEquals(measurer.getPosition(), 10);
     }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextLayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextLayoutTest.java Wed May 26 09:31:07 2010
@@ -32,6 +32,7 @@ import java.text.AttributedCharacterIter
 import java.text.AttributedCharacterIterator.Attribute;
 import java.util.HashMap;
 import java.util.Map;
+import tests.support.Support_Excludes;
 
 public class TextLayoutTest extends TestCase
 {
@@ -98,6 +99,10 @@ public class TextLayoutTest extends Test
 
     public void testHashCode() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for(int i=0; i<strings.length; i++) {
             for(int j=0; j<strings.length; j++) {
                 if(i == j) {
@@ -111,11 +116,19 @@ public class TextLayoutTest extends Test
 
     public void testClone() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(tl.equals(tl.clone()));
     }
 
     public void testEquals() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for(int i=0; i<strings.length; i++) {
             for(int j=0; j<strings.length; j++) {
                 if(i == j) {
@@ -129,16 +142,28 @@ public class TextLayoutTest extends Test
 
     public void testToString() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tl.toString();
     }
 
     public void testDraw() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tl.draw((Graphics2D) im.getGraphics(), 1, (float) tl.getBounds().getHeight() + 1);
     }
 
     public void testGetAdvance() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int left = im.getWidth(), right = 0;
 
         for(int i=0; i<im.getWidth(); i++) {
@@ -154,16 +179,28 @@ public class TextLayoutTest extends Test
 
     public void testGetAscent() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals((int) tl.getAscent(), (int) f1.getLineMetrics(s, frc).getAscent());
     }
 
     public void testGetBaseline() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(tl.getBaseline(), Font.ROMAN_BASELINE);
     }
 
     public void testGetBaselineOffsets() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         LineMetrics lm = f.getLineMetrics("A", frc);
         float correctBaselineOffsets[] = lm.getBaselineOffsets();
         float compatibleBaselineOffsets[] = {0, -9, -21};
@@ -204,6 +241,10 @@ public class TextLayoutTest extends Test
 
     public void testGetBlackBoxBounds() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape bounds = tl.getBlackBoxBounds(2, 7);
         bounds = tl.getBlackBoxBounds(0, 1);
         Rectangle2D rect = bounds.getBounds2D();
@@ -218,6 +259,10 @@ public class TextLayoutTest extends Test
 
     public void testGetBounds() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int left = im.getWidth(), right = 0, top = 0, bottom = im.getHeight();
 
         for(int i=0; i<im.getWidth(); i++) {
@@ -242,6 +287,10 @@ public class TextLayoutTest extends Test
 
     public void testGetCaretInfo() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         float cInfo[] = tl.getCaretInfo(TextHitInfo.beforeOffset(0));
         assertEquals(cInfo[0], 0f, 0.1f);
         assertEquals(cInfo[1], f.getItalicAngle(), 0.1f);
@@ -258,11 +307,19 @@ public class TextLayoutTest extends Test
 
     public void testGetCaretInfo1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testGetCaretInfo(); // Same thing
     }
 
     public void testGetCaretShape() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape cShape = tl.getCaretShape(TextHitInfo.trailing(0));
 
         int letterBounds[] = findFirstLetterBounds();
@@ -301,11 +358,19 @@ public class TextLayoutTest extends Test
 
     public void testGetCaretShape1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testGetCaretShape(); // Same
     }
 
     public void testGetCaretShapes() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape[] shapes = tl.getCaretShapes(1);
         assertNull(shapes[1]);
 
@@ -330,31 +395,55 @@ public class TextLayoutTest extends Test
 
     public void testGetCaretShapes1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testGetCaretShapes();
     }
 
     public void testGetCaretShapes2() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testGetCaretShapes();
     }
 
     public void testGetCharacterCount() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(tl.getCharacterCount(), s.length());
     }
 
     public void testGetCharacterLevel() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(tl.getCharacterLevel(5), 0);
     }
 
     public void testGetDescent() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals((int) tl.getDescent(), (int) f1.getLineMetrics(s, frc).getDescent());
     }
 
     public void testGetJustifiedLayout() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextLayout j1 = tl.getJustifiedLayout(500);
         TextLayout j2 = tl.getJustifiedLayout(200);
 
@@ -367,11 +456,19 @@ public class TextLayoutTest extends Test
 
     public void testGetLeading() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals((int) tl.getLeading(), (int) f1.getLineMetrics(s, frc).getLeading());
     }
 
     public void testGetLogicalHighlightShape() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape highlight = tl.getLogicalHighlightShape(7,3);
         Rectangle2D bbb = tl.getBlackBoxBounds(3, 7).getBounds2D();
         Rectangle2D bounds = highlight.getBounds2D();
@@ -388,6 +485,10 @@ public class TextLayoutTest extends Test
 
     public void testGetLogicalHighlightShape1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape highlight = tl.getLogicalHighlightShape(7, 3, tl.getBounds());
         Rectangle2D bbb = tl.getBlackBoxBounds(3, 7).getBounds2D();
         Rectangle2D bounds = highlight.getBounds2D();
@@ -404,6 +505,10 @@ public class TextLayoutTest extends Test
 
     public void testGetLogicalRangesForVisualSelection() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = TextHitInfo.leading(0);
         TextHitInfo i2 = TextHitInfo.leading(4);
         TextHitInfo i3 = TextHitInfo.trailing(9);
@@ -429,6 +534,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextLeftHit() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextLeftHit(0);
         assertNull(i1);
 
@@ -439,6 +548,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextLeftHit1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextLeftHit(TextHitInfo.leading(0));
         assertNull(i1);
 
@@ -449,6 +562,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextLeftHit2() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextLeftHit(0, TextLayout.DEFAULT_CARET_POLICY);
         assertNull(i1);
 
@@ -459,6 +576,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextRightHit() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextRightHit(tl.getCharacterCount());
         assertNull(i1);
 
@@ -469,6 +590,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextRightHit1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextRightHit(TextHitInfo.trailing(tl.getCharacterCount()-1));
         assertNull(i1);
 
@@ -479,6 +604,10 @@ public class TextLayoutTest extends Test
 
     public void testGetNextRightHit2() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getNextRightHit(tl.getCharacterCount(), TextLayout.DEFAULT_CARET_POLICY);
         assertNull(i1);
 
@@ -489,6 +618,10 @@ public class TextLayoutTest extends Test
 
     public void testGetOutline() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape outline1 = equals[0].getOutline(null);
         assertFalse(outline1.getBounds2D().getWidth() == 0);
 
@@ -556,11 +689,19 @@ public class TextLayoutTest extends Test
 
     public void testGetVisibleAdvance() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(tl.getBounds().getWidth(), tl.getVisibleAdvance(), 1f);
     }
 
     public void testGetVisualHighlightShape() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape highlight = tl.getVisualHighlightShape(TextHitInfo.trailing(7), TextHitInfo.leading(3));
         Rectangle2D bbb = tl.getBlackBoxBounds(3, 7).getBounds2D();
         Rectangle2D bounds = highlight.getBounds2D();
@@ -577,6 +718,10 @@ public class TextLayoutTest extends Test
 
     public void testGetVisualHighlightShape1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape highlight = tl.getVisualHighlightShape(TextHitInfo.trailing(7), TextHitInfo.leading(3), tl.getBounds());
         Rectangle2D bbb = tl.getBlackBoxBounds(3, 7).getBounds2D();
         Rectangle2D bounds = highlight.getBounds2D();
@@ -593,6 +738,10 @@ public class TextLayoutTest extends Test
 
     public void testGetVisualOtherHit() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i1 = tl.getVisualOtherHit(TextHitInfo.leading(3));
         assertEquals(TextHitInfo.trailing(2), i1);
 
@@ -605,6 +754,10 @@ public class TextLayoutTest extends Test
 
     public void testHandleJustify() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tl.handleJustify(500);
         assertEquals(500, tl.getAdvance(), 7);
 
@@ -619,6 +772,10 @@ public class TextLayoutTest extends Test
 
     public void testHitTestChar() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Rectangle2D bounds = tl.getBlackBoxBounds(3, 4).getBounds2D();
 
         TextHitInfo i1 = tl.hitTestChar((float) bounds.getCenterX()+2, (float) bounds.getCenterY()+2, tl.getBounds());
@@ -633,6 +790,10 @@ public class TextLayoutTest extends Test
 
     public void testHitTestChar1() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Rectangle2D bounds = tl.getBlackBoxBounds(3, 4).getBounds2D();
 
         TextHitInfo i1 = tl.hitTestChar((float) bounds.getCenterX()+2, (float) bounds.getCenterY()+2);
@@ -647,21 +808,37 @@ public class TextLayoutTest extends Test
 
     public void testIsLeftToRight() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(tl.isLeftToRight());
     }
 
     public void testIsVertical() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(tl.isVertical());
     }
 
     public void testGetStrongCaret() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextHitInfo i = TextLayout.DEFAULT_CARET_POLICY.getStrongCaret(TextHitInfo.trailing(4), TextHitInfo.leading(5), tl);
         assertEquals(TextHitInfo.leading(5), i);
     }
 
     public void testTextLayoutConstructorConstraints() throws Exception{
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // regression test for Harmony-1464
         try{
             new TextLayout(null, (Font)null, null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextMeasurerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextMeasurerTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextMeasurerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextMeasurerTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.text.AttributedString;
 import java.text.AttributedCharacterIterator;
+import tests.support.Support_Excludes;
 
 public class TextMeasurerTest extends TestCase
 {
@@ -68,6 +69,10 @@ public class TextMeasurerTest extends Te
 
     public void testInsertChar() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         float oldAdvance = measurer.getAdvanceBetween(5, 14);
         float oldAdvanceNoChange = measurer.getAdvanceBetween(0, 5);
 
@@ -85,6 +90,10 @@ public class TextMeasurerTest extends Te
 
     public void testDeleteChar() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String s1 = "I TestItalic estPlain I";
 
         AttributedString as = new AttributedString(s1);
@@ -102,6 +111,10 @@ public class TextMeasurerTest extends Te
 
     public void testClone() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextMeasurer m = (TextMeasurer) measurer.clone();
         assertNotNull(m);
         assertTrue(m != measurer);
@@ -109,6 +122,10 @@ public class TextMeasurerTest extends Te
 
     public void testGetLayout() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TextLayout l1 = measurer.getLayout(0, 15);
         TextLayout l2 = measurer.getLayout(2, 15);
         TextLayout l3 = measurer.getLayout(2, 4);
@@ -119,6 +136,10 @@ public class TextMeasurerTest extends Te
 
     public void testGetAdvanceBetween() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         float adv1 = measurer.getAdvanceBetween(1, 4);
         float adv2 = measurer.getAdvanceBetween(1, 5);
         float adv3 = measurer.getAdvanceBetween(0, 5);
@@ -131,6 +152,10 @@ public class TextMeasurerTest extends Te
 
     public void testGetLineBreakIndex() throws Exception
     {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(5, measurer.getLineBreakIndex(2, 35));
         assertEquals(11, measurer.getLineBreakIndex(0, 100));
         assertEquals(4, measurer.getLineBreakIndex(4, 1));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AffineTransformTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AffineTransformTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AffineTransformTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AffineTransformTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,7 @@ package java.awt.geom;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeomTestCase;
+import tests.support.Support_Excludes;
 
 
 public class AffineTransformTest extends GeomTestCase {
@@ -124,6 +125,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
                 new double[]{1, 0, 0, 1, 0, 0},
@@ -132,6 +137,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{2, 3, 4, 5, 6, 7},
@@ -140,6 +149,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{2, 3, 4, 5, 6, 7},
@@ -148,6 +161,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate4() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{2, 3, 4, 5, 6, 7},
@@ -156,6 +173,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate5() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{2, 3, 4, 5, 6, 7},
@@ -164,6 +185,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreate6() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{2, 3, 4, 5, 6, 7},
@@ -228,6 +253,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : type) {
             assertEquals(
                     matrixToStr(element) + " Type",
@@ -237,35 +266,67 @@ public class AffineTransformTest extends
     }
 
     public void testGetScaleX() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(2.0, t.getScaleX(), 0.0);
     }
 
     public void testGetScaleY() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(5.0, t.getScaleY(), 0.0);
     }
 
     public void testGetShearX() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(4.0, t.getShearX(), 0.0);
     }
 
     public void testGetShearY() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(3.0, t.getShearY(), 0.0);
     }
 
     public void testGetTranslateX() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(6.0, t.getTranslateX(), 0.0);
     }
 
     public void testGetTranslateY() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(7.0, t.getTranslateY(), 0.0);
     }
 
     public void testIsEdentity() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(t.isIdentity());
         assertTrue(new AffineTransform(1, 0, 0, 1, 0, 0).isIdentity());
     }
 
     public void testGetMatrix() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         double[] matrix = new double[]{0, 0, 0, 0};
         t.getMatrix(matrix);
         assertEquals(new double[]{2, 3, 4, 5}, matrix, 4, 0.0);
@@ -275,10 +336,18 @@ public class AffineTransformTest extends
     }
 
     public void testGetDeterminant() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(-2, t.getDeterminant(), 0.0);
     }
 
     public void testSetTransform() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setTransform(8, 9, 10, 11, 12, 13);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -288,6 +357,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetTransform2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setTransform(new AffineTransform(8, 9, 10, 11, 12, 13));
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -297,6 +370,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToIdentity() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToIdentity();
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
@@ -306,6 +383,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToTranslation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToTranslation(8, 9);
         assertEquals(
                 AffineTransform.TYPE_TRANSLATION,
@@ -321,6 +402,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToScale() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToScale(8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_SCALE,
@@ -336,6 +421,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToShear() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToShear(8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -351,6 +440,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToRotation1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToRotation(Math.PI * 0.5);
         assertEquals(
                 AffineTransform.TYPE_QUADRANT_ROTATION,
@@ -378,6 +471,10 @@ public class AffineTransformTest extends
     }
 
     public void testSetToRotation2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.setToRotation(0, 8, 9);
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
@@ -400,6 +497,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetTranslateInstance() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_TRANSLATION,
                 new double[]{1, 0, 0, 1, 8, 9},
@@ -413,6 +514,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetScaleInstance() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_SCALE,
                 new double[]{8, 0, 0, 9, 0, 0},
@@ -426,6 +531,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetShearInstance() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
                 new double[]{1, 9, 8, 1, 0, 0},
@@ -439,6 +548,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetRotateInstance1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_QUADRANT_ROTATION,
                 new double[]{0, 1, -1, 0, 0, 0},
@@ -462,6 +575,10 @@ public class AffineTransformTest extends
     }
 
     public void testGetRotateInstance2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
                 new double[]{1, 0, 0, 1, 0, 0},
@@ -481,6 +598,10 @@ public class AffineTransformTest extends
     }
 
     public void testTranslate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.translate(0, 0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -496,6 +617,10 @@ public class AffineTransformTest extends
     }
 
     public void testScale() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.scale(1, 1);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -511,6 +636,10 @@ public class AffineTransformTest extends
     }
 
     public void testShear() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.shear(0, 0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -526,6 +655,10 @@ public class AffineTransformTest extends
     }
 
     public void testRotate1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.rotate(0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -547,6 +680,10 @@ public class AffineTransformTest extends
     }
 
     public void testRotate2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         t.rotate(0, 8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -569,6 +706,10 @@ public class AffineTransformTest extends
     }
 
     public void testConcatenate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : matrix) {
             AffineTransform a = new AffineTransform(element[0]);
             AffineTransform b = new AffineTransform(element[1]);
@@ -579,6 +720,10 @@ public class AffineTransformTest extends
     }
 
     public void testPreConcatenate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : matrix) {
             AffineTransform a = new AffineTransform(element[0]);
             AffineTransform b = new AffineTransform(element[1]);
@@ -589,6 +734,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreateInvers() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : invers) {
             try {
                 AffineTransform at = new AffineTransform(element[0]);
@@ -609,6 +758,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformPoint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][] element : points) {
             AffineTransform at = new AffineTransform(element[0]);
             for(int j = 1; j < element.length; j++) {
@@ -636,6 +789,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformPointArray() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         Point2D[] src = new Point2D[]{
                 null,
@@ -649,6 +806,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformPointArrayBad() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test HARMONY-1405
         
         AffineTransform at = new AffineTransform();
@@ -678,6 +839,10 @@ public class AffineTransformTest extends
     }
     
     public void testTransformArray2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         double[] dst = new double[6];
@@ -687,6 +852,10 @@ public class AffineTransformTest extends
     }
     
     public void testTransformArray3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         float[] src = new float[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         float[] dst = new float[6];
@@ -696,6 +865,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformArray4() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         float[] src = new float[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         double[] dst = new double[6];
@@ -705,6 +878,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformArray5() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         float[] dst = new float[6];
@@ -714,6 +891,10 @@ public class AffineTransformTest extends
     }
     
     public void testTransformArrayOverlap1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regresion test HARMONY-1603
         AffineTransform at = AffineTransform.getTranslateInstance(2, 3);
         float[] src = new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
@@ -723,6 +904,10 @@ public class AffineTransformTest extends
     }
 
     public void testTransformArrayOverlap2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regresion test HARMONY-1603
         AffineTransform at = AffineTransform.getTranslateInstance(2, 3);
         double[] src = new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
@@ -732,6 +917,10 @@ public class AffineTransformTest extends
     }
 
     public void testDeltaTransform1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][] element : points) {
             AffineTransform at = new AffineTransform(element[0]);
             for(int j = 1; j < element.length; j++) {
@@ -759,6 +948,10 @@ public class AffineTransformTest extends
     }
 
     public void testDeltaTransform2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         double[] dst = new double[6];
@@ -768,6 +961,10 @@ public class AffineTransformTest extends
     }
 
     public void testInversTransform1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             new AffineTransform(1, 1, 1, 1, 1, 1).inverseTransform(new Point2D.Double(), null);
             fail("Expected exception NoninvertibleTransformException");
@@ -805,6 +1002,10 @@ public class AffineTransformTest extends
     }
 
     public void testInversTransform2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0};
         double[] dst = new double[6];
@@ -818,6 +1019,10 @@ public class AffineTransformTest extends
     }
 
     public void testCreateTransformedShape() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4);
         Shape actual = at.createTransformedShape(new Line2D.Double(1, 2, 3, 4));
         GeneralPath expected = new GeneralPath();
@@ -827,6 +1032,10 @@ public class AffineTransformTest extends
     }
 
     public void testEquals() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for(int i = 0; i < equal.length; i++) {
             AffineTransform t1 = new AffineTransform(equal[i]);
             for(int j = 0; j < equal.length; j++){
@@ -841,6 +1050,10 @@ public class AffineTransformTest extends
     }
 
     public void testHashCode() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for(int i = 0; i < equal.length; i++) {
             AffineTransform t1 = new AffineTransform(equal[i]);
             for(int j = 0; j < equal.length; j++){
@@ -855,10 +1068,18 @@ public class AffineTransformTest extends
     }
 
     public void testClone() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(t, t.clone());
     }
 
     public void testToString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(
                 "java.awt.geom.AffineTransform[[2.0, 4.0, 6.0], [3.0, 5.0, 7.0]]",
                 t.toString());
@@ -875,18 +1096,34 @@ public class AffineTransformTest extends
     }
 
     public void testSerializeRead1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkRead(new AffineTransform());
     }
 
     public void testSerializeRead2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkRead(new AffineTransform(1, 2, 3, 4, 5, 6));
     }
 
     public void testSerializeWrite1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkWrite(new AffineTransform());
     }
 
     public void testSerializeWrite2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkWrite(new AffineTransform(1, 2, 3, 4, 5, 6));
     }
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Arc2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Arc2DTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Arc2DTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Arc2DTest.java Wed May 26 09:31:07 2010
@@ -24,6 +24,7 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.geom.Arc2D;
 import java.awt.geom.ShapeTestCase;
+import tests.support.Support_Excludes;
 
 public class Arc2DTest extends ShapeTestCase {
 
@@ -184,10 +185,18 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetArcType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("Arc type", Arc2D.PIE, a.getArcType());
     }
 
     public void testSetArcType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         a.setArcType(Arc2D.CHORD);
         assertEquals("Arc type", Arc2D.CHORD, a.getArcType());
         
@@ -202,6 +211,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetStartPoint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : angles) {
             double angle = element[0];
             assertEquals(
@@ -213,6 +226,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetEndPoint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : angles) {
             double angle = element[0];
             assertEquals(
@@ -224,6 +241,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetBounds2D() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : bounds) {
             int type = (int)element[0];
             double start = element[1];
@@ -243,6 +264,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testContainsAngle() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : arcs) {
             double start = element[0];
             double extent = element[1];
@@ -255,6 +280,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testSetFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int type = a.getArcType();
         double start = a.getAngleStart();
         double extent = a.getAngleExtent();
@@ -263,26 +292,46 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testSetArc1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         a.setArc(new Point(7, 8), new Dimension(9, 10), 11, 12, Arc2D.CHORD);
         assertEquals(new Arc2D.Double(7, 8, 9, 10, 11, 12, Arc2D.CHORD), a);
     }
 
     public void testSetArc2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         a.setArc(new Rectangle(7, 8, 9, 10), 11, 12, Arc2D.CHORD);
         assertEquals(new Arc2D.Double(7, 8, 9, 10, 11, 12, Arc2D.CHORD), a);
     }
 
     public void testSetArc3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         a.setArc(new Arc2D.Double(7, 8, 9, 10, 11, 12, Arc2D.CHORD));
         assertEquals(new Arc2D.Double(7, 8, 9, 10, 11, 12, Arc2D.CHORD), a);
     }
 
     public void testSetArcByCenter() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         a.setArcByCenter(7, 8, 3, 11, 12, Arc2D.CHORD);
         assertEquals(new Arc2D.Double(4, 5, 6, 6, 11, 12, Arc2D.CHORD), a);
     }
 
     public void testSetArcByTangent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : tangent) {
             double x1 = element[0];
             double y1 = element[1];
@@ -314,6 +363,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testSetAngleStart() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : points1) {
             double x = element[0];
             double y = element[1];
@@ -328,6 +381,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testSetAngels1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : points2) {
             double x1 = element[0];
             double y1 = element[1];
@@ -350,6 +407,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testSetAngels2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : points2) {
             double x1 = element[0];
             double y1 = element[1];
@@ -372,6 +433,10 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetPathIteratorEmpty() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test HARMONY-1585
         Arc2D a = new Arc2D.Double();
         PathIterator p = a.getPathIterator(null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AreaTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AreaTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AreaTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AreaTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,8 @@
  */
 package java.awt.geom;
 
+import tests.support.Support_Excludes;
+
 public class AreaTest extends PathIteratorTestCase {
 
     public AreaTest(String name) {
@@ -34,6 +36,10 @@ public class AreaTest extends PathIterat
     }
 
     public void testConstructor() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test HARMONY-1404
         try {
             new Area(null);
@@ -44,6 +50,10 @@ public class AreaTest extends PathIterat
     }
     
     public void testContainsPoint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
              // Regression test HARMONY-1404
              Area emptyArea = new Area();
@@ -74,6 +84,10 @@ public class AreaTest extends PathIterat
      }
 
      public void testContainsRect() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
          // Regression test HARMONY-1476
          GeneralPath path = new GeneralPath();
          path.moveTo(100, 500);
@@ -106,6 +120,10 @@ public class AreaTest extends PathIterat
      }
 
      public void testIntersectsRect() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
          // Regression test HARMONY-1476
          GeneralPath path = new GeneralPath();
          path.moveTo(100, 500);
@@ -138,6 +156,10 @@ public class AreaTest extends PathIterat
      }
      
      public void testIsRectangle() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
      	 // Regression test HARMONY-1476
      	Area area = new Area(new Rectangle2D.Double(200, 300, 400, 150));
      	assertTrue(area.isRectangular());
@@ -157,6 +179,10 @@ public class AreaTest extends PathIterat
      }
      
      public void testGetPathIterator() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
          // Regression test HARMONY-1860
          Area a = new Area();
          PathIterator path = a.getPathIterator(null);
@@ -165,6 +191,10 @@ public class AreaTest extends PathIterat
      }
      
      public void testCreateTransformedArea() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
          // Regression test HARMONY-1880
          AffineTransform t = AffineTransform.getScaleInstance(2, 3);
          Area a1 = new Area();        
@@ -175,6 +205,10 @@ public class AreaTest extends PathIterat
      }
      
      public void testSubtract() {
+         if (Support_Excludes.isExcluded()) {
+             return;
+         }
+
          // Regression test HARMONY-4410
  		Rectangle2D rect1 = new Rectangle2D.Double(300, 300, 200, 150);
 		Rectangle2D rect2 = new Rectangle2D.Double(350, 200, 300, 150);
@@ -193,6 +227,10 @@ public class AreaTest extends PathIterat
     }
      
     public void testTransformPathIterator() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test HARMONY-4680
         AffineTransform transform = new AffineTransform(2.0, 0.0, 0.0, 200.0 / 140.0, 0.0, 0.0);
         Area ar = new Area(new Rectangle2D.Double(100, 100, 50.0, 100.0));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DDoubleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DDoubleTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DDoubleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DDoubleTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,8 @@
  */
 package java.awt.geom;
 
+import tests.support.Support_Excludes;
+
 public class CubicCurve2DDoubleTest extends GeomTestCase {
 
     CubicCurve2D.Double c;
@@ -40,69 +42,133 @@ public class CubicCurve2DDoubleTest exte
     }
 
     public void testCreate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new CubicCurve2D.Double(), new CubicCurve2D.Double(0, 0, 0, 0, 0, 0, 0, 0), 0.0f);
     }
 
 
     public void testGetX1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(1.0, c.getX1(), 0.0);
     }
 
     public void testGetY1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(2.0, c.getY1(), 0.0);
     }
 
     public void testGetCtrlX1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(3.0, c.getCtrlX1(), 0.0);
     }
 
     public void testGetCtrlY1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(4.0, c.getCtrlY1(), 0.0);
     }
 
     public void testGetCtrlX2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(5.0, c.getCtrlX2(), 0.0);
     }
 
     public void testGetCtrlY2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(6.0, c.getCtrlY2(), 0.0);
     }
 
     public void testGetX2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(7.0, c.getX2(), 0.0);
     }
 
     public void testGetY2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(8.0, c.getY2(), 0.0);
     }
 
     public void testGetP1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Double(1, 2), c.getP1());
     }
 
     public void testGetCtrlP1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Double(3, 4), c.getCtrlP1());
     }
 
     public void testGetCtrlP2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Double(5, 6), c.getCtrlP2());
     }
 
     public void testGetP2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Double(7, 8), c.getP2());
     }
 
     public void testSetCurve1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0);
         assertEquals(new CubicCurve2D.Double(9, 10, 11, 12, 13, 14, 15, 16), c, 0.0);
     }
 
     public void testSetCurve2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);
         assertEquals(new CubicCurve2D.Double(9, 10, 11, 12, 13, 14, 15, 16), c, 0.0);
     }
 
     public void testGetBounds2D() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : CubicCurve2DTest.bounds) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element[0], 0);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DFloatTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DFloatTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DFloatTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DFloatTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,8 @@
  */
 package java.awt.geom;
 
+import tests.support.Support_Excludes;
+
 public class CubicCurve2DFloatTest extends GeomTestCase {
 
     CubicCurve2D.Float c;
@@ -40,69 +42,133 @@ public class CubicCurve2DFloatTest exten
     }
 
     public void testCreate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new CubicCurve2D.Float(), new CubicCurve2D.Float(0, 0, 0, 0, 0, 0, 0, 0), 0.0f);
     }
 
 
     public void testGetX1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(1.0, c.getX1(), 0.0);
     }
 
     public void testGetY1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(2.0, c.getY1(), 0.0);
     }
 
     public void testGetCtrlX1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(3.0, c.getCtrlX1(), 0.0);
     }
 
     public void testGetCtrlY1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(4.0, c.getCtrlY1(), 0.0);
     }
 
     public void testGetCtrlX2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(5.0, c.getCtrlX2(), 0.0);
     }
 
     public void testGetCtrlY2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(6.0, c.getCtrlY2(), 0.0);
     }
 
     public void testGetX2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(7.0, c.getX2(), 0.0);
     }
 
     public void testGetY2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(8.0, c.getY2(), 0.0);
     }
 
     public void testGetP1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Float(1, 2), c.getP1());
     }
 
     public void testGetCtrlP1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Float(3, 4), c.getCtrlP1());
     }
 
     public void testGetCtrlP2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Float(5, 6), c.getCtrlP2());
     }
 
     public void testGetP2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new Point2D.Float(7, 8), c.getP2());
     }
 
     public void testSetCurve1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0);
         assertEquals(new CubicCurve2D.Float(9, 10, 11, 12, 13, 14, 15, 16), c, 0.0);
     }
 
     public void testSetCurve2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);
         assertEquals(new CubicCurve2D.Float(9, 10, 11, 12, 13, 14, 15, 16), c, 0.0);
     }
 
     public void testGetBounds2D() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : CubicCurve2DTest.bounds) {
             CubicCurve2D curve = new CubicCurve2D.Float();
             curve.setCurve(element[0], 0);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DTest.java Wed May 26 09:31:07 2010
@@ -18,6 +18,7 @@ package java.awt.geom;
 
 import java.awt.Point;
 import java.awt.Rectangle;
+import tests.support.Support_Excludes;
 
 public class CubicCurve2DTest extends ShapeTestCase {
 
@@ -80,6 +81,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSetCurve1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         double coords[] = new double[] {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
         c.setCurve(coords, 0);
         assertEquals(new CubicCurve2D.Double(7, 8, 9, 10, 11, 12, 13, 14), c, 0.0);
@@ -88,6 +93,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSetCurve2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Point2D[] points = new Point[] {
                 new Point(7, 8),
                 new Point(9, 10),
@@ -102,16 +111,28 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSetCurve3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(new Point(7, 8), new Point(9, 10), new Point(11, 12), new Point(13, 14));
         assertEquals(new CubicCurve2D.Double(7, 8, 9, 10, 11, 12, 13, 14), c, 0.0);
     }
 
     public void testSetCurve4() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         c.setCurve(new CubicCurve2D.Double(7, 8, 9, 10, 11, 12, 13, 14));
         assertEquals(new CubicCurve2D.Double(7, 8, 9, 10, 11, 12, 13, 14), c, 0.0);
     }
 
     public void testGetFlatnessSq1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -120,6 +141,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetFlatnessSq2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -139,6 +164,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetFlatnessSq3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -150,6 +179,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetFlatness1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -158,6 +191,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetFlatness2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -177,6 +214,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetFlatness3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[] element : curves3) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element, 0);
@@ -188,6 +229,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSubdivide1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : curves1) {
             CubicCurve2D src1 = new CubicCurve2D.Double();
             CubicCurve2D left1 = new CubicCurve2D.Double();
@@ -209,6 +254,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSubdivide2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : curves2) {
             int srcOff = element[0][0] < 0.0 ? (int)-element[0][0] : 0;
             int leftOff = element[1][0] < 0.0 ? (int)-element[1][0] : 0;
@@ -231,6 +280,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSolveCubic1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : equations) {
             double eqn[] = new double[4];
             System.arraycopy(element[0], 0, eqn, 0, 4);
@@ -248,6 +301,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testSolveCubic2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : equations) {
             double res[] = new double[3];
             double eqn[] = new double[4];
@@ -267,10 +324,18 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testClone() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(c, (CubicCurve2D)c.clone(), 0.0);
     }
 
     public void testGetBounds() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (double[][] element : bounds) {
             CubicCurve2D curve = new CubicCurve2D.Double();
             curve.setCurve(element[0], 0);
@@ -298,18 +363,30 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetPathIteratorDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkPathIteratorDouble(
                 c.getPathIterator(null),
                 new double[]{1, 2, 3, 4, 5, 6, 7, 8});
     }
 
     public void testGetPathIteratorFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkPathIteratorFloat(
                 c.getPathIterator(null),
                 new float[]{1, 2, 3, 4, 5, 6, 7, 8});
     }
 
     public void testGetPathIteratorDoubleFlat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PathIterator p = new CubicCurve2D.Double(1, 1, 3, 7, 9, 5, 7, 3).getPathIterator(null, 2);
         checkPathRule(p, PathIterator.WIND_NON_ZERO);
         checkPathMove(p, false, 1, 1, 0.0);
@@ -318,6 +395,10 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetPathIteratorFloatFlat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PathIterator p = new CubicCurve2D.Double(1, 1, 3, 7, 9, 5, 7, 3).getPathIterator(null, 2);
         checkPathRule(p, PathIterator.WIND_NON_ZERO);
         checkPathMove(p, false, 1, 1, 0.0f);
@@ -326,12 +407,20 @@ public class CubicCurve2DTest extends Sh
     }
 
     public void testGetPathIteratorDoubleAffine() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkPathIteratorDouble(
                 c.getPathIterator(AffineTransform.getTranslateInstance(2, 1)),
                 new double[]{3, 3, 5, 5, 7, 7, 9, 9});
     }
 
     public void testGetPathIteratorFloatAffine() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkPathIteratorFloat(
                 c.getPathIterator(AffineTransform.getTranslateInstance(2, 1)),
                 new float[]{3, 3, 5, 5, 7, 7, 9, 9});

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Ellipse2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Ellipse2DTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Ellipse2DTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Ellipse2DTest.java Wed May 26 09:31:07 2010
@@ -16,6 +16,8 @@
  */
 package java.awt.geom;
 
+import tests.support.Support_Excludes;
+
 public class Ellipse2DTest extends ShapeTestCase {
 
     public Ellipse2DTest(String name) {
@@ -25,6 +27,10 @@ public class Ellipse2DTest extends Shape
     }
 
     public void testGetPathIteratorEmpty() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test HARMONY-1585
         Ellipse2D e = new Ellipse2D.Double();
         PathIterator p = e.getPathIterator(null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/GeneralPathTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/GeneralPathTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/GeneralPathTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/GeneralPathTest.java Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ package java.awt.geom;
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.Tools;
+import tests.support.Support_Excludes;
 
 public class GeneralPathTest extends ShapeTestCase {
 
@@ -132,16 +133,28 @@ public class GeneralPathTest extends Sha
     }
 
     public void testCreate1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new GeneralPath(), new GeneralPath(GeneralPath.WIND_NON_ZERO), 0.0);
         assertEquals(new GeneralPath(), new GeneralPath(GeneralPath.WIND_NON_ZERO), 0.0f);
     }
 
     public void testCreate2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(new GeneralPath(GeneralPath.WIND_NON_ZERO, 20), new GeneralPath(GeneralPath.WIND_NON_ZERO), 0.0);
         assertEquals(new GeneralPath(GeneralPath.WIND_NON_ZERO, 20), new GeneralPath(GeneralPath.WIND_NON_ZERO), 0.0f);
     }
 
     public void testCreate3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(5, 6);
         g.lineTo(7, 8);
         assertEquals(g, new GeneralPath(g), 0.0);
@@ -149,15 +162,27 @@ public class GeneralPathTest extends Sha
     }
 
     public void testConstants() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("WIND_EVEN_ODD", PathIterator.WIND_EVEN_ODD, GeneralPath.WIND_EVEN_ODD);
         assertEquals("WIND_NON_ZERO", PathIterator.WIND_NON_ZERO, GeneralPath.WIND_NON_ZERO);
     }
 
     public void testGetWindingRule() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("Rule", GeneralPath.WIND_EVEN_ODD, g.getWindingRule());
     }
 
     public void testSetWindingRule() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.setWindingRule(GeneralPath.WIND_NON_ZERO);
         assertEquals("Rule", GeneralPath.WIND_NON_ZERO, g.getWindingRule());
         g.setWindingRule(GeneralPath.WIND_EVEN_ODD);
@@ -171,6 +196,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testIllegalPathStateException() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             g.lineTo(10, 20);
             fail("GeneralPath.lineTo() should throw exception IllegalPathStateException");
@@ -194,18 +223,30 @@ public class GeneralPathTest extends Sha
     }
 
     public void testMoveToDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         PathIterator p = g.getPathIterator(null);
         checkPathMove(p, true, 10, 20, 0.0);
     }
 
     public void testMoveToFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         PathIterator p = g.getPathIterator(null);
         checkPathMove(p, true, 10, 20, 0.0f);
     }
 
     public void testLineToDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         PathIterator p = g.getPathIterator(null);
@@ -214,6 +255,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testLineToFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         PathIterator p = g.getPathIterator(null);
@@ -222,6 +267,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testQuadToDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.quadTo(30, 40, 50, 60);
         PathIterator p = g.getPathIterator(null);
@@ -230,6 +279,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testQuadToFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.quadTo(30, 40, 50, 60);
         PathIterator p = g.getPathIterator(null);
@@ -238,6 +291,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testCurveToDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.curveTo(30, 40, 50, 60, 70, 80);
         PathIterator p = g.getPathIterator(null);
@@ -246,6 +303,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testCurveToFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.curveTo(30, 40, 50, 60, 70, 80);
         PathIterator p = g.getPathIterator(null);
@@ -254,6 +315,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePathDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.closePath();
         PathIterator p = g.getPathIterator(null);
@@ -262,6 +327,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePathFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.closePath();
         PathIterator p = g.getPathIterator(null);
@@ -270,6 +339,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePath2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.closePath();
         g.closePath();
@@ -279,6 +352,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePath3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -316,6 +393,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testAppendShape() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : shapes1) {
             GeneralPath src1 = createPath(element[0]);
             GeneralPath src2 = createPath(element[1]);
@@ -328,6 +409,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testAppendPath() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : shapes1) {
             GeneralPath src1 = createPath(element[0]);
             GeneralPath src2 = createPath(element[1]);
@@ -340,6 +425,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testGetCurrentPoint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(g.getCurrentPoint());
         g.moveTo(10, 20);
         assertEquals(new Point2D.Float(10, 20), g.getCurrentPoint());
@@ -360,6 +449,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testReset1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -370,6 +463,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testReset2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -383,6 +480,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testTransform() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : shapes2) {
             GeneralPath src = createPath(element[0]);
             GeneralPath dst = createPath(element[2]);
@@ -394,6 +495,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testCreateTransformedShape() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : shapes2) {
             GeneralPath src = createPath(element[0]);
             Shape dst1 = createPath(element[2]);
@@ -405,6 +510,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testGetBounds2D() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : bounds) {
             GeneralPath src = createPath(element[0]);
             Rectangle2D bound = new Rectangle2D.Float(
@@ -417,6 +526,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testGetBounds() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (float[][][] element : bounds) {
             GeneralPath src = createPath(element[0]);
             Rectangle2D bound = new Rectangle(
@@ -429,6 +542,10 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClone() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(g, (GeneralPath)g.clone(), 0.0);
         g.moveTo(10, 20);
         g.lineTo(30, 40);



Mime
View raw message