Author: bdaw Date: 2007-10-23 12:16:42 -0400 (Tue, 23 Oct 2007) New Revision: 8757 Added: modules/test/trunk/tooling/src/main/java/ modules/test/trunk/tooling/src/main/java/org/ modules/test/trunk/tooling/src/main/java/org/jboss/ modules/test/trunk/tooling/src/main/java/unit/ modules/test/trunk/tooling/src/main/resources/ modules/test/trunk/tooling/src/test/ modules/test/trunk/tooling/src/test/java/ modules/test/trunk/tooling/src/test/java/org/ modules/test/trunk/tooling/src/test/java/org/jboss/ modules/test/trunk/tooling/src/test/java/org/jboss/test/ modules/test/trunk/tooling/src/test/resources/ modules/test/trunk/tooling/src/test/resources/assertkeyword-unit.xml modules/test/trunk/tooling/src/test/resources/simple-tests.xml Removed: modules/test/trunk/tooling/src/main/org/jboss/test/ modules/test/trunk/tooling/src/main/org/jboss/unit/ modules/test/trunk/tooling/src/resources/ Modified: modules/test/trunk/tooling/build.xml Log: tooling reorganization to maven structure Modified: modules/test/trunk/tooling/build.xml =================================================================== --- modules/test/trunk/tooling/build.xml 2007-10-23 15:47:48 UTC (rev 8756) +++ modules/test/trunk/tooling/build.xml 2007-10-23 16:16:42 UTC (rev 8757) @@ -127,6 +127,30 @@ _default:compile-etc, _default:compile-resources"> <!-- Add module specific elements here. --> + + + <!-- Workaround to include test classes from maven convention --> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${maven.module.test.sources}"/> + <classpath> + <path refid="javac.classpath"/> + <pathelement location="${build.classes}"/> + </classpath> + + <include name="${javac.includes}"/> + </javac> + </target> <!--+====================================================================+--> @@ -147,13 +171,13 @@ <fileset dir="${build.classes}"> <exclude name="org/jboss/test/**"/> </fileset> - <!--<fileset dir="${build.resources}/jboss-unit-jar"/>--> </jar> <jar jarfile="${build.lib}/jboss-unit-tooling-test.jar"> <fileset dir="${build.classes}"> <exclude name="org/jboss/unit/**"/> </fileset> + <fileset dir="${maven.module.test.resources}"/> </jar> </target> @@ -217,7 +241,7 @@ <jboss-unit> - <tests config="./output/resources/test/simple-tests.xml" suiteName="one"> + <tests config="./src/test/resources/simple-tests.xml" suiteName="one"> <!-- no include tag means invoke all --> <!-- but you can still exclude some tests --> <property name="propName" value="propValue"/> @@ -237,7 +261,7 @@ <exclude id="otherTestTwo"/> </tests> - <tests config="./output/resources/test/assertkeyword-unit.xml"> + <tests config="./src/test/resources/assertkeyword-unit.xml"> </tests> <!--<tests config="./output/resources/test/simple-tests.xml"> Copied: modules/test/trunk/tooling/src/main/java/unit (from rev 8756, modules/test/trunk/tooling/src/main/org/jboss/unit) Copied: modules/test/trunk/tooling/src/test/java/org/jboss/test (from rev 8756, modules/test/trunk/tooling/src/main/org/jboss/test) Copied: modules/test/trunk/tooling/src/test/resources/assertkeyword-unit.xml (from rev 8756, modules/test/trunk/tooling/src/resources/test/assertkeyword-unit.xml) =================================================================== --- modules/test/trunk/tooling/src/test/resources/assertkeyword-unit.xml (rev 0) +++ modules/test/trunk/tooling/src/test/resources/assertkeyword-unit.xml 2007-10-23 16:16:42 UTC (rev 8757) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.test.unit.tooling.AssertKeywordTest"/> + </test> + </pojo> +</jboss-unit> \ No newline at end of file Copied: modules/test/trunk/tooling/src/test/resources/simple-tests.xml (from rev 8756, modules/test/trunk/tooling/src/resources/test/simple-tests.xml) =================================================================== --- modules/test/trunk/tooling/src/test/resources/simple-tests.xml (rev 0) +++ modules/test/trunk/tooling/src/test/resources/simple-tests.xml 2007-10-23 16:16:42 UTC (rev 8757) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.test.unit.tooling.simple.SimpleTest1"/> + </test> + </pojo> +</jboss-unit> \ No newline at end of file