harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r428293 [2/2] - in /incubator/harmony/enhanced/classlib/trunk: modules/accessibility/ modules/accessibility/make/ modules/accessibility/src/test/api/ modules/accessibility/src/test/api/java/ modules/accessibility/src/test/api/java/common/ m...
Date Thu, 03 Aug 2006 09:51:27 GMT

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Thu Aug  3 02:49:47
2006
@@ -78,7 +78,7 @@
 
         <mkdir dir="${hy.accessibility.bin.test}" />
 
-        <javac srcdir="${hy.accessibility.src.test.java}"
+        <javac srcdir="${hy.accessibility.src.test.api}/java/common"
                destdir="${hy.accessibility.bin.test}"
                sourcepath=""
                source="${hy.javac.source}"
@@ -91,11 +91,11 @@
                 </fileset>
             </bootclasspath>
             <classpath location="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
+            <classpath location="${hy.hdk}/build/test/support.jar" /> 
         </javac>
     </target>
 
-    <target name="run.tests">
+    <target name="run.tests" if="with.awt.swing">
 
         <mkdir dir="${hy.tests.reports}" />
 
@@ -110,14 +110,9 @@
                dir="${hy.accessibility.bin.test}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-showversion"/>
-
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
-            <classpath>
-                <pathelement path="${hy.accessibility.bin.test}"/>
-            </classpath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
+            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <formatter type="xml" />
 
@@ -127,7 +122,7 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                 unless="test.case">
 
-                <fileset dir="${hy.accessibility.src.test.java}"/>
+                <fileset dir="${hy.accessibility.src.test.api}/java/common"/>
             </batchtest>
         </junit>
         <antcall target="touch-failures-file" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
Thu Aug  3 02:49:47 2006
@@ -20,10 +20,10 @@
       <src>
          <main>
             <java location="src/main/java" />
-        	<resources location="src/main/resources" />
+                <resources location="src/main/resources" />
          </main>
          <test>
-            <java location="src/test/java" />
+            <api location="src/test/api" />
             <resources location="src/test/resources" />
          </test>
          <natives location="src/natives" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Aug  3 02:49:47 2006
@@ -32,14 +32,14 @@
     </fileset>
                                
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
+             use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
 
     <property name="hy.awt.src.main.java.platform"
               value="${hy.awt.src.main.java}/../${hy.os}" />
 
-    <property name="hy.awt.src.test.java.platform"
-              value="${hy.awt.src.test.java}/../${hy.os}" />
+    <property name="hy.awt.src.test.api.java.platform"
+              value="${hy.awt.src.test.api}/java/${hy.os}" />
 
     <target name="build" depends="compile.java, build.jar" />
 
@@ -179,13 +179,17 @@
 
         <mkdir dir="${hy.awt.bin.test}" />
 
-        <javac srcdir="${hy.awt.src.test.java}"
-               destdir="${hy.awt.bin.test}"
+        <javac destdir="${hy.awt.bin.test}"
                sourcepath=""
                source="${hy.javac.source}"
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
+            <src>
+                <pathelement location="${hy.awt.src.test.api}/java/common" />
+                <pathelement location="${hy.awt.src.test.api.java.platform}" />
+            </src>
+               
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
@@ -193,9 +197,29 @@
             </bootclasspath>
             <classpath location="../../build/tests" />
         </javac>
+        <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>
+        <mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/geom/serialization" />
+        <copy todir="${hy.awt.bin.test}/java/awt/geom/serialization" overwrite="yes">
+            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/geom/serialization"
/>
+        </copy>
+        <mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/shapes" />
+        <copy todir="${hy.awt.bin.test}/java/awt/shapes" overwrite="yes">
+            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/shapes" />
+        </copy>
+        <mkdir dir="${hy.awt.src.test.api}/java/common/java/java/serialization" />
+        <copy todir="${hy.awt.bin.test}/java/awt/serialization" overwrite="yes">
+            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/serialization" />
+        </copy>    
+        <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>    
     </target>
 
-    <target name="run.tests">
+    <target name="run.tests" if="with.awt.swing.tests">
 
         <mkdir dir="${hy.tests.reports}" />
 
@@ -210,14 +234,10 @@
                dir="${hy.awt.bin.test}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-showversion"/>
-
+            <jvmarg value="-DTEST_SRC_DIR=${hy.awt.bin.test}"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar"/>
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
-            <classpath>
-                <pathelement path="${hy.awt.bin.test}"/>
-            </classpath>
-
             <formatter type="xml" />
 
             <test name="${test.case}" todir="${hy.tests.reports}"
@@ -226,8 +246,23 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                 unless="test.case">
 
-                <fileset dir="${hy.awt.src.test.java}"/>
-            </batchtest>
+                <fileset dir="${hy.awt.src.test.api}/java/common">
+                    <include name="**/*Test*.java"/>
+                    <exclude name="java/awt/AWTTestCase.java"/>
+                    <exclude name="java/awt/ButtonTest.java"/>
+                    <exclude name="java/awt/SerializeTestCase.java"/>
+                    <exclude name="java/awt/geom/ShapeTest.java"/>
+                    <exclude name="java/awt/geom/ShapeTestCase.java"/>
+                    <exclude name="java/awt/geom/GeomTestCase.java"/>
+                    <exclude name="java/awt/geom/PathIteratorTestCase.java"/>
+                    <exclude name="org/apache/harmony/awt/gl/MultiRectAreaTestCase.java"/>
+                    <exclude name="java/awt/datatransfer/SystemFlavorMapTest.java"/>
+                    <exclude name="java/awt/MenuTest.java"/>
+                </fileset>
+                <fileset dir="${hy.awt.src.test.api.java.platform}">
+                    <include name="**/*Test*.java"/>
+                </fileset>
+            </batchtest>  
         </junit>
         <antcall target="touch-failures-file" />
         <antcall target="touch-errors-file" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml Thu Aug  3
