Updated testingtools (Vaadin compatible)

svn changeset:7768/svn branch:6.0

diff --git a/build/build.xml b/build/build.xml
index 602b1c02329c8fbdd3c42fd074b4070c61b511ab..67fe7875741433e36f866e57f68f2b0d08d0296d 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1169,8 +1169,8 @@
       <fail unless="version" message="The 'version' property must be defined."/>
 
       <!-- Parameters for the test.xml script. -->
-      <fail unless="testingtools.tester.host" message="The 'testingtools.tester.host' property must be defined."/>
-      <fail unless="testingtools.deployment.url" message="The 'testingtools.deployment.url' property must be defined."/>
+      <fail unless="com.vaadin.testingtools.tester.host" message="The 'com.vaadin.testingtools.tester.host' property must be defined."/>
+      <fail unless="com.vaadin.testingtools.deployment.url" message="The 'com.vaadin.testingtools.deployment.url' property must be defined."/>
 
       <property name="package.platform.name" value="${product-file}-${package-platform}-${version}"/>
 
@@ -1182,8 +1182,8 @@
           <property name="package.filename" value="${package.linux.filename}"/>
           <property name="testing.testarea" value="/tmp/testarea"/>
           <property name="package.name" value="${package.platform.name}"/>
-          <property name="testingtools.tester.host" value="${testingtools.tester.host}"/>
-          <property name="testingtools.deployment.url" value="${testingtools.deployment.url}"/>
+          <property name="com.vaadin.testingtools.tester.host" value="${com.vaadin.testingtools.tester.host}"/>
+          <property name="com.vaadin.testingtools.deployment.url" value="${com.vaadin.testingtools.deployment.url}"/>
       </ant>
     </target>
 

diff --git a/tests/test.xml b/tests/test.xml
index 7c5f8ac250fc15fc9839cf3d551d1be0113fabf2..ede038d2223b898956350d18fb05eeb7513ca7ad 100644 (file)
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -82,8 +82,8 @@
     <!-- ================================================================== -->
 
        <target name="check-parameters">
-        <fail unless="testingtools.tester.host" message="The 'testingtools.tester.host' property must be defined."/>
-        <fail unless="testingtools.deployment.url" message="The 'testingtools.deployment.url' property must be defined."/>
+        <fail unless="com.vaadin.testingtools.tester.host" message="The 'com.vaadin.testingtools.tester.host' property must be defined."/>
+        <fail unless="com.vaadin.testingtools.deployment.url" message="The 'com.vaadin.testingtools.deployment.url' property must be defined."/>
     </target>
 
        <target name="run-tests" if="server.start.succeeded" depends="execute-tests">
@@ -94,8 +94,8 @@
                        <classpath>
                                <path refid="classpath" />
                        </classpath>
-                       <jvmarg value="-Dtestingtools.tester.host=${testingtools.tester.host}" />
-                       <jvmarg value="-Dtestingtools.deployment.url=${testingtools.deployment.url}" />
+                       <jvmarg value="-Dcom.vaadin.testingtools.tester.host=${com.vaadin.testingtools.tester.host}" />
+                       <jvmarg value="-Dcom.vaadin.testingtools.deployment.url=${com.vaadin.testingtools.deployment.url}" />
 
                        <batchtest>
                                <fileset dir="${test-output-dir}">