summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Trimble2014-04-23 16:15:20 (EDT)
committerIan Trimble2014-04-23 16:15:20 (EDT)
commitec52b37b2bc605207a216863df7d899d7a029024 (patch)
tree497356f827dc092213c282e81d1c01eefdd2976b
parent5825dc40c77d0a2c4d589b4890c631aac5df92f0 (diff)
downloadwebtools.jsf.tests-ec52b37b2bc605207a216863df7d899d7a029024.zip
webtools.jsf.tests-ec52b37b2bc605207a216863df7d899d7a029024.tar.gz
webtools.jsf.tests-ec52b37b2bc605207a216863df7d899d7a029024.tar.bz2
Bug 431853 - [CBI] Enable JUnit tests for webtools.jsf.tests repov201404231316
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml4
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml12
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml11
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml17
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml17
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml11
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml5
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml14
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml12
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml21
-rw-r--r--jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml16
11 files changed, 115 insertions, 25 deletions
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
index c1e427c..78498ca 100644
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
@@ -33,9 +33,9 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.common.runtime.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.common.runtime.tests.AllRuntimeTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
index 1396d49..64c2457 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
@@ -32,10 +32,18 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.contentassist.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.contentassist.tests.AllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
index 836a182..bff9c17 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
@@ -33,9 +33,16 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.context.symbol.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.context.symbol.tests.AllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
index 2f1de1a..e8c0435 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
@@ -32,10 +32,23 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.core.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.core.tests.AllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.jee.web</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
index e977b09..9bc6f00 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
@@ -32,10 +32,23 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.designtime.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.designtime.tests.AllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.jee.web</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
index f17d0c3..244b239 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
@@ -33,9 +33,16 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.facesconfig.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.facesconfig.tests.AllFacesConfigTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
index 3212c1b..5c8583b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
@@ -32,10 +32,11 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.facesconfig.ui.test</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.facesconfig.ui.test.AllTestCases</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
index d4205c1..eaafad7 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../../../</relativePath>
</parent>
- <groupId>org.eclipse.jsf</groupId>
+ <groupId>org.eclipse.webtools.jsf</groupId>
<artifactId>org.eclipse.jst.jsf.metadata.tests</artifactId>
<version>1.5.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -32,10 +32,18 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.metadata.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.metadata.tests.AllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
index 52676af..50a1841 100644
--- a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
@@ -32,10 +32,18 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.ui.tests</testSuite>
+ <testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.jst.jsf.ui.tests.JSFUIAllTests</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
index d6636b3..2fcab26 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
@@ -32,10 +32,25 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.jsf.validation.el.tests</testSuite>
- <testClass>org.eclipse.jst.jsf.validation.el.tests.AllTests_1_1</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <includes>
+ <include>org/eclipse/jst/jsf/validation/el/tests/AllTests_1_1.java</include>
+ <include>org/eclipse/jst/jsf/validation/el/tests/AllTests_1_2.java</include>
+ </includes>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.jee.web</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
index 74e4fee..58e693b 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
@@ -32,10 +32,20 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skipTests>true</skipTests>
<useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.jst.pagedesigner.tests</testSuite>
- <testClass>org.eclipse.jst.pagedesigner.tests.AllTests_Part1</testClass>
- <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+ <includes>
+ <include>org/eclipse/jst/pagedesigner/tests/AllTests_Part1.java</include>
+ <include>org/eclipse/jst/pagedesigner/tests/AllTests_Part2.java</include>
+ </includes>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ <argLine>-DjsfRuntimeJarsDirectoryV1.1=${project.basedir}/../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=${project.basedir}/../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=${project.basedir}/../jsfRuntimeJarsDirectory/V2.0</argLine>
</configuration>
</plugin>
</plugins>