Author: jjankovi Date: 2012-04-24 08:38:54 -0400 (Tue, 24 Apr 2012) New Revision: 40451 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/rest/RESTfulTestBase.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java Log: only RESTful ws tests are now enabled for AS 7.1 runtime 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-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -35,12 +35,12 @@ * @author jjankovi * */ +//@Require(perspective="Java EE", +// server=(a)Server(type=ServerType.JbossAS, +// version = "7.1", operator = ">=")) @Require(perspective="Java EE", - server=(a)Server(type=ServerType.JbossAS, - version = "7.1", operator = ">=")) -//@Require(perspective="Java EE", -// server=(a)Server(type=ServerType.EAP, -// version = "5.1", operator = ">=")) + server=(a)Server(type=ServerType.EAP, + version = "5.1", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ WSAllBotTests.class }) public class WSTestBase extends SWTTestExt { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -55,6 +55,11 @@ prepareRestProject(); } + @Override + public void cleanup() { + + } + protected void prepareRestProject() { if (!projectExists(getWsProjectName())) { @@ -62,9 +67,6 @@ //importing project without targeted runtime set importWSTestProject("resources/projects/" + getWsProjectName(), getWsProjectName()); - //set target runtime - TO DO - projectHelper.addConfiguredRuntimeIntoProject( - getWsProjectName(), configuredState.getServer().name); projectExplorer.selectProject(getWsProjectName()); eclipse.cleanAllProjects(); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -38,11 +38,6 @@ return "restEmpty"; } - @Override - public void cleanup() { - - } - @Test public void testWithEmptyPrefix() { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -35,11 +35,6 @@ return restEmptyProjectName; } - @Override - public void cleanup() { - - } - @Test public void testAddingSimpleRESTMethods() { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -31,11 +31,6 @@ return "restEmpty"; } - @Override - public void cleanup() { - - } - @Test public void testCorrectValueValidation() { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2012-04-24 12:10:13 UTC (rev 40450) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2012-04-24 12:38:54 UTC (rev 40451) @@ -11,8 +11,6 @@ package org.jboss.tools.ws.ui.bot.test.sample; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type; /** @@ -20,7 +18,7 @@ * @author jjankovi * */ -@Require(server=@Server(), perspective="Java EE") +//@Require(server=@Server(), perspective="Java EE") public class SampleRESTTestBase extends SampleWSBase { protected void createSampleRESTWS(String project, String name, String pkg,