02:49:47 2006
@@ -24,7 +24,7 @@
             <resources location="src/main/resources" />
          </main>
          <test>
-            <java location="src/test/api/java" />
+            <api location="src/test/api" />
             <resources location="src/test/api/resources" />
          </test>
          <natives location="src/natives" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Thu Aug  3 02:49:47
2006
@@ -88,7 +88,7 @@
 
         <mkdir dir="${hy.swing.bin.test}" />
 
-        <javac srcdir="${hy.swing.src.test.java}"
+        <javac srcdir="${hy.swing.src.test.api}/java/common"
                destdir="${hy.swing.bin.test}"
                sourcepath=""
                source="${hy.javac.source}"
@@ -101,10 +101,11 @@
                 </fileset>
             </bootclasspath>
             <classpath location="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" /> 
         </javac>
     </target>
 
-    <target name="run.tests">
+    <target name="run.tests" if="with.awt.swing.tests">
 
         <mkdir dir="${hy.tests.reports}" />
 
@@ -119,23 +120,45 @@
                dir="${hy.swing.bin.test}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-showversion"/>
-
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
-            <classpath>
-                <pathelement path="${hy.swing.bin.test}"/>
-            </classpath>
-
             <formatter type="xml" />
 
             <test name="${test.case}" todir="${hy.tests.reports}"
                   if="test.case" />
+            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                 unless="test.case">
 
-                <fileset dir="${hy.swing.src.test.java}"/>
+                <fileset dir="${hy.swing.src.test.api}/java/common">
+                    <include name="**/*Test*.java"/>
+                    <exclude name="javax/swing/RobotTestCase.java"/>
+                    <exclude name="javax/swing/SerializableTestCase.java"/>
+                    <exclude name="javax/swing/SwingWaitTestCase.java"/>
+                    <exclude name="javax/swing/SpringTest.java"/>
+                    <exclude name="javax/swing/table/BasicSwingTableTestCase.java"/>
+                    <exclude name="javax/swing/text/ViewTestHelpers.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_ElementEditTest.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_UpdateTest.java"/>
+                    <exclude name="javax/swing/text/GapContent_InternalTest.java"/>
+                    <exclude name="javax/swing/text/GapContentTest.java"/>
+                    <exclude name="javax/swing/text/JTextComponentTest.java"/>
+                    <exclude name="javax/swing/text/ParagraphViewTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LayoutTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LineView_UpdateTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LineViewTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_VisualPositionTest.java"/>
+                    <exclude name="javax/swing/text/StyleContextTest.java"/>
+                    <exclude name="javax/swing/text/StringContentTest.java"/>
+                    <exclude name="javax/swing/text/StringContentTest_CommonTests.java"/>
+                    <exclude name="javax/swing/TestBundle.java"/>
+                    <exclude name="javax/swing/event/SwingPropertyChangeSupportTest.java"/>
+                    <exclude name="javax/swing/text/DefaultCaret_MultithreadedTest.java"/>
+                    <exclude name="javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java"/>
+                    <exclude name="javax/swing/JEditorPaneTest.java"/>
+                </fileset>
             </batchtest>
         </junit>
         <antcall target="touch-failures-file" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml?rev=428293&r1=428292&r2=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml Thu Aug
 3 02:49:47 2006
@@ -23,7 +23,7 @@
             <resources location="src/main/resources" />
          </main>
          <test>
-            <java location="src/test/java" />
+            <api location="src/test/api" />
             <resources location="src/test/resources" />
          </test>
          <natives location="src/natives" />

Copied: incubator/harmony/enhanced/classlib/trunk/support/src/test/java/javax/swing/BasicSwingTestCase.java
(from r427506, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_tests/swing/test/common/unit/javax/swing/BasicSwingTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/support/src/test/java/javax/swing/BasicSwingTestCase.java?p2=incubator/harmony/enhanced/classlib/trunk/support/src/test/java/javax/swing/BasicSwingTestCase.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_tests/swing/test/common/unit/javax/swing/BasicSwingTestCase.java&r1=427506&r2=428293&rev=428293&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_tests/swing/test/common/unit/javax/swing/BasicSwingTestCase.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/support/src/test/java/javax/swing/BasicSwingTestCase.java
Thu Aug  3 02:49:47 2006
@@ -49,8 +49,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.x.swing.Utilities;
-
 public abstract class BasicSwingTestCase extends TestCase {
     public static final long DEFAULT_TIMEOUT_DELAY = 10000;
 
@@ -63,7 +61,7 @@
 
     static {
         String timeoutProp = System.getProperty("test.timeout");
-        if (Utilities.isEmptyString(timeoutProp)) {
+        if (timeoutProp == null || timeoutProp.length() == 0) {
             defaultTimeoutDelay = DEFAULT_TIMEOUT_DELAY;
         } else {
             defaultTimeoutDelay = Integer.parseInt(timeoutProp);



Mime
View raw message