You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2007/03/30 12:52:40 UTC
svn commit: r524038 [1/2] - in /harmony/enhanced/classlib/trunk/modules/awt:
./ src/test/api/java/common/java/awt/ src/test/api/java/common/java/awt/geom/
src/test/api/java/common/java/awt/geom/serialization/
src/test/api/java/common/java/awt/geom/shap...
Author: ayza
Date: Fri Mar 30 03:52:16 2007
New Revision: 524038
URL: http://svn.apache.org/viewvc?view=rev&rev=524038
Log:
Humble try to commit reworked patch for HARMONY-1813 ([classlib][awt][test] java.awt test resources are located in wrong place)
Added:
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/geom/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/geom/java.awt.geom.AffineTransform[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/serialization/java.awt.geom.AffineTransform[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/geom/java.awt.geom.AffineTransform[[1.0, 3.0, 5.0], [2.0, 4.0, 6.0]].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/serialization/java.awt.geom.AffineTransform[[1.0, 3.0, 5.0], [2.0, 4.0, 6.0]]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Dimension[width=0,height=0].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Dimension[width=0,height=0]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Dimension[width=1,height=2].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Dimension[width=1,height=2]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Point[x=0,y=0].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Point[x=0,y=0]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Point[x=1,y=2].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Point[x=1,y=2]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Polygon[0 [0,0,0,0] () ()].ser
- copied, changed from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Polygon[0 [0,0,0,0] () ()]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Polygon[3 [1,4,2,2] (1,2,3) (4,5,6)].ser
- copied, changed from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Polygon[3 [1,4,2,2] (1,2,3) (4,5,6)]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=0,y=0,width=0,height=0].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=0,y=0,width=0,height=0]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=0,y=0,width=1,height=2].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=0,y=0,width=1,height=2]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=1,y=2,width=3,height=4].ser
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=1,y=2,width=3,height=4]
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,300,250,150,100,100,200,250,200,50).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,300,250,150,100,100,200,250,200,50).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,150,250,250,150).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,150,250,250,150).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,150,50,150,150,50,150).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,150,50,150,150,50,150).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,200,50,200,150,100,150,100,100,150,100,150,200,50,200).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,200,50,200,150,100,150,100,100,150,100,150,200,50,200).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).ico
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).ico
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).shape
- copied unchanged from r523977, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).shape
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/chess.rect
- copied unchanged from r523981, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/chess.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/double.rect
- copied unchanged from r523981, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/double.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/rect.rect
- copied unchanged from r523981, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/rect.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/star.rect
- copied unchanged from r523981, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/star.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/resources/shapes/org/apache/harmony/awt/gl/twist.rect
- copied unchanged from r523981, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/twist.rect
Removed:
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/serialization/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/shapes/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/serialization/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/java/
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/chess.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/double.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/rect.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/star.rect
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/resources/twist.rect
Modified:
harmony/enhanced/classlib/trunk/modules/awt/build.xml
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DimensionTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PointTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PolygonTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RectangleTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Tools.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/MultiRectAreaLineCashTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/MultiRectAreaRectCashTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/MultiRectAreaTest.java
harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/gl/MultiRectAreaTestCase.java
Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Fri Mar 30 03:52:16 2007
@@ -240,7 +240,7 @@
target="clean"/>
</target>
- <target name="compile-tests">
+ <target name="compile-tests" depends="copy-test-resources">
<echo message="Compiling AWT tests" />
<mkdir dir="${hy.awt.bin.test}" />
@@ -267,7 +267,7 @@
</bootclasspath>
<classpath location="../../build/tests" />
</javac>
- <mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/geom/shapes" />
+ <!--mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/geom/shapes" />
<copy todir="${hy.awt.bin.test}/java/awt/geom/shapes" overwrite="yes">
<fileset dir="${hy.awt.src.test.api}/java/common/java/awt/geom/shapes" />
</copy>
@@ -286,14 +286,22 @@
<mkdir dir="${hy.awt.src.test.api}/java/common/org/apache/harmony/awt/gl/resources" />
<copy todir="${hy.awt.bin.test}/org/apache/harmony/awt/gl/resources" overwrite="yes">
<fileset dir="${hy.awt.src.test.api}/java/common/org/apache/harmony/awt/gl/resources" />
- </copy>
+ </copy-->
+ </target>
+
+ <target name="copy-test-resources">
+ <mkdir dir="${hy.awt.bin.test}" />
+ <copy todir="${hy.awt.bin.test}" includeemptydirs="false">
+ <fileset dir="${hy.awt.src.test.resources}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
</target>
<target name="prepare-exclude">
<prepare-exclude-list moduleName="awt" dir="./make"
result="${awt.exclude.file}"/>
</target>
-
<target name="run-tests">
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java Fri Mar 30 03:52:16 2007
@@ -31,36 +31,26 @@
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.util.Arrays;
+import java.net.URL;
public class BasicStrokeTest extends TestCase {
- String SHAPE_PATH = "java/awt/shapes/";
- String OUTPUT_PATH = "java/awt/shapes/output/";
boolean OUTPUT = System.getProperty("TEST_OUTPUT") != null;
final double SHAPE_DELTA = 0.01;
String shapePath, outputPath;
BasicStroke stroke;
Shape srcShape, dstShape;
-
+
public BasicStrokeTest(String name) {
super(name);
- }
-
- @Override
- protected void setUp() throws Exception {
- String basePath = System.getProperty("TEST_SRC_DIR");
- assertNotNull("Parameter TEST_SRC_DIR not defined", basePath);
- if (!basePath.endsWith(File.separator)) {
- basePath += File.separator;
- }
-
- shapePath = basePath + SHAPE_PATH;
- outputPath = basePath + OUTPUT_PATH;
-
- if (OUTPUT) {
- new File(outputPath).mkdirs();
- }
+
+ String classPath = "shapes/" + Tools.getClasstPath(this.getClass());
+ URL url = ClassLoader.getSystemClassLoader().getResource(classPath);
+
+ assertNotNull("Path not found " + classPath, url);
+ shapePath = url.getPath();
+ outputPath = shapePath + "output/";
}
public void testCreate() {
@@ -154,13 +144,14 @@
public void testCreateStrokedShape() {
File path = new File(shapePath);
-// System.out.println("Shape path: " + path.getAbsolutePath());
String test[] = path.list();
+
if (test == null) {
fail("Golden files folder is empty " + path.getAbsolutePath());
} else {
System.out.println("Golden files folder " + path.getAbsolutePath());
}
+
for (String element : test) {
if (element.indexOf("_d") != -1 && element.indexOf("#JAVA") == -1) {
check(path.getAbsolutePath() + File.separator + element);
@@ -173,7 +164,7 @@
int b = fileName.indexOf(".shape");
String strokeDesc = fileName.substring(a + 2, b);
String srcName = fileName.substring(0, a) + fileName.substring(b);
- System.out.println(SHAPE_PATH + Tools.File.extractFileName(fileName));
+// System.out.println(SHAPE_PATH + Tools.File.extractFileName(fileName));
BasicStroke bs = createStroke(strokeDesc);
Shape src = Tools.Shape.load(srcName);
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DimensionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DimensionTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DimensionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DimensionTest.java Fri Mar 30 03:52:16 2007
@@ -25,11 +25,14 @@
public class DimensionTest extends SerializeTestCase {
+ static {
+ SERIALIZATION_TEST = true;
+ }
+
Dimension d;
public DimensionTest(String name) {
super(name);
- serializePath = getSerializePath(Dimension.class);
}
@Override
@@ -105,14 +108,20 @@
assertEquals(d.toString(), "java.awt.Dimension[width=2,height=3]");
}
- public void testSerializeRead() {
- assertTrue(checkRead(new Dimension()));
- assertTrue(checkRead(new Dimension(1, 2)));
+ public void testSerializeRead1() {
+ checkRead(new Dimension());
+ }
+
+ public void testSerializeRead2() {
+ checkRead(new Dimension(1, 2));
+ }
+
+ public void testSerializeWrite1() {
+ checkWrite(new Dimension());
}
- public void testSerializeWrite() {
- assertTrue(checkWrite(new Dimension()));
- assertTrue(checkWrite(new Dimension(1, 2)));
+ public void testSerializeWrite2() {
+ checkWrite(new Dimension(1, 2));
}
public void createSerializeTemplates() {
@@ -121,8 +130,8 @@
}
public static void main(String[] args) {
-// junit.textui.TestRunner.run(DimensionTest.class);
- new DimensionTest("").createSerializeTemplates();
+// new DimensionTest("").createSerializeTemplates();
+ junit.textui.TestRunner.run(DimensionTest.class);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PointTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PointTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PointTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PointTest.java Fri Mar 30 03:52:16 2007
@@ -24,9 +24,12 @@
public class PointTest extends SerializeTestCase {
+ static {
+ SERIALIZATION_TEST = true;
+ }
+
public PointTest(String name) {
super(name);
- serializePath = getSerializePath(Point.class);
}
@Override
@@ -128,14 +131,20 @@
assertFalse(new Point(3, 3).equals(new Point(1, 2)));
}
- public void testSerializeRead() {
- assertTrue(checkRead(new Point()));
- assertTrue(checkRead(new Point(1, 2)));
+ public void testSerializeRead1() {
+ checkRead(new Point());
+ }
+
+ public void testSerializeRead2() {
+ checkRead(new Point(1, 2));
+ }
+
+ public void testSerializeWrite1() {
+ checkWrite(new Point());
}
- public void testSerializeWrite() {
- assertTrue(checkWrite(new Point()));
- assertTrue(checkWrite(new Point(1, 2)));
+ public void testSerializeWrite2() {
+ checkWrite(new Point(1, 2));
}
public void createSerializeTemplates() {
@@ -144,8 +153,8 @@
}
public static void main(String[] args) {
-// junit.textui.TestRunner.run(PointTest.class);
- new PointTest("").createSerializeTemplates();
+// new PointTest("").createSerializeTemplates();
+ junit.textui.TestRunner.run(PointTest.class);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PolygonTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PolygonTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PolygonTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/PolygonTest.java Fri Mar 30 03:52:16 2007
@@ -30,10 +30,13 @@
public class PolygonTest extends ShapeTestCase {
+ static {
+ SERIALIZATION_TEST = true;
+ }
+
public PolygonTest(String name) {
super(name);
- filterImage = createFilter("^(polygon).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
- serializePath = getSerializePath(Polygon.class);
+// filterImage = createFilter("^(polygon).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
}
public void testCreate1() {
@@ -308,24 +311,30 @@
return obj.getClass().getName() + "[" + data + "]";
}
- public void _testSerializeRead() {
- assertTrue(checkRead(new Polygon()));
- assertTrue(checkRead(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3)));
+ public void testSerializeRead1() {
+ checkRead(new Polygon());
}
- public void _testSerializeWrite() {
- assertTrue(checkWrite(new Polygon()));
- assertTrue(checkWrite(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3)));
+ public void testSerializeRead2() {
+ checkRead(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3));
+ }
+
+ public void testSerializeWrite1() {
+ checkWrite(new Polygon());
}
+ public void testSerializeWrite2() {
+ checkWrite(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3));
+ }
+
public void createSerializeTemplates() {
saveSerialized(new Polygon());
saveSerialized(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3));
}
public static void main(String[] args) {
-// junit.textui.TestRunner.run(PolygonTest.class);
- new PolygonTest("").createSerializeTemplates();
+// new PolygonTest("").createSerializeTemplates();
+ junit.textui.TestRunner.run(PolygonTest.class);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RectangleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RectangleTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RectangleTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RectangleTest.java Fri Mar 30 03:52:16 2007
@@ -27,11 +27,14 @@
public class RectangleTest extends SerializeTestCase {
+ static {
+ SERIALIZATION_TEST = true;
+ }
+
Rectangle r;
public RectangleTest(String name) {
super(name);
- serializePath = getSerializePath(Rectangle.class);
}
@Override
@@ -344,16 +347,28 @@
assertEquals(new Rectangle2D.Double(0, 0, 5, 6), r.createUnion(new Rectangle2D.Double(0, 0, 5, 6))); // Cover
}
- public void testSerializeRead() {
- assertTrue(checkRead(new Rectangle()));
- assertTrue(checkRead(new Rectangle(1, 2)));
- assertTrue(checkRead(new Rectangle(1, 2, 3, 4)));
+ public void testSerializeRead1() {
+ checkRead(new Rectangle());
+ }
+
+ public void testSerializeRead2() {
+ checkRead(new Rectangle(1, 2));
+ }
+
+ public void testSerializeRead3() {
+ checkRead(new Rectangle(1, 2, 3, 4));
}
- public void testSerializeWrite() {
- assertTrue(checkWrite(new Rectangle()));
- assertTrue(checkWrite(new Rectangle(1, 2)));
- assertTrue(checkWrite(new Rectangle(1, 2, 3, 4)));
+ public void testSerializeWrite1() {
+ checkWrite(new Rectangle());
+ }
+
+ public void testSerializeWrite2() {
+ checkWrite(new Rectangle(1, 2));
+ }
+
+ public void testSerializeWrite3() {
+ checkWrite(new Rectangle(1, 2, 3, 4));
}
public void createSerializeTemplates() {
@@ -363,9 +378,10 @@
}
public static void main(String[] args) {
-// junit.textui.TestRunner.run(RectangleTest.class);
- new RectangleTest("").createSerializeTemplates();
+// new RectangleTest("").createSerializeTemplates();
+ junit.textui.TestRunner.run(RectangleTest.class);
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt;
import java.io.File;
@@ -26,84 +22,82 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.net.URL;
import junit.framework.TestCase;
-
public class SerializeTestCase extends TestCase {
- static final String POSTFIX = ".actual";
- static final String FOLDER = "serialization";
-
+ public static boolean SERIALIZATION_TEST = false;
+
public String serializePath;
-
+
public SerializeTestCase(String name) {
super(name);
- }
-
- public static String getSerializePath(Class<?> serializeClass) {
- String path = System.getProperty("TEST_SRC_DIR");
- assertNotNull("Variable TEST_SRC_DIR not defined", path);
- if (!path.endsWith(File.separator)) {
- path += File.separator;
+ if (SERIALIZATION_TEST) {
+ String classPath = "serialization/" + Tools.getClasstPath(this.getClass());
+ URL url = ClassLoader.getSystemClassLoader().getResource(classPath);
+ assertNotNull("Path not found " + classPath, url);
+ serializePath = url.getPath();
}
- String name = serializeClass.getName();
- name = name.substring(0, name.lastIndexOf('.'));
- path += name.replace('.', File.separator.charAt(0)) + File.separator + FOLDER + File.separator;
- new File(path).mkdirs();
- return path;
}
public String objToStr(Object obj) {
return obj.toString();
}
- public boolean checkRead(Object obj) {
- assertNotNull("Serialize path not defined");
+ public void checkRead(Object obj) {
+ String file = serializePath + objToStr(obj) + ".ser";
+ Object golden = loadSerialized(file);
+ assertTrue("Non equals objects " + file, objToStr(golden).equals(objToStr(obj)));
+ }
+
+ public void checkWrite(Object obj) {
+ String name = objToStr(obj);
+ String expected = serializePath + name + ".ser";
+ File actual = null;
try {
- Object template = loadSerialized(serializePath + objToStr(obj));
- return objToStr(template).equals(objToStr(obj));
+ actual = File.createTempFile(name, ".actual", new File(serializePath));
+ actual.deleteOnExit();
} catch (IOException e) {
- } catch (ClassNotFoundException e) {
+ fail("Can't create temp file");
}
- return false;
+ saveSerialized(obj, actual.getPath());
+ assertTrue("Non equals files " + expected, compare(expected, actual.getPath()));
}
- public boolean checkWrite(Object obj) {
- assertNotNull("Serialize path not defined");
- String file = serializePath + objToStr(obj);
- saveSerialized(obj, file + POSTFIX);
- return compare(file, file + POSTFIX);
+ public Object loadSerialized(String file) {
+ try {
+ //System.out.println("load " + file);
+ FileInputStream fs = new FileInputStream(file);
+ ObjectInputStream os = new ObjectInputStream(fs);
+ Object obj = os.readObject();
+ os.close();
+ fs.close();
+ return obj;
+ } catch (Exception e) {
+ fail("Can''t read object from file " + file);
+ }
+ return null;
}
public void saveSerialized(Object obj) {
- assertNotNull("Serialize path not defined");
saveSerialized(obj, serializePath + objToStr(obj));
}
public void saveSerialized(Object obj, String file) {
try {
+// System.out.println("save " + file);
FileOutputStream fs = new FileOutputStream(file);
ObjectOutputStream os = new ObjectOutputStream(fs);
os.writeObject(obj);
os.close();
fs.close();
- System.out.println("Write " + file);
} catch (Exception e) {
- System.out.println("Can''t write object to file " + file);
+ fail("Can''t write object to file " + file);
}
}
- public Object loadSerialized(String file) throws IOException, ClassNotFoundException {
- FileInputStream fs = new FileInputStream(file);
- ObjectInputStream os = new ObjectInputStream(fs);
- Object obj = os.readObject();
- os.close();
- fs.close();
- System.out.println("Read " + file);
- return obj;
- }
-
boolean compare(String file1, String file2) {
boolean cmp = false;
try {
@@ -136,9 +130,9 @@
fs1.close();
fs2.close();
} catch (Exception e) {
- System.out.println("Can''t compare files " + file1 + " and " + file2);
+ fail("Can''t compare files " + file1 + " and " + file2);
}
return cmp;
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Tools.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Tools.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Tools.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Tools.java Fri Mar 30 03:52:16 2007
@@ -14,28 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.awt.geom.AffineTransform;
import java.awt.geom.CubicCurve2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.QuadCurve2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.StreamTokenizer;
import java.io.Writer;
-import junit.framework.Assert;
+import java.util.Arrays;
+
+//import javax.imageio.ImageIO;
+
import org.apache.harmony.awt.gl.MultiRectAreaOp;
+import junit.framework.Assert;
+
public abstract class Tools {
+ static String typeName[] = {"move", "line", "quad", "cubic", "close"};
+
static int findString(String buf[], String value) {
for(int i = 0; i < buf.length; i++) {
if (buf[i].equals(value)) {
@@ -45,6 +52,12 @@
Assert.fail("Unknown value " + value);
return -1;
}
+
+ public static String getClasstPath(Class clazz) {
+ String name = clazz.getName();
+ name = name.substring(0, name.lastIndexOf('.'));
+ return name.replace('.', java.io.File.separator.charAt(0)) + java.io.File.separator;
+ }
public static class Shape {
@@ -61,8 +74,41 @@
static final double IMAGE_MAX_BORDER = 100.0;
static final Color backColor = Color.white;
- static String typeName[] = {"move", "line", "quad", "cubic", "close"};
+ public static Frame show(final java.awt.Shape shape) {
+ Frame f = new Frame("Shape") {
+
+ public void paint(Graphics g) {
+ // Background
+ g.setColor(Color.white);
+ g.fillRect(0, 0, getWidth(), getHeight());
+
+ // Fill shape
+ g.setColor(Color.lightGray);
+ ((Graphics2D)g).fill(shape);
+
+ // Draw shape
+ g.setColor(Color.black);
+ ((Graphics2D)g).draw(shape);
+// java.awt.image.BufferedImage img = Shape.createImage(shape, null, Color.gray, Color.lightGray);
+// g.drawImage(img, 0, 0, img.getWidth(), img.getHeight(), null);
+ }
+
+ };
+
+ f.addWindowListener(
+ new WindowAdapter() {
+ public void windowClosing(WindowEvent e) {
+ System.exit(0);
+ }
+ }
+ );
+
+ f.setSize(600, 400);
+ f.show();
+ return f;
+ }
+
public static void save(java.awt.Shape s, String fileName) {
try {
FileWriter f = new FileWriter(fileName);
@@ -135,10 +181,10 @@
return s;
}
- public static java.awt.image.BufferedImage createImage(java.awt.Shape src, AffineTransform t, Color draw, Color fill) {
+ public static java.awt.image.BufferedImage createImage(java.awt.Shape shape, AffineTransform t, Color draw, Color fill) {
// Calculate image border
- Rectangle r = src.getBounds();
+ Rectangle r = shape.getBounds();
double border = r.getWidth() * IMAGE_REL_BORDER;
border = Math.min(IMAGE_MAX_BORDER, border);
border = Math.max(IMAGE_MIN_BORDER, border);
@@ -150,7 +196,7 @@
t.setToTranslation(- r.getX() + border, - r.getY() + border);
}
java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath();
- dst.append(src.getPathIterator(t), false);
+ dst.append(shape.getPathIterator(t), false);
java.awt.image.BufferedImage img =
new java.awt.image.BufferedImage(
@@ -183,15 +229,15 @@
return PathIterator.equals(s1.getPathIterator(null), s2.getPathIterator(null), delta);
}
- public static java.awt.Shape scale(java.awt.Shape src, double k) {
- java.awt.geom.PathIterator path = src.getPathIterator(AffineTransform.getScaleInstance(k, k));
+ public static java.awt.Shape scale(java.awt.Shape shape, double k) {
+ java.awt.geom.PathIterator path = shape.getPathIterator(AffineTransform.getScaleInstance(k, k));
java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath(path.getWindingRule());
dst.append(path, false);
return dst;
}
- public static java.awt.Shape flip(java.awt.Shape src) {
- java.awt.geom.PathIterator path = src.getPathIterator(new AffineTransform(0, 1, 1, 0, 0, 0));
+ public static java.awt.Shape flip(java.awt.Shape shape) {
+ java.awt.geom.PathIterator path = shape.getPathIterator(new AffineTransform(0, 1, 1, 0, 0, 0));
java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath(path.getWindingRule());
dst.append(path, false);
return dst;
@@ -345,33 +391,7 @@
}
public static class BufferedImage {
-/*
- public static java.awt.image.BufferedImage load(String filename) {
- java.awt.image.BufferedImage img = null;
- try {
- FileInputStream in = new FileInputStream(filename);
- JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in);
- img = decoder.decodeAsBufferedImage();
- in.close();
- } catch (Exception e) {
- Assert.fail("Can't open file: " + filename);
- }
- return img;
- }
- public static void save(java.awt.image.BufferedImage img, String filename) {
- try {
- FileOutputStream out = new FileOutputStream(filename);
- JPEGEncodeParam param = JPEGCodec.getDefaultJPEGEncodeParam(img);
- param.setQuality(1.0f, false);
- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out, param);
- encoder.encode(img);
- out.close();
- } catch (Exception e) {
- Assert.fail("Can't save file: " + filename);
- }
- }
-*/
public static java.awt.image.BufferedImage load(String filename) {
java.awt.image.BufferedImage img = null;
try {
@@ -440,6 +460,8 @@
public static class PathIterator {
+ public static String equalsError = "";
+
static boolean coordsEquals(double coords1[], double coords2[], int count, double delta) {
for(int i = 0; i < count; i++) {
if (Math.abs(coords1[i] - coords2[i]) > delta) {
@@ -459,21 +481,27 @@
}
public static boolean equals(java.awt.geom.PathIterator p1, java.awt.geom.PathIterator p2, double delta) {
+ equalsError = "";
if (p1.getWindingRule() != p2.getWindingRule()) {
+ equalsError = "WindingRule expected " + p1.getWindingRule() + " but was " + p2.getWindingRule();
return false;
}
+ int count = 0;
double coords1[] = new double[6];
double coords2[] = new double[6];
while(!p1.isDone() && !p2.isDone()) {
int type1 = p1.currentSegment(coords1);
int type2 = p2.currentSegment(coords2);
if (type1 != type2 || !coordsEquals(coords1, coords2, Shape.pointCount[type1], delta)) {
+ equalsError = "Expected #" + count + " segment "+ typeName[type1] + Arrays.toString(coords1) + " but was " + typeName[type2] + Arrays.toString(coords2);
return false;
}
p1.next();
p2.next();
+ count++;
}
if (p1.isDone() != p2.isDone()) {
+ equalsError = "Expected #" + count + " isDone " + p1.isDone() + " but was " + p2.isDone();
return false;
}
return true;
@@ -523,6 +551,7 @@
}
path.next();
}
+ out += "done\n";
return out;
}
}
@@ -644,4 +673,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.Shape;
@@ -27,6 +23,10 @@
public class AffineTransformTest extends GeomTestCase {
+ static {
+ SERIALIZATION_TEST = true;
+ }
+
final static double ROTATION_DELTA = 1E-5;
double[][] type = new double[][]{
@@ -102,7 +102,6 @@
public AffineTransformTest(String name) {
super(name);
- serializePath = getSerializePath(AffineTransform.class);
}
@Override
@@ -225,8 +224,6 @@
s += Integer.toString(type & ~all) + ",";
}
}
-// System.out.println(s);
-// return s;
return Integer.toString(type);
}
@@ -493,7 +490,6 @@
t.translate(8, 9);
assertEquals(
AffineTransform.TYPE_GENERAL_TRANSFORM,
-// new double[]{2, 3, 4, 5, 14, 16},
new double[]{2, 3, 4, 5, 58, 76},
0.0,
t);
@@ -509,7 +505,6 @@
t.scale(2, 3);
assertEquals(
AffineTransform.TYPE_GENERAL_TRANSFORM,
-// new double[]{4, 9, 8, 15, 12, 21},
new double[]{4, 6, 12, 15, 6, 7},
0.0,
t);
@@ -526,7 +521,6 @@
assertEquals(
AffineTransform.TYPE_GENERAL_TRANSFORM,
new double[]{10, 13, 10, 14, 6, 7},
-// new double[]{11, 7, 19, 13, 27, 19},
0.0,
t);
}
@@ -548,7 +542,6 @@
assertEquals(
AffineTransform.TYPE_GENERAL_TRANSFORM,
new double[]{4, 5, -2, -3, 6, 7},
-// new double[]{-3, 2, -5, 4, -7, 6},
0.0,
t);
}
@@ -881,14 +874,20 @@
m[1] + ", " + m[3] + ", " + m[5] + "]]";
}
- public void testSerializeRead() {
- assertTrue(checkRead(new AffineTransform()));
- assertTrue(checkRead(new AffineTransform(1, 2, 3, 4, 5, 6)));
+ public void testSerializeRead1() {
+ checkRead(new AffineTransform());
+ }
+
+ public void testSerializeRead2() {
+ checkRead(new AffineTransform(1, 2, 3, 4, 5, 6));
+ }
+
+ public void testSerializeWrite1() {
+ checkWrite(new AffineTransform());
}
- public void testSerializeWrite() {
- assertTrue(checkWrite(new AffineTransform()));
- assertTrue(checkWrite(new AffineTransform(1, 2, 3, 4, 5, 6)));
+ public void testSerializeWrite2() {
+ checkWrite(new AffineTransform(1, 2, 3, 4, 5, 6));
}
public void createSerializeTemplates() {
@@ -897,8 +896,8 @@
}
public static void main(String[] args) {
-// junit.textui.TestRunner.run(AffineTransformTest.class);
- new AffineTransformTest("").createSerializeTemplates();
+// new AffineTransformTest("").createSerializeTemplates();
+ junit.textui.TestRunner.run(AffineTransformTest.class);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java Fri Mar 30 03:52:16 2007
@@ -168,9 +168,8 @@
public Arc2DTest(String name) {
super(name);
- filterImage = createFilter("^(arc).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
+// filterImage = createFilter("^(arc).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
filterShape = createFilter("^(arc).*([.]shape)$", null);
-// filterBounds = createFilter("^(arc).*(bounds).*([.]ico)$", null);
}
@Override
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.Point;
@@ -68,8 +64,7 @@
public CubicCurve2DTest(String name) {
super(name);
- filterImage = createFilter("^(cubic).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
-// filterShape = createFilter("^(quad).*([.]shape)$", null);
+// filterImage = createFilter("^(cubic).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
}
@Override
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java Fri Mar 30 03:52:16 2007
@@ -14,17 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
public class Ellipse2DTest extends ShapeTestCase {
public Ellipse2DTest(String name) {
super(name);
- filterImage = createFilter("^(ellipse).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
+// filterImage = createFilter("^(ellipse).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
filterShape = createFilter("^(ellipse).*([.]shape)$", null);
}
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java Fri Mar 30 03:52:16 2007
@@ -24,7 +24,7 @@
import java.awt.Shape;
import java.awt.Tools;
-public class GeneralPathTest extends PathIteratorTestCase {
+public class GeneralPathTest extends ShapeTestCase {
// Test append
float[][][][] shapes1 = new float[][][][] {
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.SerializeTestCase;
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.Point;
@@ -68,9 +64,8 @@
QuadCurve2D q;
public QuadCurve2DTest(String name) {
- super(name);
- filterImage = createFilter("^(quad).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
-// filterShape = createFilter("^(quad).*([.]shape)$", null);
+ super(name);
+// filterImage = createFilter("^(quad).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
}
@Override
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.Point;
@@ -114,8 +110,7 @@
public Rectangle2DTest(String name) {
super(name);
- filterImage = createFilter("^(rect).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
-// filterShape = createFilter("^(rect).*([.]shape)$", null);
+// filterImage = createFilter("^(rect).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
}
@Override
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java?view=diff&rev=524038&r1=524037&r2=524038
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java Fri Mar 30 03:52:16 2007
@@ -14,10 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * @author Denis M. Kishenko
- * @version $Revision$
- */
package java.awt.geom;
import java.awt.geom.ShapeTestCase;
@@ -26,7 +22,7 @@
public RoundRectangle2DTest(String name) {
super(name);
- filterImage = createFilter("^(round).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
+// filterImage = createFilter("^(round).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)");
filterShape = createFilter("^(round).*([.]shape)$", null);
}