You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by lv...@apache.org on 2007/11/16 09:52:12 UTC
svn commit: r595596 - in /harmony/enhanced/classlib/trunk/modules/luni:
.classpath build.xml make/hyproperties.xml
src/test/api/common/tests/api/java/net/JarURLConnectionTest.java
src/test/impl/common/ src/test/impl/unix/ src/test/impl/windows/
Author: lvjing
Date: Fri Nov 16 00:52:10 2007
New Revision: 595596
URL: http://svn.apache.org/viewvc?rev=595596&view=rev
Log:
Apply for Harmony-5069.
Added:
harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/
harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/unix/
harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/windows/
Modified:
harmony/enhanced/classlib/trunk/modules/luni/.classpath
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/.classpath?rev=595596&r1=595595&r2=595596&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/.classpath (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/.classpath Fri Nov 16 00:52:10 2007
@@ -6,7 +6,9 @@
<classpathentry output="bin/test" kind="src" path="src/test/api/unix"/>
<classpathentry output="bin/main" kind="src" path="src/main/resources"/>
<classpathentry output="bin/test" kind="src" path="src/test/resources"/>
- <classpathentry output="bin/test" kind="src" path="src/test/impl"/>
+ <classpathentry output="bin/test" kind="src" path="src/test/impl/windows"/>
+ <classpathentry output="bin/test" kind="src" path="src/test/impl/common"/>
+ <classpathentry output="bin/test" kind="src" path="src/test/impl/unix"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/*"/>
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=595596&r1=595595&r2=595596&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Fri Nov 16 00:52:10 2007
@@ -28,6 +28,8 @@
<property name="hy.luni.src.test.api.java.platform"
value="${hy.luni.src.test.api}/${hy.os.family}" />
+ <property name="hy.luni.src.test.impl.java.platform"
+ value="${hy.luni.src.test.impl}/${hy.os.family}" />
<fileset id="classes" dir="${hy.build}">
<or>
<present targetdir="${hy.luni.src.main.java}" />
@@ -298,42 +300,53 @@
</jar>
</target>
- <target name="compile-tests" depends="copy-test-resources">
- <compile-tests description="JUnit Tests" destdir="${hy.luni.bin.test}">
+ <!-- compile both api tests and impl tests-->
+ <target name="compile-tests" depends="compile-tests-api, compile-tests-impl" />
+
+ <target name="compile-tests-api" depends="copy-test-resources">
+ <compile-tests description="JUnit API Tests" destdir="${hy.luni.bin.test}/api">
<javac-elements>
<src>
<pathelement location="${hy.luni.src.test.api}/common" />
<pathelement location="${hy.luni.src.test.api.java.platform}" />
- <pathelement location="${hy.luni.src.test}/impl" />
</src>
<include name="**/*.java" />
</javac-elements>
</compile-tests>
</target>
+ <target name="compile-tests-impl" depends="copy-test-resources">
+ <compile-tests description="JUnit Impl tests" destdir="${hy.luni.bin.test}/impl">
+ <javac-elements>
+ <src>
+ <pathelement location="${hy.luni.src.test.impl}/common" />
+ <pathelement location="${hy.luni.src.test.impl.java.platform}" />
+ </src>
+ <include name="**/*.java" />
+ </javac-elements>
+ </compile-tests>
+ </target>
+
<target name="prepare-exclude">
<prepare-exclude-list moduleName="luni" dir="./make"
result="${luni.exclude.file}"/>
</target>
- <target name="run-tests">
- <run-tests description="JUnit Tests">
+ <!-- run both api tests and impl tests -->
+ <target name="run-tests" depends="run-tests-api, run-tests-impl" />
+
+ <target name="run-tests-api">
+ <run-tests description="JUnit API Tests">
<junit-elements>
<classpath>
- <pathelement path="${hy.luni.bin.test}"/>
+ <pathelement path="${hy.luni.bin.test}/api"/>
<pathelement path="${hy.luni.src.test.resources}"/>
<pathelement path="../../build/tests"/>
<fileset dir="${hy.hdk}/build/test/">
<include name="*.jar" />
</fileset>
</classpath>
- <!-- Required by various tests that set security manager etc -->
- <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
-
- <!-- Required for running the java.net unit tests -->
- <jvmarg value="-Dtest.ini.file=../../support/src/test/resources/config/localhosttest.ini" />
-
-
+
<batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.luni.src.test.api}/common">
<!-- if ${test.case} -->
@@ -348,7 +361,41 @@
<!-- unless ${test.case} -->
<include name="**/*Test.java" unless="test.case" />
<excludesfile name="${luni.exclude.file}" unless="test.case" />
+ </fileset>
+ </batchtest>
+
+ </junit-elements>
+ </run-tests>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
+ </target>
+
+ <target name="run-tests-impl">
+ <run-tests description="JUnit Impl Tests">
+ <junit-elements>
+ <classpath>
+ <pathelement path="${hy.luni.bin.test}/impl"/>
+ <pathelement path="${hy.luni.src.test.resources}"/>
+ <pathelement path="../../build/tests"/>
+ <fileset dir="${hy.hdk}/build/test/">
+ <include name="*.jar" />
</fileset>
+ </classpath>
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <fileset dir="${hy.luni.src.test.impl}/common">
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${luni.exclude.file}" unless="test.case" />
+ </fileset>
+ <fileset dir="${hy.luni.src.test.impl.java.platform}">
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${luni.exclude.file}" unless="test.case" />
+ </fileset>
</batchtest>
</junit-elements>
@@ -438,6 +485,12 @@
<jvmarg line="${hy.test.vmargs}" />
<!-- Used by Support_Exec.execJava() -->
<jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+ <!-- Required by various tests that set security manager etc -->
+ <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
+
+ <!-- Required for running the java.net unit tests -->
+ <jvmarg value="-Dtest.ini.file=../../support/src/test/resources/config/localhosttest.ini" />
<junit-elements />
Modified: harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml?rev=595596&r1=595595&r2=595596&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml Fri Nov 16 00:52:10 2007
@@ -28,6 +28,7 @@
</main>
<test location="src/test">
<api location="src/test/api" />
+ <impl location="src/test/impl" />
<resources location="src/test/resources" />
</test>
<natives location="src/natives" />
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java?rev=595596&r1=595595&r2=595596&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java Fri Nov 16 00:52:10 2007
@@ -41,7 +41,7 @@
URLConnection uc;
- private static final URL BASE = JarURLConnectionTest.class.getClassLoader().getResource(JarURLConnectionTest.class.getPackage().getName().replace('.', File.separatorChar));
+ private static final URL BASE = JarURLConnectionTest.class.getClassLoader().getResource(".."+File.separatorChar+JarURLConnectionTest.class.getPackage().getName().replace('.', File.separatorChar));
/**
* @tests java.net.JarURLConnection#getAttributes()