JBoss Tools SVN: r37562 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-23 12:49:39 -0500 (Fri, 23 Dec 2011)
New Revision: 37562
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
Log:
@SuppressWarnings quick fix moved up https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-23 16:13:22 UTC (rev 37561)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-23 17:49:39 UTC (rev 37562)
@@ -43,7 +43,6 @@
String preferenceKey = getPreferenceKey(marker);
String preferencePageId = getPreferencePageId(marker);
if(preferenceKey != null && preferencePageId != null){
- resolutions.add(new ConfigureProblemSeverityMarkerResolution(preferencePageId, preferenceKey));
boolean enabled = marker.getAttribute(ValidationErrorManager.SUPPRESS_WARNINGS_ENABLED_ATTRIBUTE, false);
int severity = marker.getAttribute(IMarker.SEVERITY, 0);
if(enabled && severity == IMarker.SEVERITY_WARNING){
@@ -58,6 +57,7 @@
resolutions.add(new AddSuppressWarningsMarkerResolution(file, element, preferenceKey));
}
}
+ resolutions.add(new ConfigureProblemSeverityMarkerResolution(preferencePageId, preferenceKey));
}
}
}
12 years, 4 months
JBoss Tools SVN: r37561 - trunk/cdi/plugins/org.jboss.tools.cdi.ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-12-23 11:13:22 -0500 (Fri, 23 Dec 2011)
New Revision: 37561
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
Log:
JBIDE-10564 Open CDI Named Bean Toolbar button and navigaton Menu item is always visible (even if no CDI-related perspective is activated)
Issue is fixed
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-12-23 15:59:53 UTC (rev 37560)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-12-23 16:13:22 UTC (rev 37561)
@@ -16,4 +16,7 @@
preferenceKeywords.newBeansXML=CDI XML
NewWizards.file=File beans.xml
-NewWizards.file.description=Create a new beans.xml File
\ No newline at end of file
+NewWizards.file.description=Create a new beans.xml File
+
+ActionSetCDIUIDescription=Makes CDI UI Actions available in main menu and toolbar
+ActionSetCDIUILabel=CDI UI
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-12-23 15:59:53 UTC (rev 37560)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-12-23 16:13:22 UTC (rev 37561)
@@ -129,6 +129,19 @@
icon="$nl$/icons/open_cdi_named_bean.png"
label="Open CDI Named Bean"
tooltip="Open CDI Named Bean" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.cdi.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
+
</command>
</menuContribution>
<menuContribution
@@ -142,12 +155,34 @@
icon="$nl$/icons/open_cdi_named_bean.png"
label="Open CDI Named Bean"
tooltip="Open CDI Named Bean" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.cdi.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
</toolbar>
</menuContribution>
</extension>
+ <extension
+ point="org.eclipse.ui.actionSets">
+ <actionSet
+ description="%ActionSetCDIUIDescription"
+ id="org.jboss.tools.cdi.ui.actionSet"
+ label="%ActionSetCDIUILabel"
+ visible="false">
+ </actionSet>
+ </extension>
+
<extension
point="org.eclipse.ui.handlers">
<handler
@@ -388,6 +423,7 @@
<newWizardShortcut
id="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard">
</newWizardShortcut-->
+ <actionSet id="org.jboss.tools.cdi.ui.actionSet" />
</perspectiveExtension>
<perspectiveExtension
@@ -422,7 +458,13 @@
<newWizardShortcut
id="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard">
</newWizardShortcut>
+ <actionSet id="org.jboss.tools.cdi.ui.actionSet" />
</perspectiveExtension>
+
+ <perspectiveExtension
+ targetID="org.eclipse.debug.ui.DebugPerspective">
+ <actionSet id="org.jboss.tools.cdi.ui.actionSet" />
+ </perspectiveExtension>
</extension>
<extension point="org.eclipse.ui.navigator.navigatorContent">
12 years, 4 months
JBoss Tools SVN: r37560 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-12-23 10:59:53 -0500 (Fri, 23 Dec 2011)
New Revision: 37560
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
JBIDE-7361 Seam toolbar items are showing up in the Teiid toolbar
Issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties 2011-12-23 13:41:24 UTC (rev 37559)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties 2011-12-23 15:59:53 UTC (rev 37560)
@@ -13,3 +13,5 @@
Bundle-Vendor.0 = JBoss by Red Hat
Bundle-Name.0 = Seam GUI Tools
NavigatorContent_SeamComponents=Seam Components
+ActionSetSeamUIDescription=Makes Seam UI Actions available in main menu and toolbar
+ActionSetSeamUILabel=Seam UI
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-12-23 13:41:24 UTC (rev 37559)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-12-23 15:59:53 UTC (rev 37560)
@@ -169,6 +169,7 @@
id="org.eclipse.debug.ui.breakpointActionSet">
</actionSet>
<actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
+ <actionSet id="org.jboss.tools.seam.ui.actionSet" />
</perspectiveExtension>
</extension>
@@ -764,6 +765,18 @@
icon="$nl$/icons/open_seam_component.gif"
label="Open Seam Component"
tooltip="Open Seam Component" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.seam.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
@@ -777,6 +790,18 @@
icon="$nl$/icons/open_seam_component.gif"
label="Open Seam Component"
tooltip="Open Seam Component" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.seam.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
</toolbar>
</menuContribution>
@@ -800,6 +825,18 @@
icon="$nl$/icons/find_seam_references.gif"
label="Find Seam References"
tooltip="Find Seam References" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.seam.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
<command
commandId="org.jboss.tools.seam.ui.find.declarations"
@@ -808,6 +845,18 @@
icon="$nl$/icons/open_seam_component.gif"
label="Find Seam Declarations"
tooltip="Find Seam Declarations" >
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeContexts">
+ <iterate
+ operator="or">
+ <equals
+ value="org.jboss.tools.seam.ui.actionSet">
+ </equals>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
<separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients -->
@@ -817,6 +866,17 @@
</menu>
</menuContribution>
</extension>
+
+ <extension
+ point="org.eclipse.ui.actionSets">
+ <actionSet
+ description="%ActionSetSeamUIDescription"
+ id="org.jboss.tools.seam.ui.actionSet"
+ label="%ActionSetSeamUILabel"
+ visible="false">
+ </actionSet>
+ </extension>
+
<extension
point="org.eclipse.ui.handlers">
<handler
12 years, 4 months
JBoss Tools SVN: r37559 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/8009 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-12-23 08:41:24 -0500 (Fri, 23 Dec 2011)
New Revision: 37559
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfLinkAndCommandLinkTest_JBIDE8009.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8009 - junit was added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp 2011-12-23 13:41:24 UTC (rev 37559)
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<html>
+<body>
+ <div id="id1">
+ <h:link value="link1" />
+ <h:commandLink value="link2" action="act2" />
+ </div>
+ <form id="id2">
+ <h:link value="link1" />
+ <h:commandLink value="link2" action="act2" />
+ </form>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/8009/JsfLinkAndCommandLink.jsp.xml 2011-12-23 13:41:24 UTC (rev 37559)
@@ -0,0 +1,28 @@
+<tests>
+ <test id="id1">
+ <DIV ID="id1" STYLE="-moz-user-modify: read-write;">
+ <A>link1</A>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ link2
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ : This link is disabled as it is not nested within a JSF form.
+ </SPAN>
+ </SPAN>
+ </DIV>
+ </test>
+ <test id="id2">
+ <FORM ID="id2" STYLE="-moz-user-modify: read-write;">
+ <A>link1</A>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ link2
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ : This link is disabled as it is not nested within a JSF form.
+ </SPAN>
+ </SPAN>
+ </FORM>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-12-23 13:39:53 UTC (rev 37558)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-12-23 13:41:24 UTC (rev 37559)
@@ -66,6 +66,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfLinkAndCommandLinkTest_JBIDE8009;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193;
@@ -189,6 +190,8 @@
suite.addTestSuite(RefreshBundles_JBIDE5460.class);
suite.addTestSuite(ExceptionInVPEComments_JBIDE5143.class);
suite.addTestSuite(VisualRefreshComment_JBIDE6067.class);
+ suite.addTestSuite(JsfLinkAndCommandLinkTest_JBIDE8009.class);
+
//$JUnit-END$
return suite;
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfLinkAndCommandLinkTest_JBIDE8009.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfLinkAndCommandLinkTest_JBIDE8009.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfLinkAndCommandLinkTest_JBIDE8009.java 2011-12-23 13:41:24 UTC (rev 37559)
@@ -0,0 +1,21 @@
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.base.test.ComponentContentTest;
+
+public class JsfLinkAndCommandLinkTest_JBIDE8009 extends ComponentContentTest {
+
+ public JsfLinkAndCommandLinkTest_JBIDE8009(String name) {
+ super(name);
+ }
+
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+ public void testCommandLink() throws Throwable {
+ performContentTest("JBIDE/8009/JsfLinkAndCommandLink.jsp"); //$NON-NLS-1$
+ }
+
+}
12 years, 4 months
JBoss Tools SVN: r37558 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-12-23 08:39:53 -0500 (Fri, 23 Dec 2011)
New Revision: 37558
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstarctLinkJsfTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfLinkTemplate.java
Log:
https://issues.jboss.org/browse/JBIDE-8009 - template for <h:link> was updated, without FORM check
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstarctLinkJsfTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstarctLinkJsfTemplate.java 2011-12-23 10:50:49 UTC (rev 37557)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstarctLinkJsfTemplate.java 2011-12-23 13:39:53 UTC (rev 37558)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template;
+import java.util.HashSet;
+import java.util.Set;
+
import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -30,10 +33,12 @@
*/
public abstract class AbstarctLinkJsfTemplate extends AbstractOutputJsfTemplate {
- private static final String H_FORM = "h:form"; //$NON-NLS-1$
- private static final String A4J_FORM = "a4j:form"; //$NON-NLS-1$
private static final String OUTSIDE_FORM_TEXT = ": This link is disabled as it is not nested within a JSF form."; //$NON-NLS-1$
-
+ private static Set<String> forms = new HashSet<String>();
+ static {
+ forms.add("h:form"); //$NON-NLS-1$
+ forms.add("a4j:form"); //$NON-NLS-1$
+ }
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -81,17 +86,25 @@
}
- private boolean hasParentForm(VpePageContext pageContext, Element sourceElement) {
- Node parent = sourceElement.getParentNode();
- while (parent != null && parent instanceof Element && parent.getNodeName() != null) {
- String parentTemplateName = VpeTemplateManager.getInstance().getTemplateName(pageContext, parent);
- if (H_FORM.equals(parentTemplateName)
- || A4J_FORM.equals(parentTemplateName)) {
- return true;
- }
- parent = parent.getParentNode();
- }
- return false;
+ /**
+ * Check if the link has <code>form</code> parent
+ *
+ * @param pageContext
+ * @param sourceElement
+ * @return true if <code>form</code> was found
+ */
+ protected boolean hasParentForm(VpePageContext pageContext, Element sourceElement) {
+ Node parent = sourceElement.getParentNode();
+ while (parent != null && parent instanceof Element
+ && parent.getNodeName() != null) {
+ String parentTemplateName = VpeTemplateManager.getInstance()
+ .getTemplateName(pageContext, parent);
+ if (forms.contains(parentTemplateName)) {
+ return true;
+ }
+ parent = parent.getParentNode();
+ }
+ return false;
}
@Override
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfLinkTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfLinkTemplate.java 2011-12-23 10:50:49 UTC (rev 37557)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfLinkTemplate.java 2011-12-23 13:39:53 UTC (rev 37558)
@@ -10,10 +10,23 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.w3c.dom.Element;
+
/**
* Template for h:link
*
* @author yradtsevich
*/
public class JsfLinkTemplate extends AbstarctLinkJsfTemplate {
+
+ @Override
+ protected boolean hasParentForm(VpePageContext pageContext, Element sourceElement) {
+ /*
+ * Fixes https://issues.jboss.org/browse/JBIDE-8009
+ * <h:link> should not depend on <form> tag
+ */
+ return true;
+ }
+
}
12 years, 4 months
JBoss Tools SVN: r37557 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest/explorer/test and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-23 05:50:49 -0500 (Fri, 23 Dec 2011)
New Revision: 37557
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulExplorerSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulServicesExplorerTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulTestBase.java
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/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleSoapTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ResourceHelper.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/WebServiceClientHelper.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java
Log:
RESTfulServiceExplorerTest template + JavaDoc for utils classes added
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 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -11,7 +11,8 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ws.ui.bot.test.rest.explorer.test.RESTfulExplorerValidationTest;
+import org.jboss.tools.ws.ui.bot.test.rest.explorer.test.RESTfulExplorerSupportTest;
+import org.jboss.tools.ws.ui.bot.test.rest.explorer.test.RESTfulServicesExplorerTest;
import org.jboss.tools.ws.ui.bot.test.sample.test.SampleRESTWebServiceTest;
import org.jboss.tools.ws.ui.bot.test.sample.test.SampleSoapWebServiceTest;
import org.jboss.tools.ws.ui.bot.test.sample.test.SimpleRESTWebServiceTest;
@@ -50,7 +51,8 @@
SampleRESTWebServiceTest.class,
SimpleSoapWebServiceTest.class,
SimpleRESTWebServiceTest.class,
- RESTfulExplorerValidationTest.class,
+ RESTfulExplorerSupportTest.class,
+ RESTfulServicesExplorerTest.class,
BottomUpWSTest.class,
TopDownWSTest.class,
WsClientTest.class,
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 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -24,11 +24,15 @@
import org.jboss.tools.ws.ui.bot.test.utils.ResourceHelper;
import org.jboss.tools.ws.ui.bot.test.utils.WebServiceClientHelper;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
+/**
+ * Basic test base for all web service bot tests
+ * @author jjankovi
+ *
+ */
@Require(server=@Server(),perspective="Java EE")
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.ws.ui.bot.test;
import java.io.IOException;
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulExplorerSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulExplorerSupportTest.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulExplorerSupportTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.bot.test.rest.explorer.test;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test checks if context menu 'Add RESTful 1.1 Support' works properly
+ * @author jjankovi
+ *
+ */
+public class RESTfulExplorerSupportTest extends RESTfulTestBase {
+
+ protected String getWsProjectName() {
+ return "RestExplorerTest";
+ }
+
+ protected String getWsPackage() {
+ return "org.rest.explorer.validation.test";
+ }
+
+ protected String getWsName() {
+ return "RestService";
+ }
+
+ @Before
+ public void setup() {
+ if (!projectExists(getWsProjectName())) {
+ projectHelper.createProject(getWsProjectName());
+ }
+ }
+
+
+ @Test
+ public void testSupportJAX_RS1_1_Explorer() {
+
+ addRestSupport(getWsProjectName());
+ assertTrue(isRestSupportEnabled(getWsProjectName()));
+
+ }
+
+}
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulServicesExplorerTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulServicesExplorerTest.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulServicesExplorerTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.bot.test.rest.explorer.test;
+
+import org.junit.Test;
+
+
+
+/**
+ * Test operates on exploring RESTFul services in RESTful explorer
+ * @author jjankovi
+ *
+ */
+public class RESTfulServicesExplorerTest extends RESTfulTestBase {
+
+ protected String getWsProjectName() {
+ return "RestServicesExplorer";
+ }
+
+ protected String getWsPackage() {
+ return "org.rest.explorer.services.test";
+ }
+
+ protected String getWsName() {
+ return "RestService";
+ }
+
+ @Override
+ public void setup() {
+ if (!projectExists(getWsProjectName())) {
+ projectHelper.createProject(getWsProjectName());
+ addRestSupport(getWsProjectName());
+ }
+ }
+
+ @Override
+ public void cleanup() {
+ if (projectExists(getWsProjectName())) {
+ removeRestSupport(getWsProjectName());
+ projectExplorer.deleteAllProjects();
+ }
+ }
+
+ @Test
+ public void testAddingSimpleRESTMethods() {
+ //only get, post, put, delete
+ }
+
+ @Test
+ public void testAddingAdvancedRESTMethods() {
+ //with additional path param
+ }
+
+ @Test
+ public void testEditingSimpleRESTMethods() {
+ //only get, post, put, delete
+ }
+
+ @Test
+ public void testEditingAdvancedRESTMethods() {
+ ////with additional path param
+ }
+
+ @Test
+ public void testDeletingRESTMethods() {
+ //deleting all rest methods
+ }
+
+}
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulTestBase.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/test/RESTfulTestBase.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.bot.test.rest.explorer.test;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ws.ui.bot.test.WSTestBase;
+import org.jboss.tools.ws.ui.bot.test.utils.NodeContextUtil;
+
+/**
+ * Test base for bot tests using RESTFul support
+ * @author jjankovi
+ *
+ */
+public class RESTfulTestBase extends WSTestBase {
+
+ protected final String CONFIGURE_MENU_LABEL = "Configure";
+ protected final String REST_SUPPORT_MENU_LABEL_ADD = "Add JAX-RS 1.1 support...";
+ protected final String REST_SUPPORT_MENU_LABEL_REMOVE = "Remove JAX-RS 1.1 support...";
+ protected final String REST_EXPLORER_LABEL = "JAX-RS REST Web Services";
+ protected final String REST_EXPLORER_LABEL_BUILD = "Building RESTful Web Services...";
+ private enum ConfigureOption {
+ ADD, REMOVE;
+ }
+
+ /**
+ *
+ * @param wsProjectName
+ */
+ protected void addRestSupport(String wsProjectName) {
+ configureRestSupport(wsProjectName, ConfigureOption.ADD);
+ }
+
+ protected void removeRestSupport(String wsProjectName) {
+ configureRestSupport(wsProjectName, ConfigureOption.REMOVE);
+ }
+
+ private void configureRestSupport(String wsProjectName, ConfigureOption option) {
+ projectExplorer.selectProject(wsProjectName);
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem item = tree.getTreeItem(wsProjectName);
+ item.expand();
+ NodeContextUtil.nodeContextMenu(tree, item, CONFIGURE_MENU_LABEL,
+ option==ConfigureOption.ADD?
+ REST_SUPPORT_MENU_LABEL_ADD:
+ REST_SUPPORT_MENU_LABEL_ADD).click();
+ bot.sleep(Timing.time2S());
+ util.waitForNonIgnoredJobs();
+ }
+
+ /**
+ *
+ * @param wsProjectName
+ * @return
+ */
+ protected boolean isRestSupportEnabled(String wsProjectName) {
+ projectExplorer.selectProject(wsProjectName);
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem item = tree.getTreeItem(wsProjectName);
+ assertTrue(NodeContextUtil.nodeContextMenu(tree, item, CONFIGURE_MENU_LABEL,
+ REST_SUPPORT_MENU_LABEL_REMOVE).isVisible());
+ return (projectExplorer.isFilePresent(wsProjectName, REST_EXPLORER_LABEL) ||
+ projectExplorer.isFilePresent(wsProjectName, REST_EXPLORER_LABEL_BUILD));
+ }
+
+}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleRESTTestBase.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -14,7 +14,7 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type;
/**
- *
+ * Test base for all sample rest Web Services bot tests
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleSoapTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleSoapTestBase.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleSoapTestBase.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -14,7 +14,7 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type;
/**
- *
+ * Test operates on Sample Web Service wizard
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -35,7 +35,7 @@
import org.jboss.tools.ws.ui.bot.test.wsclient.WSClient;
/**
- *
+ * Test base for all sample Web Services bot tests
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -15,7 +15,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Sample REST Web Service Wizard
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -15,7 +15,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Sample SOAP Web Service Wizard
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -16,7 +16,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Simple REST Web Service Wizard
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -16,7 +16,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Simple SOAP Web Service Wizard
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -21,18 +21,13 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-/**
- *
- * @author jjankovi
- *
- */
public class DeploymentHelper extends SWTTestExt {
private final Logger LOGGER = Logger
.getLogger(DeploymentHelper.class.getName());
/**
- *
+ * Method runs project on configured server
* @param project
*/
public void runProject(String project) {
@@ -41,7 +36,8 @@
}
/**
- *
+ * Method checks if service is deployed by checking http header code
+ * response of entered wsdURL
* @param wsdlURL
*/
public void assertServiceDeployed(String wsdlURL) {
@@ -49,7 +45,8 @@
}
/**
- *
+ * Method checks if service is deployed by checking http header code
+ * response of entered wsdURL and timeout for this operation
* @param wsdlURL
* @param timeout
*/
@@ -88,7 +85,8 @@
}
/**
- *
+ * Method checks if service is not deployed by checking http header code
+ * response of entered wsdURL
* @param wsdlURL
*/
public void assertServiceNotDeployed(String wsdlURL) {
@@ -112,7 +110,8 @@
}
/**
- *
+ * Method checks if service is not deployed by checking http header code
+ * response of entered wsdURL and timeout for this operation
* @param startServlet
* @param response
*/
@@ -122,7 +121,8 @@
}
/**
- *
+ * Method gets http page for entered url of page and timeout for
+ * this operation
* @param url
* @param timeout
* @return
@@ -166,7 +166,7 @@
}
/**
- *
+ * Method gets wsdl determined by deployed project and web service name
* @param projectName
* @param wsName
* @return
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -22,15 +22,11 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
-/**
- *
- * @author jjankovi
- *
- */
public class ProjectHelper extends SWTTestExt {
/**
- *
+ * Method creates basic java class for entered project with
+ * entered package and class name
* @param projectName
* @param pkg
* @param cName
@@ -49,7 +45,8 @@
}
/**
- *
+ * Method creates wsdl file for entered project with
+ * entered package name
* @param projectName
* @param s
* @return
@@ -66,7 +63,7 @@
}
/**
- *
+ * Method creates new Dynamic Web Project with entered name
* @param name
*/
public void createProject(String name) {
@@ -79,7 +76,7 @@
}
/**
- *
+ * Method creates new EAR Project with entered name
* @param name
*/
public void createEARProject(String name) {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ResourceHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ResourceHelper.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ResourceHelper.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -20,15 +20,10 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-/**
- *
- * @author jjankovi
- *
- */
public class ResourceHelper {
/**
- *
+ * Method converts input stream to text format
* @param is
* @return
*/
@@ -39,7 +34,7 @@
}
/**
- *
+ * Method reads input file and output it as text
* @param f
* @return
*/
@@ -65,7 +60,7 @@
}
/**
- *
+ * Method copies resource to class opened in SWTBotEditor
* @param classEdit
* @param resource
* @param closeEdit
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/WebServiceClientHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/WebServiceClientHelper.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/WebServiceClientHelper.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -7,15 +7,11 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
import org.junit.Assert;
-/**
- *
- * @author jjankovi
- *
- */
public class WebServiceClientHelper extends SWTTestExt {
/**
- *
+ * Method creates Web Service Client for entered wsdl file, web project,
+ * level of creation and name of package for client
* @param wsdl
* @param targetProject
* @param level
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/BottomUpWSTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -14,7 +14,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Web Service Wizard with bottom up process of creating web service
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/TopDownWSTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -15,7 +15,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Web Service Wizard with top down process of creating web service
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -33,7 +33,7 @@
import org.junit.runners.Suite.SuiteClasses;
/**
- *
+ * Test operates on creating non-trivial EAP project from Java class
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -42,7 +42,7 @@
import org.junit.runners.Suite.SuiteClasses;
/**
- *
+ * Test operates on creating non-trivial EAP project from wsdl file
* @author jjankovi
*
*/
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java 2011-12-23 10:07:04 UTC (rev 37556)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wsclient/WsClientTest.java 2011-12-23 10:50:49 UTC (rev 37557)
@@ -18,7 +18,7 @@
import org.junit.Test;
/**
- *
+ * Test operates on Web Service Client Wizard
* @author jjankovi
*
*/
12 years, 4 months
JBoss Tools SVN: r37556 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-23 05:07:04 -0500 (Fri, 23 Dec 2011)
New Revision: 37556
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogCloseTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogOpenTask.java
Log:
changed implementation
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogCloseTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogCloseTask.java 2011-12-23 10:06:49 UTC (rev 37555)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogCloseTask.java 2011-12-23 10:07:04 UTC (rev 37556)
@@ -1,19 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.task.dialog;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
-import org.jboss.tools.portlet.ui.bot.task.wait.TaskDuration;
-import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask;
-import org.jboss.tools.portlet.ui.bot.task.wait.condition.NonSystemJobRunsCondition;
-import org.jboss.tools.portlet.ui.bot.task.wait.condition.ShellIsActiveCondition;
-
-public class ProjectPropertyDialogCloseTask extends AbstractSWTTask {
-
- @Override
- public void perform() {
- SWTBotShell activeShell = getBot().activeShell();
- getBot().button("OK").click();
- performInnerTask(new WaitWhileTask(new ShellIsActiveCondition(activeShell), TaskDuration.NORMAL));
- performInnerTask(new WaitWhileTask(new NonSystemJobRunsCondition(), TaskDuration.LONG));
- }
-}
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogOpenTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogOpenTask.java 2011-12-23 10:06:49 UTC (rev 37555)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogOpenTask.java 2011-12-23 10:07:04 UTC (rev 37556)
@@ -1,34 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.task.dialog;
-
-import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
-import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
-
-public class ProjectPropertyDialogOpenTask extends AbstractSWTTask{
-
- private String project;
-
- private String propertyPage;
-
- @Override
- public void perform() {
- PackageExplorer projectExplorer = SWTBotFactory.getPackageexplorer();
- projectExplorer.show();
- projectExplorer.selectProject(project);
-
- ContextMenuHelper.clickContextMenu(projectExplorer.bot().tree(),
- "Properties");
-
- SWTBotFactory.getEclipse().waitForShell("Properties for " + project);
- getBot().tree().expandNode(propertyPage).select();
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- public void setPropertyPage(String propertyPage) {
- this.propertyPage = propertyPage;
- }
-}
12 years, 4 months
JBoss Tools SVN: r37555 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: task/dialog/property/seam and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-23 05:06:49 -0500 (Fri, 23 Dec 2011)
New Revision: 37555
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/seam/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/seam/SeamRuntimeChangingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java
Log:
Added seam example test for 5x runtime
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/seam/SeamRuntimeChangingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/seam/SeamRuntimeChangingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/seam/SeamRuntimeChangingTask.java 2011-12-23 10:06:49 UTC (rev 37555)
@@ -0,0 +1,48 @@
+package org.jboss.tools.portlet.ui.bot.task.dialog.property.seam;
+
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.task.dialog.property.ProjectPropertyDialogCloseTask;
+import org.jboss.tools.portlet.ui.bot.task.dialog.property.ProjectPropertyDialogOpenTask;
+
+/**
+ * Sets the specified Seam runtime for the project via property dialog.
+ *
+ * Requires: Seam runtime already exists.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class SeamRuntimeChangingTask extends AbstractSWTTask {
+
+ private String project;
+
+ private String runtime;
+
+ public SeamRuntimeChangingTask(String project, String runtime) {
+ super();
+ this.project = project;
+ this.runtime = runtime;
+ }
+
+ @Override
+ public void perform() {
+ showPropertyDialog();
+ selectRuntime();
+ closePropertyDialog();
+ }
+
+ private void selectRuntime() {
+ getBot().comboBoxWithLabel("Seam 2 Runtime:").setSelection(runtime);
+ }
+
+ private void showPropertyDialog() {
+ ProjectPropertyDialogOpenTask openTask = new ProjectPropertyDialogOpenTask();
+ openTask.setProject(project);
+ openTask.setPropertyPage("Seam 2 Settings");
+ performInnerTask(openTask);
+ }
+
+ private void closePropertyDialog() {
+ performInnerTask(new ProjectPropertyDialogCloseTask());
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2011-12-23 10:05:53 UTC (rev 37554)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2011-12-23 10:06:49 UTC (rev 37555)
@@ -10,7 +10,8 @@
JSFPortletExampleRuntime4x.class,
SeamPortletExampleRuntime4x.class,
JSFPortletExampleRuntime5x.class,
- RichFacesPortletExampleRuntime5x.class
+ RichFacesPortletExampleRuntime5x.class,
+ SeamPortletExampleRuntime5x.class
})
public class ExamplesSuite {
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2011-12-23 10:06:49 UTC (rev 37555)
@@ -0,0 +1,51 @@
+package org.jboss.tools.portlet.ui.bot.test.example;
+
+import org.jboss.tools.portlet.ui.bot.task.dialog.property.seam.SeamRuntimeChangingTask;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+
+/**
+ * Tests the JSF portlet example.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(db=@DB, seam=@Seam, server=@Server(version="5.0", operator=">", state=ServerState.Present, type=ServerType.EPP))
+public class SeamPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest {
+
+ private static final String PROJECT_NAME_IN_WIZARD = "SeamPortlet";
+
+ private static final String PROJECT_NAME_EAR = "seam-portlet-ear";
+
+ private static final String PROJECT_NAME_EJB = "seam-portlet-ejb";
+
+ private static final String PROJECT_NAME_WAR = "seam-portlet-web";
+
+ private int getProjectNameMethodCallCounter = 0;
+
+ @Override
+ public String getExampleName() {
+ return "JBoss Portlet Bridge - Seam Portlet";
+ }
+
+ @Override
+ public String[] getProjectNames() {
+ // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace
+ if (getProjectNameMethodCallCounter <= 1){
+ getProjectNameMethodCallCounter++;
+ return new String[]{PROJECT_NAME_IN_WIZARD};
+ }
+ return new String[]{PROJECT_NAME_EAR, PROJECT_NAME_EJB, PROJECT_NAME_WAR};
+ }
+
+ @Override
+ protected void executeExample() {
+ doPerform(new SeamRuntimeChangingTask(PROJECT_NAME_WAR, configuredState.getSeam().name));
+ super.executeExample();
+ }
+}
12 years, 4 months
JBoss Tools SVN: r37554 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-23 05:05:53 -0500 (Fri, 23 Dec 2011)
New Revision: 37554
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java
Log:
changed implementation
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java 2011-12-23 10:05:33 UTC (rev 37553)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java 2011-12-23 10:05:53 UTC (rev 37554)
@@ -1,56 +1,98 @@
package org.jboss.tools.portlet.ui.bot.task.debug;
-import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.asyncExec;
+import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;
+import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
+import java.util.ArrayList;
import java.util.List;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.hamcrest.Matcher;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+/**
+ * Finds all widgets recursively and writes debuggin information about each of them.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
public class WriteAllWidgets extends AbstractSWTTask {
private Matcher<? extends Widget> matcher;
- private Widget widget;
+ private Widget parentWidget;
+ /**
+ * Finds all widgets for the active shell.
+ */
+ public WriteAllWidgets() {
+ this(widgetOfType(Widget.class));
+ }
+
+ /**
+ * Finds all widgets meeting specified matcher's condition for the active shell.
+ *
+ * @param matcher
+ */
public WriteAllWidgets(Matcher<? extends Widget> matcher) {
- super();
- this.matcher = matcher;
+ this(null, matcher);
}
+ /**
+ * Finds all widgets starting from the specified widget meeting
+ * specified matcher condition.
+ *
+ * @param widget
+ * @param matcher
+ */
public WriteAllWidgets(Widget widget, Matcher<? extends Widget> matcher) {
super();
this.matcher = matcher;
- this.widget = widget;
+ this.parentWidget = widget;
}
@Override
public void perform() {
- final List<? extends Widget> widgets = getBot().widgets(matcher, getParentWidget());
+ syncExec(new VoidResult() {
- asyncExec(new VoidResult() {
-
@Override
public void run() {
- writeWidgets(widgets);
+ System.out.println("List of current widgets");
+ writeWidgetRecursive(getParentWidget(), new ArrayList<Widget>(), "");
+ System.out.println("End of list");
}
});
}
- private Widget getParentWidget() {
- if (widget == null){
- return getBot().activeShell().widget;
+ private void writeWidgetRecursive(Widget widget, ArrayList<Widget> visited, String prefix){
+
+ if (visited.contains(widget)){
+ return;
+ }
+
+ visited.add(widget);
+ writeWidget(widget, prefix);
+
+ if (widget instanceof Composite && ((Composite) widget).getChildren().length == 0){
+ return;
}
- return widget;
+
+ List<? extends Widget> children = getBot().widgets(matcher, widget);
+ for (Widget child : children){
+ writeWidgetRecursive(child, visited, prefix + "---");
+ }
}
+
+ private void writeWidget(Widget widget, String prefix){
+ System.out.println(prefix + widget);
+ }
- private void writeWidgets(List<? extends Widget> widgets){
- System.out.println("List of current widgets");
- for (Widget w : widgets){
- System.out.println(w);
+ private Widget getParentWidget() {
+ if (parentWidget == null){
+ return getBot().activeShell().widget;
}
- System.out.println("End of list");
+ return parentWidget;
}
}
12 years, 4 months
JBoss Tools SVN: r37553 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: task/dialog and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-23 05:05:33 -0500 (Fri, 23 Dec 2011)
New Revision: 37553
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogOpenTask.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java
Log:
changed package
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-12-23 09:45:41 UTC (rev 37552)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/ProjectFacetsMatcher.java 2011-12-23 10:05:33 UTC (rev 37553)
@@ -7,8 +7,8 @@
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
-import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogCloseTask;
-import org.jboss.tools.portlet.ui.bot.task.dialog.ProjectPropertyDialogOpenTask;
+import org.jboss.tools.portlet.ui.bot.task.dialog.property.ProjectPropertyDialogCloseTask;
+import org.jboss.tools.portlet.ui.bot.task.dialog.property.ProjectPropertyDialogOpenTask;
import org.jboss.tools.portlet.ui.bot.task.facet.AbstractFacetTask;
/**
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java (from rev 37430, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogCloseTask.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java 2011-12-23 10:05:33 UTC (rev 37553)
@@ -0,0 +1,19 @@
+package org.jboss.tools.portlet.ui.bot.task.dialog.property;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.task.wait.TaskDuration;
+import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask;
+import org.jboss.tools.portlet.ui.bot.task.wait.condition.NonSystemJobRunsCondition;
+import org.jboss.tools.portlet.ui.bot.task.wait.condition.ShellIsActiveCondition;
+
+public class ProjectPropertyDialogCloseTask extends AbstractSWTTask {
+
+ @Override
+ public void perform() {
+ SWTBotShell activeShell = getBot().activeShell();
+ getBot().button("OK").click();
+ performInnerTask(new WaitWhileTask(new ShellIsActiveCondition(activeShell), TaskDuration.NORMAL));
+ performInnerTask(new WaitWhileTask(new NonSystemJobRunsCondition(), TaskDuration.LONG));
+ }
+}
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogOpenTask.java (from rev 37065, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/ProjectPropertyDialogOpenTask.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogOpenTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogOpenTask.java 2011-12-23 10:05:33 UTC (rev 37553)
@@ -0,0 +1,34 @@
+package org.jboss.tools.portlet.ui.bot.task.dialog.property;
+
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
+
+public class ProjectPropertyDialogOpenTask extends AbstractSWTTask{
+
+ private String project;
+
+ private String propertyPage;
+
+ @Override
+ public void perform() {
+ PackageExplorer projectExplorer = SWTBotFactory.getPackageexplorer();
+ projectExplorer.show();
+ projectExplorer.selectProject(project);
+
+ ContextMenuHelper.clickContextMenu(projectExplorer.bot().tree(),
+ "Properties");
+
+ SWTBotFactory.getEclipse().waitForShell("Properties for " + project);
+ getBot().tree().expandNode(propertyPage).select();
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public void setPropertyPage(String propertyPage) {
+ this.propertyPage = propertyPage;
+ }
+}
12 years, 4 months