summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Paul <henrik@vaadin.com>2013-12-12 11:02:57 +0200
committerHenrik Paul <henrik@vaadin.com>2013-12-12 11:10:22 +0200
commit30f5934f275a7a095d6e314f942ff2a8eb1b265f (patch)
tree24358ddee99b090407e534aee97cdb47db4098ac
parent8d6256e98a63222f4b4969612d8d777a31974613 (diff)
downloadvaadin-framework-30f5934f275a7a095d6e314f942ff2a8eb1b265f.tar.gz
vaadin-framework-30f5934f275a7a095d6e314f942ff2a8eb1b265f.zip
JUnit tests should be supported for shared (#13081)
Change-Id: Ia6243005fba362970cb199ad2aab217e56b5822a
-rw-r--r--.classpath1
-rw-r--r--shared/build.xml5
-rw-r--r--shared/ivy.xml4
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=&quot;0.0.20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;10.0.1.rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.1.5.r10-rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.1.5.r10-rebased&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.1.5.r10-rebased&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
@@ -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>