1.1 --- a/make/build.xml Mon Oct 21 10:09:19 2013 +0530
1.2 +++ b/make/build.xml Mon Oct 21 13:31:03 2013 +0400
1.3 @@ -46,6 +46,16 @@
1.4 <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
1.5 <!-- check if testng.jar is avaiable -->
1.6 <available property="testng.available" file="${file.reference.testng.jar}"/>
1.7 + <!-- check if Jemmy ang testng.jar are avaiable -->
1.8 + <condition property="jemmy.jfx.testng.available" value="true">
1.9 + <and>
1.10 + <available file="${file.reference.jemmyfx.jar}"/>
1.11 + <available file="${file.reference.jemmycore.jar}"/>
1.12 + <available file="${file.reference.jemmyawtinput.jar}"/>
1.13 + <available file="${file.reference.jfxrt.jar}"/>
1.14 + <isset property="testng.available"/>
1.15 + </and>
1.16 + </condition>
1.17
1.18 <!-- enable/disable make code coverage -->
1.19 <condition property="cc.enabled">
1.20 @@ -351,6 +361,31 @@
1.21 </java>
1.22 </target>
1.23
1.24 + <target name="check-jemmy.jfx.testng" unless="jemmy.jfx.testng.available">
1.25 + <echo message="WARNING: Jemmy or JavaFX or TestNG not available, will not run tests. Please copy testng.jar, JemmyCore.jar, JemmyFX.jar, JemmyAWTInput.jar under test${file.separator}lib directory. And make sure you have jfxrt.jar in ${java.home}${file.separator}lib${file.separator}ext dir."/>
1.26 + </target>
1.27 +
1.28 + <target name="testjfx" depends="jar, check-jemmy.jfx.testng, compile-test" if="jemmy.jfx.testng.available">
1.29 + <fileset id="test.classes" dir="${build.test.classes.dir}">
1.30 + <include name="**/framework/*Test.class"/>
1.31 + </fileset>
1.32 +
1.33 + <copy file="${file.reference.jfxrt.jar}" todir="dist"/>
1.34 +
1.35 + <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
1.36 + verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
1.37 + <jvmarg line="${ext.class.path}"/>
1.38 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
1.39 + <propertyset>
1.40 + <propertyref prefix="testjfx-test-sys-prop."/>
1.41 + <mapper from="testjfx-test-sys-prop.*" to="*" type="glob"/>
1.42 + </propertyset>
1.43 + <classpath>
1.44 + <pathelement path="${testjfx.run.test.classpath}"/>
1.45 + </classpath>
1.46 + </testng>
1.47 + </target>
1.48 +
1.49 <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
1.50 <fileset id="test.classes" dir="${build.test.classes.dir}">
1.51 <include name="**/framework/*Test.class"/>
