[jbosstools-commits] JBoss Tools SVN: r43620 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: integration and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Sep 12 05:31:59 EDT 2012
Author: jjankovi
Date: 2012-09-12 05:31:58 -0400 (Wed, 12 Sep 2012)
New Revision: 43620
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/integration/JAXRSToolingIntegrationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.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/ApplicationPathAnnotationTest.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 test against 4.0.0 Alpha1
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 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -11,7 +11,6 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ws.ui.bot.test.annotation.AnnotationPropertiesTest;
import org.jboss.tools.ws.ui.bot.test.integration.JAXRSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.integration.SOAPWSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.rest.DefaultValueAnnotationSupportTest;
@@ -48,7 +47,7 @@
SimpleRESTWebServiceTest.class,
// AnnotationPropertiesTest.class, // not implemented yet
RESTfulExplorerTest.class,
- PathAnnotationSupportTest.class,
+ PathAnnotationSupportTest.class,
QueryAnnotationSupportTest.class,
MatrixAnnotationSupportTest.class,
DefaultValueAnnotationSupportTest.class,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -17,8 +17,6 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.RESTFullExplorer;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Type;
-import org.junit.After;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -34,19 +32,26 @@
private String serviceUrl = localhostUrl + projectName + "/rest/";
private WsTesterView wsTesterView = new WsTesterView();
- @BeforeClass
- public static void prepareWS() {
- importRestWSProject(projectName);
- servers.addProjectToServer(
- projectName, configuredState.getServer().name);
+ @Override
+ public void setup() {
+ if (!projectExists(getWsProjectName())) {
+ importRestWSProject(projectName);
+ servers.addProjectToServer(projectName,
+ configuredState.getServer().name);
+ }
}
- @After
- public void minimizeTester() {
+ @Override
+ public void cleanup() {
/* minimize web service tester */
- wsTesterView.minimize();
+ wsTesterView.minimize();
}
+ @Override
+ protected String getWsProjectName() {
+ return projectName;
+ }
+
@Test
public void testGetMethod() {
/* get JAX-RS REST Web Services */
@@ -57,7 +62,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.GET);
@@ -75,7 +79,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "post", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
@@ -93,7 +96,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "put", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.PUT);
@@ -111,7 +113,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "delete", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.DELETE);
@@ -129,7 +130,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -17,7 +17,6 @@
import org.jboss.tools.ws.ui.bot.test.WSTestBase;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Type;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -43,15 +42,12 @@
"</soap:Body>" + LINE_SEPARATOR +
"</soap:Envelope>";
- @BeforeClass
- public static void prepareWS() {
- importWSTestProject(projectName);
- deploymentHelper.runProject(projectName);
- }
-
@Override
public void setup() {
-
+ if (!projectExists(getWsProjectName())) {
+ importWSTestProject(projectName);
+ deploymentHelper.runProject(projectName);
+ }
}
@Override
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -21,8 +21,8 @@
private String queryParamType = "java.lang.String";
@Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
+ public void setup() {
+
}
@Test
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,17 +30,9 @@
return projectName;
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testMatrixParamSupport() {
- /* prepare project */
- importRestWSProject("matrix1");
-
/* get RESTful services from JAX-RS REST explorer for the project */
SWTBotTreeItem[] restServices = restfulServicesForProject("matrix1");
@@ -56,7 +48,6 @@
public void testEditingMatrixParam() {
/* prepare project */
- importRestWSProject("matrix1");
resourceHelper.replaceInEditor(editorForClass("matrix1", "src",
"org.rest.test", "RestService.java").toTextEditor(),
matrixParam1, matrixParamNew, true);
@@ -76,7 +67,6 @@
public void testEditingTypeOfMatrixParam() {
/* prepare project */
- importRestWSProject("matrix1");
resourceHelper.replaceInEditor(editorForClass("matrix1", "src",
"org.rest.test", "RestService.java").toTextEditor(),
matrixParamType1, matrixParamTypeNew, true);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,6 +30,11 @@
projectExplorer.deleteAllProjects();
}
+ @Override
+ public void setup() {
+
+ }
+
@Test
public void testAddingSimpleRESTMethods() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -28,8 +28,8 @@
private String queryTypeNew = "java.lang.Long";
@Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
+ public void setup() {
+
}
@Test
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -15,11 +15,11 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
@@ -43,14 +43,11 @@
private static final SWTOpenExt open = new SWTOpenExt(bot);
private static final ResourceHelper resourceHelper = new ResourceHelper();
- private static final String PATH_PARAM_VALID_ERROR = "@PathParam value";
- private static final String VALIDATION_PREFERENCE = "Validation";
- private static final String ENABLE_ALL = "Enable All";
- private static final String JAX_RS_VALIDATOR = "JAX-RS Metamodel Validator";
+ private static final String PATH_PARAM_VALID_ERROR = "@PathParam value";
private static final String VALIDATION_SETTINGS_CHANGED = "Validation Settings Changed";
private enum ConfigureOption {
- ADD, REMOVE;
+ ENABLE, DISABLE;
}
private SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName, String description) {
@@ -67,44 +64,26 @@
}
public void enableRESTValidation() {
- modifyRESTValidation(ConfigureOption.ADD);
+ modifyRESTValidation(ConfigureOption.ENABLE);
}
public void disableRESTValidation() {
- modifyRESTValidation(ConfigureOption.REMOVE);
+ modifyRESTValidation(ConfigureOption.DISABLE);
}
- /**
- * DO IT BETTER!!!!!!!!!!!!!!!!!!
- */
public void modifyRESTValidation(ConfigureOption option) {
- SWTBot validationBot = openPreferencePage(VALIDATION_PREFERENCE,
- new ArrayList<String>());
+ SWTBot validationBot = openPreferencePage("JAX-RS Validator",
+ Arrays.asList("JBoss Tools", "JAX-RS"));
- validationBot.button(ENABLE_ALL).click();
-
- if (option == ConfigureOption.REMOVE) {
-
- SWTBotTable validatorTable = validationBot.table();
- int restValidationRow = -1;
- for (int row = 0; row < validatorTable.rowCount(); row++) {
- if (validatorTable.getTableItem(row).getText()
- .equals(JAX_RS_VALIDATOR)) {
- restValidationRow = row;
- break;
- }
- }
-
- assertTrue(restValidationRow >= 0);
-
- validatorTable.click(restValidationRow, 1);
- validatorTable.click(restValidationRow, 2);
+ if (option == ConfigureOption.ENABLE) {
+ validationBot.checkBox(0).select();
+ } else {
+ validationBot.checkBox(0).deselect();
}
-
- validationBot.button("OK").click();
+ validationBot.button(IDELabel.Button.OK).click();
if (bot.activeShell().getText().equals(VALIDATION_SETTINGS_CHANGED)) {
- bot.activeShell().bot().button("Yes").click();
+ bot.activeShell().bot().button(IDELabel.Button.YES).click();
}
bot.sleep(Timing.time3S());
@@ -113,11 +92,11 @@
}
public void addRestSupport(String wsProjectName) {
- configureRestSupport(wsProjectName, ConfigureOption.ADD);
+ configureRestSupport(wsProjectName, ConfigureOption.ENABLE);
}
public void removeRestSupport(String wsProjectName) {
- configureRestSupport(wsProjectName, ConfigureOption.REMOVE);
+ configureRestSupport(wsProjectName, ConfigureOption.DISABLE);
}
public boolean isRestSupportEnabled(String wsProjectName) {
@@ -174,7 +153,7 @@
SWTBotMenu menu = new SWTBotMenu(
ContextMenuHelper.getContextMenu(
tree, IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false));
- menu.menu(option == ConfigureOption.ADD ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD
+ menu.menu(option == ConfigureOption.ENABLE ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD
.getLabel() : RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_REMOVE
.getLabel()).click();
bot.sleep(Timing.time2S());
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-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -50,12 +50,14 @@
@Override
public void setup() {
-
+ if (!projectExists(getWsProjectName())) {
+ importRestWSProject(getWsProjectName());
+ }
}
-
+
@Override
- public void cleanup() {
-
+ public void cleanup() {
+ projectExplorer.deleteAllProjects();
}
protected static void importRestWSProject(String projectName) {
@@ -65,7 +67,7 @@
projectExplorer.selectProject(projectName);
eclipse.cleanAllProjects();
- bot.sleep(Timing.time3S());
+ util.waitForNonIgnoredJobs();
// workaround for EAP 5.1
if (configuredState.getServer().type.equals("EAP")
@@ -163,7 +165,7 @@
protected void runRestServiceOnConfiguredServer(SWTBotTreeItem webService) {
RunOnServerDialog dialog = restfulWizard.runOnServer(webService);
dialog.chooseExistingServer().selectServer(configuredState.getServer().name).finish();
- bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER));
+ bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER), TIME_20S);
}
protected SWTBotTreeItem[] restfulServicesForProject(String projectName) {
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-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -39,16 +39,10 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testWithEmptyPrefix() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -65,7 +59,6 @@
public void testWithValidPrefixAtTheEnd() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -83,7 +76,6 @@
public void testWithValidPrefixInTheBeginning() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -100,7 +92,6 @@
public void testWithInvalidPrefixAtTheEnd() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -118,7 +109,6 @@
public void testWithInvalidPrefixInTheBeginning() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -135,7 +125,6 @@
public void testWithAllInvalidParamSelection() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
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-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -25,6 +25,11 @@
return "RestExplorerTest";
}
+ @Override
+ public void setup() {
+
+ }
+
@Test
public void testJaxRsExplorerSupport() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -12,7 +12,6 @@
package org.jboss.tools.ws.ui.bot.test.rest.validation;
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,11 +28,6 @@
}
- @After
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testMultipleApplicationClasses() {
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-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,16 +30,10 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testCorrectValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -55,7 +49,6 @@
public void testBadValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -69,7 +62,6 @@
public void testCorrectToBadValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -86,7 +78,6 @@
public void testBadToCorrectValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -106,7 +97,6 @@
restfulHelper.disableRESTValidation();
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
More information about the jbosstools-commits
mailing list