Author: jjankovi Date: 2012-01-30 11:01:15 -0500 (Mon, 30 Jan 2012) New Revision: 38273 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/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 Log: Modifying RESTful-like tests' setup phase 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-01-30 15:59:13 UTC (rev 38272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-01-30 16:01:15 UTC (rev 38273) @@ -54,18 +54,6 @@ return "RestService"; } - @Override - public void setup() { - if (!projectExists(getWsProjectName())) { - projectHelper.createProject(getWsProjectName()); - addRestSupport(getWsProjectName()); - } - if (!projectExplorer.isFilePresent(getWsProjectName(), "Java Resources", - "src", getWsPackage(), getWsName() + ".java")) { - projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName()); - } - } - @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-01-30 15:59:13 UTC (rev 38272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-01-30 16:01:15 UTC (rev 38273) @@ -46,20 +46,6 @@ return "RestService"; } - @Override - public void setup() { - if (!projectExists(getWsProjectName())) { - projectHelper.createProject(getWsProjectName()); - } - if (!isRestSupportEnabled(getWsProjectName())) { - addRestSupport(getWsProjectName()); - } - if (!projectExplorer.isFilePresent(getWsProjectName(), "Java Resources", - "src", getWsPackage(), getWsName() + ".java")) { - projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName()); - } - } - @Test public void testAddingSimpleRESTMethods() { @@ -170,6 +156,8 @@ restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); + assertTrue(restServices.length > 0); + for (SWTBotTreeItem restService : restServices) { if (restfulWizard.getRestServiceName(restService).equals(RESTFulAnnotations.DELETE.getLabel())) { assertTrue(restfulWizard.getPathForRestFulService(restService).equals("/rest/delete/{id}")); 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-01-30 15:59:13 UTC (rev 38272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-01-30 16:01:15 UTC (rev 38273) @@ -39,18 +39,6 @@ return "RestService"; } - @Override - public void setup() { - if (!projectExists(getWsProjectName())) { - projectHelper.createProject(getWsProjectName()); - addRestSupport(getWsProjectName()); - } - if (!projectExplorer.isFilePresent(getWsProjectName(), "Java Resources", - "src", getWsPackage(), getWsName() + ".java")) { - projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName()); - } - } - @Test public void testCorrectValueValidation() {