Booking: ant test fixed

examples/booking/README.md

@@ -60,6 +60,13 @@ To test on a running server, use
 
     mvn clean test -Darquillian=jbossas-remote-7
 
+#### Using Ant
+
+In the example root directory run:
+
+    ant clean test
+
+
 ### Functional tests
 
 Functional tests are located in a separate project and are not executed during the build of the example. They test the built archive in an application server through browser-testing. They use:

examples/booking/build.xml

@@ -22,7 +22,6 @@
    <property name="ear.module.dir" value="${basedir}/${project.name}-ear"/>
    <property name="ejb.module.dir" value="${basedir}/${project.name}-ejb"/>
    <property name="web.module.dir" value="${basedir}/${project.name}-web"/>
-   <property name="tests.module.dir" value="${basedir}/${project.name}-tests"/>
 
    <property name="target.dir" value="target"/>
    <property name="target.classes.dir" value="${target.dir}/classes"/>
@@ -37,7 +36,7 @@
    <property name="src.test.java.dir" value="src/test/java"/>
    <property name="src.main.webapp.dir" value="src/main/webapp"/>
    <property name="src.main.resources.dir" value="src/main/resources"/>
-   <property name="src.test.resources-integration.dir" value="src/test/resources-integration"/>
+   <property name="src.test.resources.dir" value="src/test/resources"/>
    <property name="src.main.application.dir" value="src/main/application"/>
 
    <property name="javac.debug" value="true"/>
@@ -62,13 +61,13 @@
    <artifact:pom id="ejb-pom" file="${ejb.module.dir}/pom.xml"/>
    <artifact:pom id="web-pom" file="${web.module.dir}/pom.xml"/>
    <artifact:pom id="ear-pom" file="${ear.module.dir}/pom.xml"/>
-   <artifact:pom id="tests-pom" file="${tests.module.dir}/pom.xml">
-      <profile id="arq-jbossas-7-managed"/>
+   <artifact:pom id="ejb-test-pom" file="${ejb.module.dir}/pom.xml">
+       <profile id="arq-jbossas-7-managed"/>
    </artifact:pom>
 
    <!-- Root targets -->
    <target name="clean" 
-           depends="clean-ejb,clean-web,clean-ear,clean-tests"/>
+           depends="clean-ejb,clean-web,clean-ear"/>
 
    <target name="compile" 
            depends="compile-ejb,compile-web"/>
@@ -93,10 +92,6 @@
       <delete dir="${ear.module.dir}/${target.dir}"/>
    </target>
 
-   <target name="clean-tests">
-      <delete dir="${tests.module.dir}/${target.dir}"/>
-   </target>
-
    <!-- Compile -->
    <target name="compile-ejb">
       <artifact:dependencies pathId="ejb.module.classpath" pomRefId="ejb-pom"/>
@@ -178,14 +173,14 @@
    </target>
 
    <target name="package-ear" depends="install-web,install-ejb">
-      <artifact:dependencies pathId="ear.module.classpath" 
+      <artifact:dependencies pathId="ear.module.classpath"
             filesetId="ear.module.fileset" pomRefId="ear-pom"/>
       <artifact:dependencies filesetId="ejb.module.fileset" useScope="runtime"
             pomRefId="ejb-pom"/>
 
       <copy todir="${ear.module.dir}/${target.ear.dir}">
-        <fileset refid="ear.module.fileset"/>
-        <mapper>
+         <fileset refid="ear.module.fileset"/>
+         <mapper>
             <chainedmapper>
                <mapper type="flatten"/>
                <mapper type="glob" from="jboss-seam*.jar" to="jboss-seam.jar"/>
@@ -253,49 +248,56 @@
    </target>
 
    <!-- Tests -->
-   <target name="compile-test" depends="install-ear">
-      <artifact:dependencies pathId="tests.module.classpath" 
-            pomRefId="tests-pom"/>
+   <target name="compile-test" depends="compile-ejb">
+      <artifact:dependencies pathId="test.dependencies" pomRefId="ejb-test-pom" />
       <path id="combined.project.classpath">
