[jbosstools-commits] JBoss Tools SVN: r42081 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: webservice/eap and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: jjankovi
Date: 2012-06-19 09:41:38 -0400 (Tue, 19 Jun 2012)
New Revision: 42081

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/webservice/eap/EAPFromJavaTest.java
   trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
Log:
all tests can be run against any server (AS, EAP)

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-06-19 11:48:09 UTC (rev 42080)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java	2012-06-19 13:41:38 UTC (rev 42081)
@@ -18,7 +18,6 @@
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
 import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
 import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
 import org.jboss.tools.ws.ui.bot.test.utils.DeploymentHelper;
@@ -36,7 +35,9 @@
  * @author jjankovi
  * 
  */
- at Require(perspective = "Java EE", server = @Server(type = ServerType.JbossAS, version = "7.1", operator = ">="))
+ at Require(perspective = "Java EE", 
+		 server = @Server) 
+//		 server = @Server(type = ServerType.JbossAS, version = "7.1", operator = ">="))
 // @Require(perspective="Java EE",
 // server=@Server(type=ServerType.EAP,
 // version = "5.1", operator = ">="))

Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java	2012-06-19 11:48:09 UTC (rev 42080)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java	2012-06-19 13:41:38 UTC (rev 42081)
@@ -22,7 +22,6 @@
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
 import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
 import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction;
 import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
@@ -42,8 +41,9 @@
  */
 @SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
 @Require(perspective="Java EE", 
-		server=@Server(type=ServerType.EAP, 
-		version = "5.1", operator = ">="))
+		server=@Server)
+//		(type=ServerType.EAP, 
+//		version = "5.1", operator = ">="))
 public class EAPFromJavaTest extends WebServiceTestBase {
 
     private static boolean servicePassed = false;

Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java	2012-06-19 11:48:09 UTC (rev 42080)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java	2012-06-19 13:41:38 UTC (rev 42081)
@@ -31,7 +31,6 @@
 import org.jboss.tools.ui.bot.ext.Timing;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
 import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
 import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
 import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
 import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
@@ -51,8 +50,9 @@
  */
 @SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
 @Require(perspective="Java EE", 
-		server=@Server(type=ServerType.EAP, 
-		version = "5.1", operator = ">="))
+		server=@Server)
+//		(type=ServerType.EAP, 
+//		version = "5.1", operator = ">="))
 public class EAPFromWSDLTest extends WebServiceTestBase {
 
 	private static boolean servicePassed = false;