Author: jjankovi Date: 2011-11-02 11:54:41 -0400 (Wed, 02 Nov 2011) New Revision: 36134 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java Log: Correction WS test against JBT 3.3.0 M4 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-11-02 15:39:08 UTC (rev 36133) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-11-02 15:54:41 UTC (rev 36134) @@ -11,6 +11,8 @@ package org.jboss.tools.ws.ui.bot.test; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.jboss.tools.ws.ui.bot.test.eap.EAPFromJavaTest; +import org.jboss.tools.ws.ui.bot.test.eap.EAPFromWSDLTest; import org.jboss.tools.ws.ui.bot.test.jbt.SampleWSTest; import org.jboss.tools.ws.ui.bot.test.jbt.WsTesterTest; import org.jboss.tools.ws.ui.bot.test.wtp.BottomUpWSTest; @@ -44,7 +46,9 @@ BottomUpWSTest.class, TopDownWSTest.class, WsClientTest.class, - WsTesterTest.class + WsTesterTest.class, + EAPFromJavaTest.class, + EAPFromWSDLTest.class }) public class WSAllBotTests { } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-11-02 15:39:08 UTC (rev 36133) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-11-02 15:54:41 UTC (rev 36134) @@ -24,6 +24,7 @@ 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; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; @@ -39,7 +40,7 @@ @Require(server= @Server(type = ServerType.EAP), perspective = "Java EE") @RunWith(RequirementAwareSuite.class) -@SuiteClasses({ EAPCompAllTests.class}) +@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class }) public class EAPFromJavaTest extends WSTestBase { @@ -145,8 +146,12 @@ w.bot().textWithLabel("Enter or select the parent folder:").setText(getWsClientProjectName() + "/WebContent"); w.finish(); bot.sleep(TIME_5S); - bot.activeShell().bot().button("Skip").click(); - bot.sleep(TIME_5S); + /** + * Workaround for 4.x branch + * + * bot.activeShell().bot().button("Skip").click(); + * bot.sleep(TIME_5S); + */ SWTBotEclipseEditor st = bot.editorByTitle("index.jsp").toTextEditor(); st.selectRange(0, 0, st.getText().length()); st.setText(readStream(EAPFromJavaTest.class.getResourceAsStream("/resources/jbossws/index.jsp.ws"))); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-11-02 15:39:08 UTC (rev 36133) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-11-02 15:54:41 UTC (rev 36134) @@ -34,6 +34,7 @@ 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; import org.jboss.tools.ws.ui.bot.test.wtp.TopDownWSTest; import org.jboss.tools.ws.ui.bot.test.wtp.WSTestBase; @@ -47,7 +48,7 @@ @Require(server = @Server(type = ServerType.EAP), perspective = "Java EE") @RunWith(RequirementAwareSuite.class) -@SuiteClasses({ EAPCompAllTests.class }) +@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class }) public class EAPFromWSDLTest extends WSTestBase { private static final Logger L = Logger.getLogger(EAPFromWSDLTest.class Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-11-02 15:39:08 UTC (rev 36133) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-11-02 15:54:41 UTC (rev 36134) @@ -136,7 +136,7 @@ } private void checkRESTService(String project, String svcName, String svcPkg, String svcClass, String msgContent, String appCls) { - checkService(Type.REST, project, svcName, svcPkg, svcClass, msgContent, appCls); + checkService(Type.REST, project, svcName, svcPkg, svcClass, msgContent, appCls); checkRestSupport(project,svcName); } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-11-02 15:39:08 UTC (rev 36133) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-11-02 15:54:41 UTC (rev 36134) @@ -15,6 +15,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.WSAllBotTests; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -93,12 +94,12 @@ setLevel(Slider_Level.TEST); topDownWS(); } - -// @Test -// public void testDefaultPkg() { -// setLevel(Slider_Level.ASSEMBLE); -// topDownWS(null); -// } + @Ignore + @Test + public void testDefaultPkg() { + setLevel(Slider_Level.ASSEMBLE); + topDownWS(null); + } private void topDownWS() { topDownWS("ws." + getWsName().toLowerCase()); @@ -114,6 +115,6 @@ break; } assertServiceDeployed(getWSDLUrl(), 10000); -// servers.removeAllProjectsFromServer(configuredState.getServer().name); + servers.removeAllProjectsFromServer(configuredState.getServer().name); } }