harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [2/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/ classlib...
Date Sat, 05 Jun 2010 08:35:05 GMT
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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -32,7 +32,6 @@ 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
 {
@@ -99,10 +98,6 @@ 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) {
@@ -116,19 +111,11 @@ 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) {
@@ -142,28 +129,16 @@ 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++) {
@@ -179,28 +154,16 @@ 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};
@@ -241,10 +204,6 @@ 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();
@@ -259,10 +218,6 @@ 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++) {
@@ -287,10 +242,6 @@ 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);
@@ -307,19 +258,11 @@ 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();
@@ -358,19 +301,11 @@ 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]);
 
@@ -395,55 +330,31 @@ 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);
 
@@ -456,19 +367,11 @@ 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();
@@ -485,10 +388,6 @@ 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();
@@ -505,10 +404,6 @@ 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);
@@ -534,10 +429,6 @@ public class TextLayoutTest extends Test
 
     public void testGetNextLeftHit() throws Exception
     {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TextHitInfo i1 = tl.getNextLeftHit(0);
         assertNull(i1);
 
@@ -548,10 +439,6 @@ public class TextLayoutTest extends Test
 
     public void testGetNextLeftHit1() throws Exception
     {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TextHitInfo i1 = tl.getNextLeftHit(TextHitInfo.leading(0));
         assertNull(i1);
 
@@ -562,10 +449,6 @@ 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);
 
@@ -576,10 +459,6 @@ public class TextLayoutTest extends Test
 
     public void testGetNextRightHit() throws Exception
     {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TextHitInfo i1 = tl.getNextRightHit(tl.getCharacterCount());
         assertNull(i1);
 
@@ -590,10 +469,6 @@ 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);
 
@@ -604,10 +479,6 @@ 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);
 
@@ -618,10 +489,6 @@ 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);
 
@@ -689,19 +556,11 @@ 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();
@@ -718,10 +577,6 @@ 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();
@@ -738,10 +593,6 @@ 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);
 
@@ -754,10 +605,6 @@ public class TextLayoutTest extends Test
 
     public void testHandleJustify() throws Exception
     {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tl.handleJustify(500);
         assertEquals(500, tl.getAdvance(), 7);
 
@@ -772,10 +619,6 @@ 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());
@@ -790,10 +633,6 @@ 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);
@@ -808,37 +647,21 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ 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
 {
@@ -69,10 +68,6 @@ 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);
 
@@ -90,10 +85,6 @@ 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);
@@ -111,10 +102,6 @@ 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);
@@ -122,10 +109,6 @@ 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);
@@ -136,10 +119,6 @@ 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);
@@ -152,10 +131,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -19,7 +19,6 @@ 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 {
@@ -125,10 +124,6 @@ public class AffineTransformTest extends
     }
 
     public void testCreate1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
                 new double[]{1, 0, 0, 1, 0, 0},
