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
---
 server/build.xml |  6 +++---
 server/ivy.xml   | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'server')

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>
 
-- 
cgit v1.2.3