-         <path refid="tests.module.classpath"/>
+         <path refid="test.dependencies" />
          <pathelement location="${ejb.module.dir}/${target.classes.dir}"/>
       </path>
-      <mkdir dir="${tests.module.dir}/${target.test.classes.dir}"/>
+      <copy todir="${ejb.module.dir}/${target.test.classes.dir}" filtering="true">
+          <filterset begintoken="${" endtoken="}">
+             <filter token="jacoco.agent" value="" />
+             <filter token="jndiPattern" value="java:app/seam-${project.name}/#{ejbName}" />
+             <filter token="distributable" value="${distributable}" />
+          </filterset>
+          <fileset dir="${ejb.module.dir}/${src.test.resources.dir}" />
+          <fileset dir="${ejb.module.dir}/${src.main.resources.dir}" />
+      </copy>
+      <mkdir dir="${ejb.module.dir}/${target.test.classes.dir}"/>
       <javac source="1.6" target="1.6" debug="${javac.debug}"
              deprecation="${javac.deprecation}"
-             destdir="${tests.module.dir}/${target.test.classes.dir}"
+             destdir="${ejb.module.dir}/${target.test.classes.dir}"
              nowarn="on"
              includeantruntime="false">
          <compilerarg value="-Xlint"/>
-         <src path="${tests.module.dir}/${src.test.java.dir}"/>
+         <src path="${ejb.module.dir}/${src.test.java.dir}"/>
          <classpath refid="combined.project.classpath"/>
       </javac>
    </target>
 
    <target name="test" depends="compile-test">
       <path id="combined.test.project.classpath">
          <path refid="combined.project.classpath"/>
-         <pathelement location="${tests.module.dir}/${target.test.classes.dir}"/>
+         <pathelement location="${ejb.module.dir}/${target.test.classes.dir}"/>
       </path>
-      <mkdir dir="${tests.module.dir}/${target.test.classes.dir}"/>
-      <mkdir dir="${tests.module.dir}/${target.test.results.dir}"/>
-      <mkdir dir="${tests.module.dir}/${target.test.reports.dir}"/>
-      <junit printsummary="yes" haltonfailure="no" fork="yes" dir="${tests.module.dir}">
+      <mkdir dir="${ejb.module.dir}/${target.test.classes.dir}"/>
+      <mkdir dir="${ejb.module.dir}/${target.test.results.dir}"/>
+      <mkdir dir="${ejb.module.dir}/${target.test.reports.dir}"/>
+      <junit printsummary="yes" haltonfailure="no" fork="yes" dir="${ejb.module.dir}">
          <formatter type="xml"/>
          <classpath refid="combined.test.project.classpath"/>
-         <batchtest fork="true" todir="${tests.module.dir}/${target.test.results.dir}">
-            <fileset dir="${tests.module.dir}/${target.test.classes.dir}">
+         <batchtest fork="true" todir="${ejb.module.dir}/${target.test.results.dir}">
+            <fileset dir="${ejb.module.dir}/${target.test.classes.dir}">
                <exclude name="**/Deployments.class"/>
-               <exclude name="**/selenium/*"/>
                <include name="**/*Test.class"/>
             </fileset>
          </batchtest>
       </junit>
-      <junitreport todir="${tests.module.dir}/${target.test.reports.dir}">
-         <fileset dir="${tests.module.dir}/${target.test.results.dir}">
+      <junitreport todir="${ejb.module.dir}/${target.test.reports.dir}">
+         <fileset dir="${ejb.module.dir}/${target.test.results.dir}">
             <include name="TEST-*.xml" />
          </fileset>
-         <report todir="${tests.module.dir}/${target.test.reports.dir}" />
+         <report todir="${ejb.module.dir}/${target.test.reports.dir}" />
       </junitreport>
    </target>
 </project>