1.1 --- a/samples/reexport/build.xml	Sat Jun 14 09:54:12 2008 +0200
     1.2 +++ b/samples/reexport/build.xml	Sat Jun 14 09:54:15 2008 +0200
     1.3 @@ -15,21 +15,49 @@
     1.4              <param name="version" value="query"/>
     1.5              <param name="cp" value="build/api1.0/classes"/>
     1.6          </antcall>
     1.7 +        <antcall target="-build-one">
     1.8 +            <param name="version" value="wrap1.0"/>
     1.9 +            <param name="cp" value="build/api1.0/classes"/>
    1.10 +        </antcall>
    1.11 +        <antcall target="-build-one">
    1.12 +            <param name="version" value="wrap2.0"/>
    1.13 +            <param name="cp" value="build/api2.0/classes"/>
    1.14 +        </antcall>
    1.15          
    1.16          <antcall target="-build-one">
    1.17              <param name="version" value="test"/>
    1.18              <param name="cp" value="build/api1.0/classes:build/query/classes:${junit.jar}"/>
    1.19          </antcall>
    1.20 +        <antcall target="-build-one">
    1.21 +            <param name="version" value="testwrap"/>
    1.22 +            <param name="cp" value="build/wrap1.0/classes:${junit.jar}"/>
    1.23 +        </antcall>
    1.24      </target>
    1.25      
    1.26      <target name="test" depends="build">
    1.27          <echo level="info" message="Running the Test against Query and Version 1.0 of String. This should succeeds."/>
    1.28          <antcall target="-run-one">
    1.29              <param name="version" value="api1.0"/>
    1.30 +            <param name="queryversion" value="query"/>
    1.31 +            <param name="test" value="test"/>
    1.32          </antcall>
    1.33          <echo level="info" message="Running the Test against Query and Version 2.0 of String. This should fail."/>
    1.34          <antcall target="-run-one">
    1.35              <param name="version" value="api2.0"/>
    1.36 +            <param name="queryversion" value="query"/>
    1.37 +            <param name="test" value="test"/>
    1.38 +        </antcall>
    1.39 +        <echo level="info" message="Running the Test against Wrapping Query 1.0. This should succeeds."/>
    1.40 +        <antcall target="-run-one">
    1.41 +            <param name="version" value="api1.0"/>
    1.42 +            <param name="queryversion" value="wrap1.0"/>
    1.43 +            <param name="test" value="testwrap"/>
    1.44 +        </antcall>
    1.45 +        <echo level="info" message="Running the Test against Wrapping Query 2.0. This should succeeds."/>
    1.46 +        <antcall target="-run-one">
    1.47 +            <param name="version" value="api2.0"/>
    1.48 +            <param name="queryversion" value="wrap2.0"/>
    1.49 +            <param name="test" value="testwrap"/>
    1.50          </antcall>
    1.51      </target>
    1.52      
    1.53 @@ -43,17 +71,17 @@
    1.54      
    1.55      <target name="-run-one">
    1.56          <fail message="You need to specify API version number" unless="version"/>
    1.57 -        <mkdir dir="build/testresults"/>
    1.58 -        <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    1.59 +        <mkdir dir="build/${test}results"/>
    1.60 +        <junit dir="build/${test}/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    1.61              <batchtest todir="build/testresults">
    1.62 -                <fileset dir="build/test/classes">
    1.63 +                <fileset dir="build/${test}/classes">
    1.64                      <filename name="**/*Test.class"/>
    1.65                  </fileset>
    1.66              </batchtest>
    1.67              <classpath>
    1.68                  <path location="build/${version}/classes"/>
    1.69 -                <path location="build/query/classes"/>
    1.70 -                <path location="build/test/classes"/>
    1.71 +                <path location="build/${queryversion}/classes"/>
    1.72 +                <path location="build/${test}/classes"/>
    1.73                  <path location="${junit.jar}"/>
    1.74              </classpath>
    1.75              <formatter type="brief" usefile="false"/>