Author: jjankovi Date: 2012-04-18 17:16:37 -0400 (Wed, 18 Apr 2012) New Revision: 40312 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/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: fixing ws tests 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 20:53:04 UTC (rev 40311) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18 21:16:37 UTC (rev 40312) @@ -38,6 +38,9 @@ @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 = ">=")) @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/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-18 20:53:04 UTC (rev 40311) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-18 21:16:37 UTC (rev 40312) @@ -16,8 +16,7 @@ import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper; import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; -import org.junit.After; -import org.junit.Before; +import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; import org.junit.Test; /** @@ -27,31 +26,31 @@ */ public class RESTfulCompletionTest extends RESTfulTestBase{ + private final String GET_METHOD_PATH = "/{userId}"; private final String CORRECT_PATH_PARAM = "userId"; - private final String INCORRECT_PATH_PARAM = "someId"; - private final String PATH_PARAM_NAVIGATION = "@PathParam("; - private final List<String> EXP_NON_EMPTY_COMPLETION_RESULT = Arrays.asList("userId - JAX-RS Mapping"); - private final List<String> EXP_EMPTY_COMPLETION_RESULT = Arrays.asList("No Default Proposals"); - @Before - public void setup() { - + @Override + protected String getWsProjectName() { + return "restEmpty"; } - @After + @Override public void cleanup() { - projectExplorer.deleteAllProjects(); + } @Test public void testWithEmptyPrefix() { - setWsProjectName("restCompletion1"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, ""); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -64,8 +63,11 @@ @Test public void testWithValidPrefixAtTheEnd() { - setWsProjectName("restCompletion2"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -79,8 +81,11 @@ @Test public void testWithValidPrefixInTheBeginning() { - setWsProjectName("restCompletion2"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -93,8 +98,11 @@ @Test public void testWithInvalidPrefixAtTheEnd() { - setWsProjectName("restCompletion3"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -108,8 +116,11 @@ @Test public void testWithInvalidPrefixInTheBeginning() { - setWsProjectName("restCompletion3"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -122,8 +133,11 @@ @Test public void testWithAllInvalidParamSelection() { - setWsProjectName("restCompletion3"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); 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-18 20:53:04 UTC (rev 40311) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-18 21:16:37 UTC (rev 40312) @@ -16,8 +16,6 @@ import org.jboss.tools.ws.ui.bot.test.rest.RESTFulAnnotations; import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; import org.jboss.tools.ws.ui.bot.test.ti.wizard.RESTFullExplorerWizard; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -31,25 +29,20 @@ private RESTFullExplorerWizard restfulWizard = null; private String restEmptyProjectName = "restEmpty"; - private String restBasicProjectName = "restBasic"; - private String restAdvancedProjectName = "restAdvanced"; - @Before - public void setup() { - + @Override + protected String getWsProjectName() { + return restEmptyProjectName; } - @After + @Override public void cleanup() { - projectExplorer.deleteAllProjects(); + } @Test public void testAddingSimpleRESTMethods() { - setWsProjectName(restEmptyProjectName); - prepareRestProject(); - packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), @@ -75,9 +68,6 @@ @Test public void testAddingAdvancedRESTMethods() { - setWsProjectName(restBasicProjectName); - prepareRestProject(); - packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), @@ -121,8 +111,11 @@ @Test public void testEditingSimpleRESTMethods() { - setWsProjectName(restBasicProjectName); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(BASIC_WS_RESOURCE), + false, getWsPackage(), getWsName()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); @@ -146,14 +139,16 @@ fail("There should not be DELETE RESTful services"); } } - } @Test public void testEditingAdvancedRESTMethods() { - setWsProjectName(restAdvancedProjectName); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(ADVANCED_WS_RESOURCE), + false, getWsPackage(), getWsName()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); @@ -188,8 +183,11 @@ @Test public void testDeletingRESTMethods() { - setWsProjectName(restBasicProjectName); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(BASIC_WS_RESOURCE), + false, getWsPackage(), getWsName()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); 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-18 20:53:04 UTC (rev 40311) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-18 21:16:37 UTC (rev 40312) @@ -13,8 +13,6 @@ import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -28,21 +26,24 @@ private final String CORRECT_PATH_PARAM = "id"; private final String BAD_PATH_PARAM = "customerId"; - @Before - public void setup() { - + @Override + protected String getWsProjectName() { + return "restEmpty"; } - @After + @Override public void cleanup() { - projectExplorer.deleteAllProjects(); + } @Test public void testCorrectValueValidation() { - setWsProjectName("restValidation1"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); assertTrue(restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0); } @@ -50,8 +51,11 @@ @Test public void testBadValueValidation() { - setWsProjectName("restValidation2"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 1); @@ -60,8 +64,11 @@ @Test public void testCorrectToBadValueValidation() { - setWsProjectName("restValidation1"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); @@ -75,11 +82,15 @@ @Test public void testBadToCorrectValueValidation() { - setWsProjectName("restValidation2"); - prepareRestProject(); packageExplorer.openFile(getWsProjectName(), "src", getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); + + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); @@ -93,8 +104,11 @@ restfulHelper.disableRESTValidation(); - setWsProjectName("restValidation2"); - prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); + resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), + RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), + false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0);