summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-30 15:27:06 +0300
committerArtur Signell <artur@vaadin.com>2012-08-30 16:08:02 +0300
commit691220a5b24370d56f7c15d5a05c57a6c76dcb83 (patch)
tree3b8829794c798c6c49b54be6f412485f6734182d
parentc1483202a89463cadaed62a362d5fd4fe814f0f2 (diff)
downloadvaadin-framework-691220a5b24370d56f7c15d5a05c57a6c76dcb83.tar.gz
vaadin-framework-691220a5b24370d56f7c15d5a05c57a6c76dcb83.zip
Moved client side tests from tests/client-side to client/tests/src
-rw-r--r--build/build.xml8
-rw-r--r--client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java (renamed from tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java)0
-rwxr-xr-xclient/tests/src/com/vaadin/client/DateTimeServiceTest.java (renamed from tests/client-side/com/vaadin/client/DateTimeServiceTest.java)0
-rw-r--r--client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java (renamed from tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java)0
4 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml
index 3e5f688245..8ebb4e99ff 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -349,7 +349,7 @@
* sass/src (SASS compiler)
* tests/testbench (TestBench test cases)
* tests/server-side (Server-side JUnit test cases)
- * tests/client-side (Client-side JUnit test cases)
+ * client/tests/src (Client-side JUnit test cases)
These are copied to
* ${result-path}/src/core
@@ -452,7 +452,7 @@
<fileset dir="tests/server-side">
<patternset refid="preprocessable-files" />
</fileset>
- <fileset dir="tests/client-side">
+ <fileset dir="client/tests/src">
<patternset refid="preprocessable-files" />
</fileset>
</copy>
@@ -503,7 +503,7 @@
<fileset dir="tests/server-side">
<patternset refid="non-preprocessable-files" />
</fileset>
- <fileset dir="tests/client-side">
+ <fileset dir="client/tests/src">
<patternset refid="non-preprocessable-files" />
</fileset>
</copy>
@@ -1296,7 +1296,7 @@
<batchtest fork="yes">
<fileset dir="tests/server-side" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" />
- <fileset dir="tests/client-side" includes="**/*.java" excludes="**/Abstract*.java" />
+ <fileset dir="client/tests/src" includes="**/*.java" excludes="**/Abstract*.java" />
</batchtest>
</junit>
</target>
diff --git a/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
index da5970d64d..da5970d64d 100644
--- a/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
+++ b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
diff --git a/tests/client-side/com/vaadin/client/DateTimeServiceTest.java b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
index 6852e9ec3f..6852e9ec3f 100755
--- a/tests/client-side/com/vaadin/client/DateTimeServiceTest.java
+++ b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
diff --git a/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
index 04e8be699b..04e8be699b 100644
--- a/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
+++ b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java