mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 329 Wiki Activity
Browse Source

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
tags/7.1.0.beta1
Artur Signell 11 years ago
parent
c965ff2475
commit
e6d506494c
17 changed files with 78 additions and 75 deletions
Split View Show Diff Stats
  1. 1
    1
      all/build.xml
  2. 5
    2
      build.xml
  3. 2
    2
      buildhelpers/build.xml
  4. 1
    1
      buildhelpers/ivy.xml
  5. 2
    2
      client-compiled/build.xml
  6. 2
    2
      client-compiler/build.xml
  7. 3
    3
      client/build.xml
  8. 4
    4
      client/ivy.xml
  9. 19
    19
      common.xml
  10. 3
    3
      server/build.xml
  11. 15
    15
      server/ivy.xml
  12. 2
    2
      shared/build.xml
  13. 2
    2
      shared/ivy.xml
  14. 3
    3
      theme-compiler/build.xml
  15. 7
    7
      theme-compiler/ivy.xml
  16. 2
    2
      themes/build.xml
  17. 5
    5
      uitest/build.xml

+ 1
- 1
all/build.xml View File

@@ -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>


+ 5
- 2
build.xml View File

@@ -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>

+ 2
- 2
buildhelpers/build.xml View File

@@ -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>

+ 1
- 1
buildhelpers/ivy.xml View File

@@ -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" />

+ 2
- 2
client-compiled/build.xml View File

@@ -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>


+ 2
- 2
client-compiler/build.xml View File

@@ -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>


+ 3
- 3
client/build.xml View File

@@ -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>

+ 4
- 4
client/ivy.xml View File

@@ -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" />

+ 19
- 19
common.xml View File

@@ -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">

+ 3
- 3
server/build.xml View File

@@ -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>



+ 15
- 15
server/ivy.xml View File

@@ -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>


+ 2
- 2
shared/build.xml View File

@@ -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>


+ 2
- 2
shared/ivy.xml View File

@@ -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>

+ 3
- 3
theme-compiler/build.xml View File

@@ -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>

+ 7
- 7
theme-compiler/ivy.xml View File

@@ -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"

+ 2
- 2
themes/build.xml View File

@@ -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>


+ 5
- 5
uitest/build.xml View File

@@ -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>


Write Preview
Loading…
Cancel
Save