JBoss Tools SVN: r44209 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-02 06:21:11 -0400 (Tue, 02 Oct 2012)
New Revision: 44209
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
Log:
JBIDE-12717: Fix support of SRn
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-10-02 10:09:36 UTC (rev 44208)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-10-02 10:21:11 UTC (rev 44209)
@@ -31,7 +31,7 @@
}
String archLabel = System.properties['os.arch'].contains("64") ? "-x86_64" : "";
-String eclipseArchive = "eclipse-" + eclipseFlavour + "-" + releaseTrainId + "-" + osLabel + archLabel + "." + fileExtension;
+String eclipseArchive = "eclipse-" + eclipseFlavour + "-" + releaseTrainId + "-" + (versionLabel == "R" ? "" : (versionLabel + "-")) + osLabel + archLabel + "." + fileExtension;
String downloadURL = mirrorSite + "/" + releaseTrainId + "/" + versionLabel +"/" + eclipseArchive;
println("Will retrieve " + eclipseArchive + " from mirror site: " + mirrorSite);
11 years, 6 months
JBoss Tools SVN: r44208 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-02 06:09:36 -0400 (Tue, 02 Oct 2012)
New Revision: 44208
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java
Log:
https://community.jboss.org/message/761721/ more robust null check
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2012-10-02 10:07:50 UTC (rev 44207)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2012-10-02 10:09:36 UTC (rev 44208)
@@ -33,9 +33,11 @@
public boolean canResolve(IVirtualComponent context,
ReferencedComponent referencedComponent) {
URI handle = referencedComponent.getHandle();
- String s = handle.toString();
- if(s != null && s.startsWith(OUTPUT_FOLDER_PROTOCOL))
- return true;
+ if (handle != null) {
+ String s = handle.toString();
+ if(s.startsWith(OUTPUT_FOLDER_PROTOCOL))
+ return true;
+ }
return false;
}
11 years, 6 months
JBoss Tools SVN: r44207 - trunk/build/target-platforms/jbds/unified.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-02 06:07:50 -0400 (Tue, 02 Oct 2012)
New Revision: 44207
Modified:
trunk/build/target-platforms/jbds/unified/pom.xml
Log:
JBDS-2341: Fix typo
Modified: trunk/build/target-platforms/jbds/unified/pom.xml
===================================================================
--- trunk/build/target-platforms/jbds/unified/pom.xml 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/build/target-platforms/jbds/unified/pom.xml 2012-10-02 10:07:50 UTC (rev 44207)
@@ -111,7 +111,7 @@
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/${project.artifactId}/multiple.target</file>
+ <file>${project.build.directory}/${project.artifactId}/jbds-multiple.target</file>
<type>target</type>
<classifier>${project.artifactId}</classifier>
</artifact>
11 years, 6 months
JBoss Tools SVN: r44206 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-02 05:57:33 -0400 (Tue, 02 Oct 2012)
New Revision: 44206
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
Log:
JBIDE-12472 : use stacksId for compatible examples
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... 2012-10-02 09:35:33 UTC (rev 44205)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... 2012-10-02 09:57:33 UTC (rev 44206)
@@ -13,7 +13,6 @@
<description>
This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
-This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-archetype:7.1.1.CR1 Maven archetype.
</description>
<size>8192</size>
<url/>
@@ -72,10 +71,7 @@
<included-projects>multi-javaee6-archetype</included-projects>
<shortDescription>Java EE Project</shortDescription>
<priority>2</priority>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR.
-
-This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-ear-archetype:7.1.1.CR1 Maven archetype.
- </description>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR.</description>
<size>13806</size>
<url/>
<stacksId>jboss-javaee6-webapp-ear-archetype</stacksId>
@@ -131,12 +127,10 @@
<included-projects>jboss-javaee6-poh5</included-projects>
<shortDescription>HTML5 Project</shortDescription>
<priority>3</priority>
- <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
-
-This project is based on the org.jboss.aerogear.archetypes:jboss-html5-mobile-archetype:1.0.0.M5 Maven archetype.
- </description>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
<size>165567</size>
<url/>
+ <stacksId>jboss-html5-mobile-archetype</stacksId>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
@@ -188,11 +182,10 @@
<included-projects>richfaces-archetype-simpleapp</included-projects>
<shortDescription>RichFaces Project</shortDescription>
<priority>4</priority>
- <description>An archetype that generates a simple Richfaces application
-
-This project is based on the org.richfaces.archetypes:richfaces-archetype-kitchensink:4.2.2.Final-2 Maven archetype.</description>
+ <description>An archetype that generates a simple Richfaces application</description>
<size>165567</size>
<url/>
+ <stacksId>richfaces-archetype-kitchensink</stacksId>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
@@ -255,9 +248,7 @@
<included-projects>spring-mvc-webapp</included-projects>
<shortDescription>Spring MVC Project</shortDescription>
<priority>5</priority>
- <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
-
-This project is based on the org.jboss.spring.archetypes:spring-mvc-webapp:1.0.0.CR6 Maven archetype.</description>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
<size>165567</size>
<url/>
<fixes>
@@ -315,11 +306,10 @@
<priority>6</priority>
<shortDescription>GWT Web Project</shortDescription>
<description>An archetype that generates a starter GWT application with Java EE 6 and Errai.
-Make sure you read the deployment instructions in README.md.
-
-This project is based on the org.jboss.errai.archetypes:jboss-errai-kitchensink-archetype:2.0.0.Final Maven archetype.</description>
+Make sure you read the deployment instructions in README.md.</description>
<size>165567</size>
<url/>
+ <stacksId>jboss-errai-kitchensink-archetype</stacksId>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
11 years, 6 months
JBoss Tools SVN: r44205 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-10-02 05:35:33 -0400 (Tue, 02 Oct 2012)
New Revision: 44205
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
Log:
Fixes for JBT 4.0.0.Alpha2
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-10-02 08:25:40 UTC (rev 44204)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-10-02 09:35:33 UTC (rev 44205)
@@ -47,7 +47,6 @@
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.VpeToolbarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ActionParamTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxInvisibleTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxValidatorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ArticleTagTest;
@@ -184,7 +183,6 @@
SpacerTagTest.class,
DataScrollerTagTest.class,
ColumnTagTest.class,
- ActionParamTagTest.class,
AjaxValidatorTagTest.class,
BeanValidatorTagTest.class,
ColumnGroupTagTest.class,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2012-10-02 08:25:40 UTC (rev 44204)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2012-10-02 09:35:33 UTC (rev 44205)
@@ -94,8 +94,6 @@
SWTBotWebBrowser.ZOOM_MENU_LABEL,
"",
SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
- "",
- SWTBotWebBrowser.TEAM_MENU_LABEL,
"",
SWTBotWebBrowser.PASTE_MENU_LABEL});
@@ -123,8 +121,6 @@
"",
SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
"",
- SWTBotWebBrowser.TEAM_MENU_LABEL,
- "",
SWTBotWebBrowser.CUT_MENU_LABEL,
SWTBotWebBrowser.COPY_MENU_LABEL,
SWTBotWebBrowser.PASTE_MENU_LABEL});
@@ -152,8 +148,6 @@
"",
SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
"",
- SWTBotWebBrowser.TEAM_MENU_LABEL,
- "",
SWTBotWebBrowser.CUT_MENU_LABEL,
SWTBotWebBrowser.COPY_MENU_LABEL,
SWTBotWebBrowser.PASTE_MENU_LABEL});
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2012-10-02 08:25:40 UTC (rev 44204)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2012-10-02 09:35:33 UTC (rev 44205)
@@ -1,62 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.ui.bot.test.editor.tags;
-
-import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
-import org.mozilla.interfaces.nsIDOMNode;
-
-/**
- * Tests Rich Faces DataTable Tag behavior
- * @author vlado pakan
- *
- */
-public class ActionParamTagTest extends AbstractTagTest{
- @Override
- protected void initTestPage() {
- initTestPage(TestPageType.XHTML,
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" +
- " xmlns:f=\"http://java.sun.com/jsf/core\"\n" +
- " xmlns:a4j=\"http://richfaces.org/a4j\"\n" +
- " xmlns:h=\"http://java.sun.com/jsf/html\">\n" +
- "<head>\n" +
- "</head>\n" +
- "<body>\n" +
- " <f:view>\n" +
- " <a4j:commandButton value=\"Set Name to Alex\">\n" +
- " <a4j:actionparam name=\"username\" value=\"Alex\"/>\n" +
- " </a4j:commandButton>\n" +
- " </f:view>\n" +
- " </body>\n" +
- "</html>");
- }
-
- @Override
- protected void verifyTag() {
- // check tag selection
- getSourceEditor().selectLine(10);
- bot.sleep(Timing.time3S());
- nsIDOMNode selectedVisualNode=getVisualEditor().getSelectedDomNode();
- assertNotNull("Selected node in Visual Editor cannot be null",selectedVisualNode);
- String expectedSelectedNode = "DIV";
- assertTrue("Selected Node has to be '" + expectedSelectedNode + "' node but is " + selectedVisualNode.getLocalName(),
- selectedVisualNode.getLocalName().equalsIgnoreCase(expectedSelectedNode));
- String selectedNodeTitle = SWTBotWebBrowser.getNodeAttribute(selectedVisualNode, "title");
- assertNotNull("Selected Node in Visual Editor has to have attribute title but it has not." ,selectedNodeTitle);
- final String expectedTitle = "f:view";
- assertTrue("Selected Node in Visual Editor has to have attribute title=\"" + expectedTitle +
- "\" but has \"" + selectedNodeTitle + "\"",
- expectedTitle.equals(selectedNodeTitle));
- }
-
-}
11 years, 6 months
JBoss Tools SVN: r44204 - trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-02 04:25:40 -0400 (Tue, 02 Oct 2012)
New Revision: 44204
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
Log:
update to newly released plugins
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-10-02 08:05:38 UTC (rev 44203)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-10-02 08:25:40 UTC (rev 44204)
@@ -28,7 +28,6 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -198,13 +197,6 @@
}
}
- private static IFolder createFolder(String folderName,IProgressMonitor monitor,
- IProject project) throws CoreException {
- IFolder folder = project.getFolder(folderName);
- folder.create(false, true, monitor);
- return folder;
- }
-
public static boolean addMavenNature(IProject project,
IProgressMonitor monitor) throws CoreException {
boolean hasMavenNature = project.hasNature(IMavenConstants.NATURE_ID);
@@ -311,7 +303,7 @@
org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin();
plugin.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
plugin.setArtifactId("maven-war-plugin"); //$NON-NLS-1$
- plugin.setVersion("2.2");//$NON-NLS-1$
+ plugin.setVersion("2.3");//$NON-NLS-1$
Xpp3Dom configuration = new Xpp3Dom( "configuration" ); //$NON-NLS-1$
if (!isDefaultWarSource){
Xpp3Dom warSourceDirectory = new Xpp3Dom("warSourceDirectory"); //$NON-NLS-1$
@@ -356,7 +348,7 @@
org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin();
plugin.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
plugin.setArtifactId("maven-ear-plugin"); //$NON-NLS-1$
- plugin.setVersion("2.7");//$NON-NLS-1$
+ plugin.setVersion("2.8");//$NON-NLS-1$
Xpp3Dom configuration = new Xpp3Dom( "configuration" ); //$NON-NLS-1$
if (earFacetVersion != null) {
String earVersion = earFacetVersion.getVersionString();
11 years, 6 months
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.
by jbosstools-commits＠lists.jboss.org
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();
+ }
+
}
11 years, 6 months
JBoss Tools SVN: r44201 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/WebContent/WEB-INF.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-02 02:51:48 -0400 (Tue, 02 Oct 2012)
New Revision: 44201
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/WebContent/WEB-INF/web.xml
Log:
fix for test project app2
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/WebContent/WEB-INF/web.xml 2012-10-02 06:51:18 UTC (rev 44200)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app2/WebContent/WEB-INF/web.xml 2012-10-02 06:51:48 UTC (rev 44201)
@@ -3,8 +3,8 @@
<display-name>app2</display-name>
<servlet-mapping>
- <servlet-name>javax.ws.core.Application</servlet-name>
- <url-pattern>/path/*</url-pattern>
+ <servlet-name>javax.ws.rs.core.Application</servlet-name>
+ <url-pattern>/path2/*</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
11 years, 6 months
JBoss Tools SVN: r44200 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-02 02:51:18 -0400 (Tue, 02 Oct 2012)
New Revision: 44200
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java
Log:
fix for test project app1
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java 2012-10-02 06:50:52 UTC (rev 44199)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app1/src/test/App2.java 2012-10-02 06:51:18 UTC (rev 44200)
@@ -6,7 +6,7 @@
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
-@ApplicationPath("/path")
+@ApplicationPath("/path2")
public class App2 extends Application {
@Override
11 years, 6 months