From e6d506494c8ead64e72db63d951be9a79f6bb482 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 26 Feb 2013 11:07:42 +0200
Subject: Renamed "tests" target to "test" and added "test-all" (#9998)

The "test" target runs all tests which do not require additional servers or setup. Can be run immediately after cloning the project.
The "test-all" target runs also integration tests and UI tests which require access to servers or additional setup.

Change-Id: I2f5371dc5be805ba12766c8187a2b58fbc7f7db4
---
 all/build.xml             |  2 +-
 build.xml                 |  7 +++++--
 buildhelpers/build.xml    |  4 ++--
 buildhelpers/ivy.xml      |  2 +-
 client-compiled/build.xml |  4 ++--
 client-compiler/build.xml |  4 ++--
 client/build.xml          |  6 +++---
 client/ivy.xml            |  8 ++++----
 common.xml                | 38 +++++++++++++++++++-------------------
 server/build.xml          |  6 +++---
 server/ivy.xml            | 30 +++++++++++++++---------------
 shared/build.xml          |  4 ++--
 shared/ivy.xml            |  4 ++--
 theme-compiler/build.xml  |  6 +++---
 theme-compiler/ivy.xml    | 14 +++++++-------
 themes/build.xml          |  4 ++--
 uitest/build.xml          | 10 +++++-----
 17 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/all/build.xml b/all/build.xml
index 40d82b3d47..4e1a557e53 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -113,7 +113,7 @@
 	<target name="checkstyle">
 		<!-- Checkstyle is handled by all separate modules -->
 	</target>
-	<target name="tests" depends="checkstyle">
+	<target name="test" depends="checkstyle">
 		<!-- No tests for this zip.. -->
 	</target>
 
diff --git a/build.xml b/build.xml
index 306b169bc7..37e4afd03b 100644
--- a/build.xml
+++ b/build.xml
@@ -40,7 +40,10 @@
 	<target name="checkstyle" depends="buildorder">
 		<subant buildpathref="build-path" target="checkstyle"/>
 	</target>
-	<target name="tests" depends="buildorder">
+	<target name="test" depends="buildorder">
+		<subant buildpathref="build-path" target="test" />
+	</target>
+	<target name="test-all" depends="buildorder">
 		<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
 		<parallel>
 			<sequential>
@@ -50,7 +53,7 @@
 					<property name="demo.war" value="${war.file}" />
 				</ant>
 			</sequential>
-			<subant buildpathref="build-path" target="tests" />
+			<subant buildpathref="build-path" target="test" />
 			<ant antfile="uitest/test.xml" target="test-package">
 				<property name="war.file" location="${war.file}" />
 			</ant>
diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml
index b56209f6cc..a101bff191 100644
--- a/buildhelpers/build.xml
+++ b/buildhelpers/build.xml
@@ -43,8 +43,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No JUnit tests for ${module.name}!</echo>
 	</target>
 </project>
\ No newline at end of file
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
index d8e4457296..28c4b005fe 100644
--- a/buildhelpers/ivy.xml
+++ b/buildhelpers/ivy.xml
@@ -18,7 +18,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" />
+        <conf name="test" />
     </configurations>
     <publications>
         <artifact type="jar" />
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 1a78b17a7f..4554773be9 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -130,8 +130,8 @@
 	<target name="checkstyle">
 		<echo>No java files in module</echo>
 	</target>
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No tests for ${module.name}!</echo>
 	</target>
 
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index 64368b4957..cd8433f1cf 100644
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -60,8 +60,8 @@ gwt.svnrev=${git.revision}</echo>
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No tests for ${module.name}!</echo>
 	</target>
 
diff --git a/client/build.xml b/client/build.xml
index d0dae91dfa..a2262eed7d 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -20,7 +20,7 @@
 		-->
 		<fileset file="${gwt.user.jar}" />
 	</path>
-	<path id="classpath.tests.custom" />
+	<path id="classpath.test.custom" />
 
 	<target name="jar">
 		<property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
@@ -69,8 +69,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<antcall target="common.tests.run" />
+	<target name="test" depends="checkstyle">
+		<antcall target="common.test.run" />
 	</target>
 
 </project>
\ No newline at end of file
diff --git a/client/ivy.xml b/client/ivy.xml
index 4b56338c24..5d079537b9 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -11,7 +11,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" />
+        <conf name="test" />
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
@@ -25,15 +25,15 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,tests->build"></dependency>
+            rev="${vaadin.version}" conf="build,test->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build->build"></dependency>
+            rev="${vaadin.version}" conf="build,test->build"></dependency>
 
         <!-- gwt-user dependencies -->
         <dependency org="org.w3c.css" name="sac" rev="1.3" />
 
         <dependency org="junit" name="junit" rev="4.5"
-            conf="tests->default" />
+            conf="test->default" />
 
         <dependency org="javax.validation" name="validation-api"
             rev="1.0.0.GA" conf="build->default,sources" />
diff --git a/common.xml b/common.xml
index 6e88bf6113..f575c3606d 100644
--- a/common.xml
+++ b/common.xml
@@ -293,25 +293,25 @@
 		<mkdir dir="${classes}" />
 	</target>
 
-	<target name="tests.run" depends="tests.compile">
+	<target name="test.run" depends="test.compile">
 		<fail unless="module.name" message="No module name given" />
 
 		<property name="result.dir" location="result" />
 		<property name="classes" location="${result.dir}/classes" />
-		<property name="tests.src" location="${result.dir}/../tests/src" />
-		<property name="tests.classes" location="${result.dir}/tests/classes" />
+		<property name="test.src" location="${result.dir}/../tests/src" />
+		<property name="test.classes" location="${result.dir}/tests/classes" />
 
 
 		<junit printsummary="withOutAndErr" fork="yes">
 			<formatter usefile="false" type="plain" />
 			<jvmarg value="-ea" />
-			<classpath location="${tests.classes}" />
+			<classpath location="${test.classes}" />
 			<classpath location="${classes}" />
 			<classpath refid="classpath.compile.custom" />
-			<classpath refid="classpath.tests.dependencies" />
+			<classpath refid="classpath.test.dependencies" />
 
 			<batchtest fork="yes">
-				<fileset dir="${tests.src}">
+				<fileset dir="${test.src}">
 					<exclude name="**/Abstract*" />
 					<exclude name="com/vaadin/tests/data/bean/*" />
 					<exclude name="com/vaadin/tests/util/*" />
@@ -323,26 +323,26 @@
 		</junit>
 	</target>
 
-	<target name="tests.compile" description="Compiles tests" depends="compile, dependencies.tests">
+	<target name="test.compile" description="Compiles tests" depends="compile, dependencies.test">
 		<fail unless="module.name" message="No module name given" />
 		<property name="result.dir" location="result" />
 		<property name="base.dir" location="${result.dir}/.." />
-		<property name="tests.src" location="${base.dir}/tests/src" />
-		<property name="tests.resources" location="${base.dir}/tests/resources" />
-		<property name="tests.classes" location="${result.dir}/tests/classes" />
+		<property name="test.src" location="${base.dir}/tests/src" />
+		<property name="test.resources" location="${base.dir}/tests/resources" />
+		<property name="test.classes" location="${result.dir}/tests/classes" />
 		<property name="classes" location="${result.dir}/classes" />
 
-		<mkdir dir="${tests.classes}" />
+		<mkdir dir="${test.classes}" />
 
-		<javac srcdir="${tests.src}" destdir="${tests.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-			<classpath refid="classpath.tests.dependencies" />
+		<javac srcdir="${test.src}" destdir="${test.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
+			<classpath refid="classpath.test.dependencies" />
 			<classpath location="${classes}" />
-			<classpath refid="classpath.tests.custom" />
+			<classpath refid="classpath.test.custom" />
 		</javac>
 
 		<!-- Copy resources -->
-		<copy todir="${tests.classes}" failonerror="false">
-			<fileset dir="${tests.resources}" />
+		<copy todir="${test.classes}" failonerror="false">
+			<fileset dir="${test.resources}" />
 		</copy>
 	</target>
 
@@ -352,9 +352,9 @@
 		<ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" />
 	</target>
 
-	<target name="dependencies.tests" description="Resolves dependencies needed by tests">
-		<ivy:resolve resolveid="common" conf="tests" />
-		<ivy:cachepath pathid="classpath.tests.dependencies" conf="tests" />
+	<target name="dependencies.test" description="Resolves dependencies needed by test">
+		<ivy:resolve resolveid="common" conf="test" />
+		<ivy:cachepath pathid="classpath.test.dependencies" conf="test" />
 	</target>
 
 	<target name="clean">
diff --git a/server/build.xml b/server/build.xml
index 91526dd1c5..d61f412883 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -13,7 +13,7 @@
 	<property name="module.symbolic" value="com.vaadin.server" />
 	<property name="result.dir" value="result" />
 	<path id="classpath.compile.custom" />
-	<path id="classpath.tests.custom" />
+	<path id="classpath.test.custom" />
 
 	<union id="jar.includes">
 		<union refid="server.gwt.includes" />
@@ -51,8 +51,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<antcall target="common.tests.run" />
+	<target name="test" depends="checkstyle">
+		<antcall target="common.test.run" />
 	</target>
 
 
diff --git a/server/ivy.xml b/server/ivy.xml
index 6911a7054f..d757e3a3cd 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -11,7 +11,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" visibility="private" />
+        <conf name="test" visibility="private" />
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
@@ -27,47 +27,47 @@
             rev="6.0.2" conf="build-provided,ide -> default" />
         <!--Servlet API version 2.4 -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.4" conf="build-provided,ide,tests -> default" />
+            rev="2.4" conf="build-provided,ide,test -> default" />
 
         <!--Portlet API version 2.0 (JSR-286) -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide,tests -> default" />
+            rev="2.0" conf="build-provided,ide,test -> default" />
 
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.2.1" conf="build-provided,ide,tests -> default" />
+            rev="1.2.1" conf="build-provided,ide,test -> default" />
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-provided,ide,tests -> default" />
+            rev="1.0.0.GA" conf="build-provided,ide,test -> default" />
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,tests" />
+            rev="${vaadin.version}" conf="build,test->build" />
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
-            rev="${vaadin.version}" conf="build,tests" />
+            rev="${vaadin.version}" conf="build,test->build" />
 
         <!-- Jsoup for BootstrapHandler -->
         <dependency org="org.jsoup" name="jsoup" rev="1.6.3"
-            conf="build,ide,tests -> default" />
+            conf="build,ide,test -> default" />
 
         <!-- TESTING DEPENDENCIES -->
 
         <!-- Test frameworks & related -->
         <dependency org="junit" name="junit" rev="4.5"
-            conf="tests,ide -> default" />
+            conf="test,ide -> default" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="tests,ide-> default" transitive="true" />
+            conf="test,ide-> default" transitive="true" />
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="tests,ide -> default" />
+            conf="test,ide -> default" />
         <dependency org="commons-io" name="commons-io" rev="1.4"
-            conf="tests->default" />
+            conf="test->default" />
         <dependency org="commons-lang" name="commons-lang"
-            rev="2.6" conf="tests,ide->default" />
+            rev="2.6" conf="test,ide->default" />
         <!-- Bean Validation implementation -->
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"
-            conf="tests -> default" />
+            conf="test -> default" />
         <dependency org="org.hibernate" name="hibernate-validator"
-            rev="4.2.0.Final" conf="tests -> default" />
+            rev="4.2.0.Final" conf="test -> default" />
 
     </dependencies>
 
diff --git a/shared/build.xml b/shared/build.xml
index 6ea753afa1..8520ee6eba 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -56,8 +56,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No tests for ${module.name}!</echo>
 	</target>
 
diff --git a/shared/ivy.xml b/shared/ivy.xml
index 88020e8d09..3b044e9ab4 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -11,7 +11,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" />
+        <conf name="test" />
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
@@ -21,7 +21,7 @@
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-shared-deps"
-            rev="1.0.2" conf="build,ide,tests->default" />
+            rev="1.0.2" conf="build,ide,test->default" />
     </dependencies>
 
 </ivy-module>
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index cd441dee70..277929d160 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -15,7 +15,7 @@
 	<property name="sass.parser.jj" location="src/com/vaadin/sass/internal/parser/Parser.jj" />
 	<path id="classpath.compile.custom">
 	</path>
-	<path id="classpath.tests.custom" />
+	<path id="classpath.test.custom" />
 
 	<!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**" />-->
 
@@ -51,8 +51,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<antcall target="common.tests.run" />
+	<target name="test" depends="checkstyle">
+		<antcall target="common.test.run" />
 	</target>
 
 </project>
\ No newline at end of file
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index b1a98b7101..f0646c04e6 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -11,7 +11,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" />
+        <conf name="test" />
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
@@ -23,17 +23,17 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,tests" />
+            rev="${vaadin.version}" conf="build,test->build" />
 
         <!-- Required build libs -->
         <dependency org="org.apache.commons" name="commons-jexl"
-            rev="2.1.1" conf="build,ide,tests->default" />
+            rev="2.1.1" conf="build,ide,test->default" />
         <dependency org="org.w3c.css" name="sac" rev="1.3"
-            conf="build,ide,tests->default" />
+            conf="build,ide,test->default" />
         <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.5" conf="build,ide,tests->default" />
+            rev="0.9.5" conf="build,ide,test->default" />
         <dependency org="commons-cli" name="commons-cli" rev="1.2"
-            conf="build,ide,tests->default" />
+            conf="build,ide,test->default" />
 
         <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"
@@ -41,7 +41,7 @@
 
         <!-- Testing libs -->
         <dependency org="junit" name="junit" rev="4.5"
-            conf="tests -> default" />
+            conf="test -> default" />
 
         <!-- Internally used, for now -->
         <dependency org="com.carrotsearch" name="smartsprites"
diff --git a/themes/build.xml b/themes/build.xml
index 6e9e3c9951..75b3e5a903 100644
--- a/themes/build.xml
+++ b/themes/build.xml
@@ -99,8 +99,8 @@
 	<target name="checkstyle">
 		<echo>No java files in module</echo>
 	</target>
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No tests for ${module.name}!</echo>
 	</target>
 
diff --git a/uitest/build.xml b/uitest/build.xml
index 53da0ae2e9..453fc26ea5 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -16,7 +16,7 @@
 	</path>
 
 	<target name="dependencies">
-		<!-- This is copied from common.xml to be able to add server.tests.source to the source path -->
+		<!-- This is copied from common.xml to be able to add server.test.source to the source path -->
 
 		<ivy:resolve resolveid="common" conf="build, build-provided" />
 		<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
@@ -28,12 +28,12 @@
 		<property name="result.dir" location="result" />
 		<property name="src" location="${result.dir}/../src" />
 		<property name="classes" location="${result.dir}/classes" />
-		<property name="server.tests.sources" location="${result.dir}/../../server/tests/src" />
+		<property name="server.test.sources" location="${result.dir}/../../server/tests/src" />
 		<mkdir dir="${classes}" />
 
 		<!-- TODO: Get rid of this -->
 		<javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-			<src path="${server.tests.sources}" />
+			<src path="${server.test.sources}" />
 			<include name="com/vaadin/tests/data/bean/**" />
 			<include name="com/vaadin/tests/VaadinClasses.java" />
 			<include name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
@@ -140,8 +140,8 @@
 	<target name="checkstyle">
 		<echo>Checkstyle is disabled for uitest for now</echo>
 	</target>
-	<target name="tests" depends="checkstyle">
-		<!--<antcall target="common.tests.run" />-->
+	<target name="test" depends="checkstyle">
+		<!--<antcall target="common.test.run" />-->
 		<echo>WHAT? No JUnit tests for ${module.name}!</echo>
 	</target>
 
-- 
cgit v1.2.3