diff options
author | Henrik Paul <henrik@vaadin.com> | 2013-12-12 11:02:57 +0200 |
---|---|---|
committer | Henrik Paul <henrik@vaadin.com> | 2013-12-12 11:10:22 +0200 |
commit | 30f5934f275a7a095d6e314f942ff2a8eb1b265f (patch) | |
tree | 24358ddee99b090407e534aee97cdb47db4098ac | |
parent | 8d6256e98a63222f4b4969612d8d777a31974613 (diff) | |
download | vaadin-framework-30f5934f275a7a095d6e314f942ff2a8eb1b265f.tar.gz vaadin-framework-30f5934f275a7a095d6e314f942ff2a8eb1b265f.zip |
JUnit tests should be supported for shared (#13081)
Change-Id: Ia6243005fba362970cb199ad2aab217e56b5822a
-rw-r--r-- | .classpath | 1 | ||||
-rw-r--r-- | shared/build.xml | 5 | ||||
-rw-r--r-- | shared/ivy.xml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.classpath b/.classpath index c6230a2c55..130d4c0c49 100644 --- a/.classpath +++ b/.classpath @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="src" path="server/tests/src"/> <classpathentry kind="src" path="client/tests/src"/> + <classpathentry kind="src" path="shared/tests/src"/> <classpathentry kind="src" path="theme-compiler/tests/src"/> <classpathentry kind="src" path="theme-compiler/src"/> <classpathentry kind="src" path="theme-compiler/tests/resources"/> diff --git a/shared/build.xml b/shared/build.xml index 73a0a8df7f..966d250d66 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -15,7 +15,7 @@ <property name="src.filtered" location="${result.dir}/filtered-src" /> <property name="src" location="${src.filtered}" /> <path id="classpath.compile.custom" /> - + <path id="classpath.test.custom" /> <target name="jar"> <property name="shared.osgi.import" value="org.json;version="0.0.20080701", com.google.gwt.thirdparty.guava.common.annotations;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base.internal;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.cache;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.collect;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.eventbus;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.io;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.net;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.primitives;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.util.concurrent;version="10.0.1.rebased", com.google.gwt.thirdparty.streamhtmlparser;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.1.5.r10-rebased", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> @@ -57,8 +57,7 @@ </target> <target name="test" depends="checkstyle"> - <!--<antcall target="common.test.run" /> --> - <echo>WHAT? No tests for ${module.name}!</echo> + <antcall target="common.test.run" /> </target> </project> diff --git a/shared/ivy.xml b/shared/ivy.xml index fc54d680fa..169a52034d 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -22,6 +22,10 @@ <dependencies> <dependency org="com.vaadin" name="vaadin-shared-deps" rev="1.0.3" conf="build,ide,test->default" /> + + <dependency org="junit" name="junit" rev="4.11" + conf="test,ide -> default" /> + </dependencies> </ivy-module> |