[jbosstools-commits] JBoss Tools SVN: r40295 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: sample/test and 1 other directory.
Author: jjankovi
Date: 2012-04-18 10:53:46 -0400 (Wed, 18 Apr 2012)
New Revision: 40295
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
Log:
modifying WSTestBase to use 7.1.1 AS as default + small fixing
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18
14:52:50 UTC (rev 40294)
+++
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18
14:53:46 UTC (rev 40295)
@@ -35,7 +35,9 @@
* @author jjankovi
*
*/
-@Require(server=(a)Server(type=ServerType.EAP), perspective="Java EE")
+@Require(perspective="Java EE",
+ server=(a)Server(type=ServerType.JbossAS,
+ version = "7.1", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
@@ -63,10 +65,13 @@
public void setup() {
if (getEarProjectName() != null && !projectExists(getEarProjectName())) {
projectHelper.createEARProject(getEarProjectName());
+ if (!projectExists(getWsProjectName())) {
+ projectHelper.createProjectForEAR(getWsProjectName(),
+ getEarProjectName());
+ }
}
if (!projectExists(getWsProjectName())) {
- projectHelper.createProjectForEAR(getWsProjectName(),
- getEarProjectName());
+ projectHelper.createProject(getWsProjectName());
}
}
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-04-18
14:52:50 UTC (rev 40294)
+++
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-04-18
14:53:46 UTC (rev 40295)
@@ -25,7 +25,7 @@
protected String getWsProjectName() {
return "SampleSOAPWS";
}
-
+
@Test
public void testSampleSoapWS() {
IFile dd = getDD(getWsProjectName());