@@ -137,10 +132,6 @@ 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},
@@ -149,10 +140,6 @@ 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},
@@ -161,10 +148,6 @@ 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},
@@ -173,10 +156,6 @@ 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},
@@ -185,10 +164,6 @@ 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},
@@ -253,10 +228,6 @@ public class AffineTransformTest extends
     }
 
     public void testGetType() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : type) {
             assertEquals(
                     matrixToStr(element) + " Type",
@@ -266,67 +237,35 @@ 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);
@@ -336,18 +275,10 @@ 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,
@@ -357,10 +288,6 @@ 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,
@@ -370,10 +297,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToIdentity() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToIdentity();
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
@@ -383,10 +306,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToTranslation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToTranslation(8, 9);
         assertEquals(
                 AffineTransform.TYPE_TRANSLATION,
@@ -402,10 +321,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToScale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToScale(8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_SCALE,
@@ -421,10 +336,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToShear() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToShear(8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -440,10 +351,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToRotation1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToRotation(Math.PI * 0.5);
         assertEquals(
                 AffineTransform.TYPE_QUADRANT_ROTATION,
@@ -471,10 +378,6 @@ public class AffineTransformTest extends
     }
 
     public void testSetToRotation2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.setToRotation(0, 8, 9);
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
@@ -497,10 +400,6 @@ public class AffineTransformTest extends
     }
 
     public void testGetTranslateInstance() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(
                 AffineTransform.TYPE_TRANSLATION,
                 new double[]{1, 0, 0, 1, 8, 9},
@@ -514,10 +413,6 @@ 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},
@@ -531,10 +426,6 @@ 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},
@@ -548,10 +439,6 @@ 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},
@@ -575,10 +462,6 @@ public class AffineTransformTest extends
     }
 
     public void testGetRotateInstance2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(
                 AffineTransform.TYPE_IDENTITY,
                 new double[]{1, 0, 0, 1, 0, 0},
@@ -598,10 +481,6 @@ public class AffineTransformTest extends
     }
 
     public void testTranslate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.translate(0, 0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -617,10 +496,6 @@ public class AffineTransformTest extends
     }
 
     public void testScale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.scale(1, 1);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -636,10 +511,6 @@ public class AffineTransformTest extends
     }
 
     public void testShear() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.shear(0, 0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -655,10 +526,6 @@ public class AffineTransformTest extends
     }
 
     public void testRotate1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.rotate(0);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -680,10 +547,6 @@ public class AffineTransformTest extends
     }
 
     public void testRotate2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         t.rotate(0, 8, 9);
         assertEquals(
                 AffineTransform.TYPE_GENERAL_TRANSFORM,
@@ -706,10 +569,6 @@ 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]);
@@ -720,10 +579,6 @@ 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]);
@@ -734,10 +589,6 @@ public class AffineTransformTest extends
     }
 
     public void testCreateInvers() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[][] element : invers) {
             try {
                 AffineTransform at = new AffineTransform(element[0]);
@@ -758,10 +609,6 @@ 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++) {
@@ -789,10 +636,6 @@ 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,
@@ -806,10 +649,6 @@ public class AffineTransformTest extends
     }
 
     public void testTransformPointArrayBad() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test HARMONY-1405
         
         AffineTransform at = new AffineTransform();
@@ -839,10 +678,6 @@ 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];
@@ -852,10 +687,6 @@ 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];
@@ -865,10 +696,6 @@ 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];
@@ -878,10 +705,6 @@ 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];
@@ -891,10 +714,6 @@ 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};
@@ -904,10 +723,6 @@ 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};
@@ -917,10 +732,6 @@ 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++) {
@@ -948,10 +759,6 @@ 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];
@@ -961,10 +768,6 @@ 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");
@@ -1002,10 +805,6 @@ 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];
@@ -1019,10 +818,6 @@ 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();
@@ -1032,10 +827,6 @@ 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++){
@@ -1050,10 +841,6 @@ 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++){
@@ -1068,18 +855,10 @@ 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());
@@ -1096,34 +875,18 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ 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 {
 
@@ -185,18 +184,10 @@ 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());
         
@@ -211,10 +202,6 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetStartPoint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : angles) {
             double angle = element[0];
             assertEquals(
@@ -226,10 +213,6 @@ public class Arc2DTest extends ShapeTest
     }
 
     public void testGetEndPoint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : angles) {
             double angle = element[0];
             assertEquals(
@@ -241,10 +224,6 @@ 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];
@@ -264,10 +243,6 @@ 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];
@@ -280,10 +255,6 @@ 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();
@@ -292,46 +263,26 @@ 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];
@@ -363,10 +314,6 @@ 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];
@@ -381,10 +328,6 @@ 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];
@@ -407,10 +350,6 @@ 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];
@@ -433,10 +372,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -19,8 +19,6 @@
  */
 package java.awt.geom;
 
-import tests.support.Support_Excludes;
-
 public class AreaTest extends PathIteratorTestCase {
 
     public AreaTest(String name) {
@@ -36,10 +34,6 @@ public class AreaTest extends PathIterat
     }
 
     public void testConstructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test HARMONY-1404
         try {
             new Area(null);
@@ -50,10 +44,6 @@ public class AreaTest extends PathIterat
     }
     
     public void testContainsPoint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
              // Regression test HARMONY-1404
              Area emptyArea = new Area();
@@ -84,10 +74,6 @@ 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);
@@ -120,10 +106,6 @@ 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);
@@ -156,10 +138,6 @@ 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());
@@ -179,10 +157,6 @@ 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);
@@ -191,10 +165,6 @@ 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();        
@@ -205,10 +175,6 @@ 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);
@@ -227,10 +193,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -19,8 +19,6 @@
  */
 package java.awt.geom;
 
