[jbosstools-commits] JBoss Tools SVN: r44202 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: integration and 2 other directories.

Author: jjankovi Date: 2012-10-02 02:53:42 -0400 (Tue, 02 Oct 2012) New Revision: 44202 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.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/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/validation/ApplicationPathAnnotationTest.java Log: commented workaround out for ws tests + minor fixes and addons Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java 2012-10-02 06:51:48 UTC (rev 44201) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java 2012-10-02 06:53:42 UTC (rev 44202) @@ -41,8 +41,8 @@ @Test public void testQuickFixes() { - /* workaround for JBIDE-12690 */ - jbide12680Workaround(getWsProjectName(), "src", "test", "MyAnnot.java"); + /* workaround for JBIDE-12690 + jbide12680Workaround(getWsProjectName(), "src", "test", "MyAnnot.java"); */ /* assert that there are two JAX-RS errors */ assertThat(errorsByType("JAX-RS Problem").length, equalTo(2)); 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-10-02 06:51:48 UTC (rev 44201) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-10-02 06:53:42 UTC (rev 44202) @@ -35,9 +35,7 @@ @Override public void setup() { if (!projectExists(getWsProjectName())) { - importRestWSProject(projectName); - servers.addProjectToServer(projectName, - configuredState.getServer().name); + importRestWSProject(projectName); } } 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-10-02 06:51:48 UTC (rev 44201) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-10-02 06:53:42 UTC (rev 44202) @@ -52,15 +52,21 @@ private SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName, String description) { return ProblemsView.getFilteredErrorsTreeItems(bot, - description, "/" + wsProjectName, null, null); + description, "/" + wsProjectName, null, "JAX-RS Problem"); } + private SWTBotTreeItem[] getRESTValidationWarnings(String wsProjectName, + String description) { + return ProblemsView.getFilteredWarningsTreeItems(bot, + description, "/" + wsProjectName, null, "JAX-RS Problem"); + } + public SWTBotTreeItem[] getPathAnnotationValidationErrors(String wsProjectName) { return getRESTValidationErrors(wsProjectName, PATH_PARAM_VALID_ERROR); } - public SWTBotTreeItem[] getApplicationAnnotationValidationErrors(String wsProjectName) { - return getRESTValidationErrors(wsProjectName, null); + public SWTBotTreeItem[] getApplicationAnnotationValidationWarnings(String wsProjectName) { + return getRESTValidationWarnings(wsProjectName, null); } public void enableRESTValidation() { 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-10-02 06:51:48 UTC (rev 44201) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-10-02 06:53:42 UTC (rev 44202) @@ -14,6 +14,7 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; import org.jboss.tools.ui.bot.ext.condition.ViewIsActive; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; @@ -150,10 +151,10 @@ assertCountOfValidationError(expectedCount, foundErrors); } - protected void assertCountOfApplicationAnnotationValidationErrors(String projectName, + protected void assertCountOfApplicationAnnotationValidationWarnings(String projectName, int expectedCount) { - int foundErrors = restfulHelper.getPathAnnotationValidationErrors(projectName).length; - assertCountOfValidationError(expectedCount, foundErrors); + int foundWarnings = restfulHelper.getApplicationAnnotationValidationWarnings(projectName).length; + assertCountOfValidationError(expectedCount, foundWarnings); } private void assertCountOfValidationError(int expectedCount, int foundCount) { @@ -166,6 +167,7 @@ RunOnServerDialog dialog = restfulWizard.runOnServer(webService); dialog.chooseExistingServer().selectServer(configuredState.getServer().name).finish(); bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER), TIME_20S); + bot.waitWhile(new NonSystemJobRunsCondition(), 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/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-10-02 06:51:48 UTC (rev 44201) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-10-02 06:53:42 UTC (rev 44202) @@ -11,6 +11,8 @@ package org.jboss.tools.ws.ui.bot.test.rest.validation; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; import org.junit.Before; import org.junit.Test; @@ -34,18 +36,44 @@ /* prepare project */ importRestWSProject("app1"); + /* workaround for JBIDE-12690 + jbide12680Workaround("app1", "src", "test", "App.java"); */ + /* test validation error */ - assertCountOfApplicationAnnotationValidationErrors("app1", 1); + assertCountOfApplicationAnnotationValidationWarnings("app1", 2); } @Test - public void testWebXmlAndApplicationClass() { + public void testWebXmlAndApplicationClassWithWarning() { /* prepare project */ importRestWSProject("app2"); + /* workaround for JBIDE-12690 + jbide12680Workaround("app2", "src", "test", "App.java"); */ + /* test validation error */ - assertCountOfApplicationAnnotationValidationErrors("app2", 1); + assertCountOfApplicationAnnotationValidationWarnings("app2", 2); } + @Test + public void testWebXmlAndApplicationClassWithoutWarning() { + + /* prepare project */ + importRestWSProject("app3"); + + /* workaround for JBIDE-12690 + jbide12680Workaround("app3", "src", "test", "App.java"); */ + + /* test validation error */ + assertCountOfApplicationAnnotationValidationWarnings("app3", 0); + } + + private void jbide12680Workaround(String projectName, String... path) { + SWTBotEditor editor = packageExplorer.openFile(projectName, path); + SWTBotEclipseEditor eclipseEditor = editor.toTextEditor(); + eclipseEditor.insertText(" "); + eclipseEditor.save(); + } + }