-import tests.support.Support_Excludes;
-
 public class CubicCurve2DDoubleTest extends GeomTestCase {
 
     CubicCurve2D.Double c;
@@ -42,133 +40,69 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -19,8 +19,6 @@
  */
 package java.awt.geom;
 
-import tests.support.Support_Excludes;
-
 public class CubicCurve2DFloatTest extends GeomTestCase {
 
     CubicCurve2D.Float c;
@@ -42,133 +40,69 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -18,7 +18,6 @@ package java.awt.geom;
 
 import java.awt.Point;
 import java.awt.Rectangle;
-import tests.support.Support_Excludes;
 
 public class CubicCurve2DTest extends ShapeTestCase {
 
@@ -81,10 +80,6 @@ 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);
@@ -93,10 +88,6 @@ 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),
@@ -111,28 +102,16 @@ 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);
@@ -141,10 +120,6 @@ 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);
@@ -164,10 +139,6 @@ 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);
@@ -179,10 +150,6 @@ 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);
@@ -191,10 +158,6 @@ 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);
@@ -214,10 +177,6 @@ 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);
@@ -229,10 +188,6 @@ 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();
@@ -254,10 +209,6 @@ 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;
@@ -280,10 +231,6 @@ 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);
@@ -301,10 +248,6 @@ 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];
@@ -324,18 +267,10 @@ 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);
@@ -363,30 +298,18 @@ 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);
@@ -395,10 +318,6 @@ 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);
@@ -407,20 +326,12 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -16,8 +16,6 @@
  */
 package java.awt.geom;
 
-import tests.support.Support_Excludes;
-
 public class Ellipse2DTest extends ShapeTestCase {
 
     public Ellipse2DTest(String name) {
@@ -27,10 +25,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ 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 {
 
@@ -133,28 +132,16 @@ 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);
@@ -162,27 +149,15 @@ 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);
@@ -196,10 +171,6 @@ 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");
@@ -223,30 +194,18 @@ 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);
@@ -255,10 +214,6 @@ 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);
@@ -267,10 +222,6 @@ 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);
@@ -279,10 +230,6 @@ 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);
@@ -291,10 +238,6 @@ 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);
@@ -303,10 +246,6 @@ 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);
@@ -315,10 +254,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePathDouble() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.closePath();
         PathIterator p = g.getPathIterator(null);
@@ -327,10 +262,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePathFloat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.closePath();
         PathIterator p = g.getPathIterator(null);
@@ -339,10 +270,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePath2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.closePath();
         g.closePath();
@@ -352,10 +279,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testClosePath3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -393,10 +316,6 @@ 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]);
@@ -409,10 +328,6 @@ 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]);
@@ -425,10 +340,6 @@ 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());
@@ -449,10 +360,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testReset1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -463,10 +370,6 @@ public class GeneralPathTest extends Sha
     }
 
     public void testReset2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g.moveTo(10, 20);
         g.lineTo(30, 40);
         g.closePath();
@@ -480,10 +383,6 @@ 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]);
@@ -495,10 +394,6 @@ 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]);
@@ -510,10 +405,6 @@ 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(
@@ -526,10 +417,6 @@ 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(
@@ -542,10 +429,6 @@ 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);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Line2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Line2DTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Line2DTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Line2DTest.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@ package java.awt.geom;
 
 import java.awt.Point;
 import java.awt.Rectangle;
-import tests.support.Support_Excludes;
 
 public class Line2DTest extends PathIteratorTestCase {
 
@@ -134,28 +133,16 @@ public class Line2DTest extends PathIter
     }
 
     public void testSetLine1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         l.setLine(new Point(5, 6), new Point(7, 8));
         assertEquals(new Line2D.Double(5, 6, 7, 8), l);
     }
 
     public void testSetLine2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         l.setLine(new Line2D.Double(5, 6, 7, 8));
         assertEquals(new Line2D.Double(5, 6, 7, 8), l);
     }
 
     public void testGetBounds(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (int[][] element : bounds) {
             assertEquals(
                     new Rectangle(
@@ -172,18 +159,10 @@ public class Line2DTest extends PathIter
     }
 
     public void testClone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(l, (Line2D)l.clone());
     }
 
     public void testRelativeCCW1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -196,10 +175,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testRelativeCCW2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -212,10 +187,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testRelativeCCW3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -228,10 +199,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testLinesIntersect(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (int[] element : lines) {
             int x1 = element[0];
             int y1 = element[1];
@@ -246,10 +213,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testIntersectsLine1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (int[] element : lines) {
             int x1 = element[0];
             int y1 = element[1];
@@ -264,10 +227,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testIntersectsLine2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (int[] element : lines) {
             int x1 = element[0];
             int y1 = element[1];
@@ -282,10 +241,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDistSq1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -299,10 +254,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDistSq2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -316,10 +267,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDistSq3(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -333,10 +280,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDist1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -350,10 +293,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDist2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -367,10 +306,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtSegDist3(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -384,10 +319,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDistSq1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -401,10 +332,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDistSq2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -418,10 +345,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDistSq3(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -435,10 +358,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDist1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -452,10 +371,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDist2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -469,10 +384,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testPtLineDist3(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (double[] element : points) {
             int x = (int)element[0];
             int y = (int)element[1];
@@ -486,10 +397,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testContainsPoint(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Always returns false
         assertFalse(l.contains(0, 0));
         assertFalse(l.contains(1, 2));
@@ -497,10 +404,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testContainsPoint2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Always returns false
         assertFalse(l.contains(new Point(0, 0)));
         assertFalse(l.contains(new Point(1, 2)));
@@ -508,28 +411,16 @@ public class Line2DTest extends PathIter
     }
 
     public void testContainsRect(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Always returns false
         assertFalse(l.contains(1, 2, 3, 4));
     }
 
     public void testContainsRect2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Always returns false
         assertFalse(l.contains(new Rectangle(1, 2, 3, 4)));
     }
 
     public void testIntersects1(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for(int i = 0; i < Rectangle2DTest.lines.length; i++) {
             int x1 = Rectangle2DTest.lines[i][0];
             int y1 = Rectangle2DTest.lines[i][1];
@@ -543,10 +434,6 @@ public class Line2DTest extends PathIter
     }
 
     public void testIntersects2(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for(int i = 0; i < Rectangle2DTest.lines.length; i++) {
             int x1 = Rectangle2DTest.lines[i][0];
             int y1 = Rectangle2DTest.lines[i][1];
@@ -572,60 +459,36 @@ public class Line2DTest extends PathIter
     }
 
     public void testGetPathIteratorDouble() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 l.getPathIterator(null),
                 new double[]{1, 2, 3, 4});
     }
 
     public void testGetPathIteratorFloat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 l.getPathIterator(null),
                 new float[]{1, 2, 3, 4});
     }
 
     public void testGetPathIteratorDoubleFlat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 l.getPathIterator(null, 2),
                 new double[]{1, 2, 3, 4});
     }
 
     public void testGetPathIteratorFloatFlat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 l.getPathIterator(null, 4),
                 new float[]{1, 2, 3, 4});
     }
 
     public void testGetPathIteratorDoubleAffine() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 l.getPathIterator(AffineTransform.getTranslateInstance(2, 1)),
                 new double[]{3, 3, 5, 5});
     }
 
     public void testGetPathIteratorFloatAffine() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 l.getPathIterator(AffineTransform.getTranslateInstance(2, 1)),
                 new float[]{3, 3, 5, 5});

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Rectangle2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Rectangle2DTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Rectangle2DTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Rectangle2DTest.java Sat Jun  5 08:34:57 2010
@@ -18,7 +18,6 @@ package java.awt.geom;
 
 import java.awt.Point;
 import java.awt.Rectangle;
-import tests.support.Support_Excludes;
 
 public class Rectangle2DTest extends ShapeTestCase {
 
@@ -127,46 +126,26 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testSetRect() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         r.setRect(new Rectangle2D.Double(5, 6, 7, 8));
         assertEquals(new Rectangle2D.Double(5, 6, 7, 8), r);
     }
 
     public void testSetFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         r.setFrame(5.0, 6.0, 7.0, 8.0);
         assertEquals(new Rectangle2D.Double(5, 6, 7, 8), r);
     }
 
     public void testGetBounds2D() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Rectangle2D.Double(1, 2, 3, 4), r.getBounds2D());
     }
 
     public void testOutcode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Just check it works
         assertEquals(Rectangle2D.OUT_LEFT | Rectangle2D.OUT_TOP,     r.outcode(0, 0));
         assertEquals(0, r.outcode(new Point2D.Double(2, 3)));
     }
 
     public void testEquals() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(r.equals(new Rectangle(1, 2, 3, 4)));
         assertTrue(!r.equals(new Rectangle(0, 2, 3, 4)));
         assertTrue(!r.equals(new Rectangle(1, 0, 3, 4)));
@@ -175,10 +154,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testHashCode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(r.hashCode() == new Rectangle(1, 2, 3, 4).hashCode());
         assertTrue(r.hashCode() != new Rectangle(0, 2, 3, 4).hashCode());
         assertTrue(r.hashCode() != new Rectangle(1, 0, 3, 4).hashCode());
@@ -187,10 +162,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testIntersectsLine1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Rectangle2D rr = new Rectangle2D.Double(1, 2, 3, 4);
         for (int[] element : lines) {
             int x1 = element[0];
@@ -205,10 +176,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testIntersectsLine2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Rectangle2D rr = new Rectangle2D.Double(1, 2, 3, 4);
         for (int[] element : lines) {
             int x1 = element[0];
@@ -223,10 +190,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testIntersect() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Rectangle dst = new Rectangle();
         Rectangle2D.intersect(r, new Rectangle(1, 2, 3, 4), dst);
         assertEquals(new Rectangle(1, 2, 3, 4), dst); // The same
@@ -241,10 +204,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testUnion() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Rectangle dst = new Rectangle();
         Rectangle2D.union(r, new Rectangle(1, 2, 3, 4), dst);
         assertEquals(new Rectangle(1, 2, 3, 4), dst); // The same
@@ -259,10 +218,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testAdd1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         r.add(1.0, 1.0);
         assertEquals(new Rectangle2D.Double(1, 1, 3, 5), r);
         r.add(7.0, 8.0);
@@ -276,10 +231,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testAdd2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         r.add(new Point(0, 0));
         assertEquals(new Rectangle2D.Double(0, 0, 4, 6), r);
         r.add(new Point(1, 1));
@@ -293,10 +244,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testAdd3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         r.add(new Rectangle(1, 2, 3, 4)); // The same
         assertEquals(new Rectangle2D.Double(1, 2, 3, 4), r);
         r.add(new Rectangle(2, 3, 2, 3)); // Inside
@@ -330,10 +277,6 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testGetPathIteratorDouble() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 new Rectangle(1, 2, 0, 0).getPathIterator(null),
                 new double[]{1, 2, 1, 2, 1, 2, 1, 2});
@@ -343,50 +286,30 @@ public class Rectangle2DTest extends Sha
     }
 
     public void testGetPathIteratorFloat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 r.getPathIterator(null),
                 new float[]{1, 2, 4, 2, 4, 6, 1, 6});
     }
 
     public void testGetPathIteratorDoubleFlat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 r.getPathIterator(null, 2),
                 new double[]{1, 2, 4, 2, 4, 6, 1, 6});
     }
 
     public void testGetPathIteratorFloatFlat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 r.getPathIterator(null, 5),
                 new float[]{1, 2, 4, 2, 4, 6, 1, 6});
     }
 
     public void testGetPathIteratorDoubleAffine() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorDouble(
                 r.getPathIterator(AffineTransform.getTranslateInstance(3, 1)),
                 new double[]{4, 3, 7, 3, 7, 7, 4, 7});
     }
 
     public void testGetPathIteratorFloatAffine() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkPathIteratorFloat(
                 r.getPathIterator(AffineTransform.getTranslateInstance(3, 1)),
                 new float[]{4, 3, 7, 3, 7, 7, 4, 7});



Mime
View raw message