JBoss Tools SVN: r42208 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-25 22:25:43 -0400 (Mon, 25 Jun 2012)
New Revision: 42208
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-10738
As-you-type EL validation
As-you-type validation is turned off for non-modified files
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-26 00:10:59 UTC (rev 42207)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-26 02:25:43 UTC (rev 42208)
@@ -180,7 +180,7 @@
}
}
}
-
+
/**
* Adds annotation to the annotation model, and stores it in fAnnotations with either actual position
* or special constant ALWAYS_CLEARED (when cleanAllAnnotations = true) that indicates that
@@ -461,8 +461,7 @@
protected void process(DirtyRegion dirtyRegion) {
IDocument doc = getDocument();
-
- if (!isInstalled() || isInRewrite() || dirtyRegion == null || doc == null || fIsCanceled) {
+ if (!fEditor.isDirty() || !isInstalled() || isInRewrite() || dirtyRegion == null || doc == null || fIsCanceled) {
return;
}
@@ -483,15 +482,15 @@
* Expand dirtyRegion to partitions boundaries
*/
try {
- ITypedRegion startPartition = (fDocument instanceof IDocumentExtension3) ?
- ((IDocumentExtension3)fDocument).getPartition(IJavaPartitions.JAVA_PARTITIONING, start, true) :
- fDocument.getPartition(start);
+ ITypedRegion startPartition = (doc instanceof IDocumentExtension3) ?
+ ((IDocumentExtension3)doc).getPartition(IJavaPartitions.JAVA_PARTITIONING, start, true) :
+ doc.getPartition(start);
if (startPartition != null && start > startPartition.getOffset())
start = startPartition.getOffset();
- ITypedRegion endPartition = (fDocument instanceof IDocumentExtension3) ?
- ((IDocumentExtension3)fDocument).getPartition(IJavaPartitions.JAVA_PARTITIONING, end, false) :
- fDocument.getPartition(end);
+ ITypedRegion endPartition = (doc instanceof IDocumentExtension3) ?
+ ((IDocumentExtension3)doc).getPartition(IJavaPartitions.JAVA_PARTITIONING, end, false) :
+ doc.getPartition(end);
if (endPartition != null && end < endPartition.getOffset() + endPartition.getLength())
end = endPartition.getOffset() + endPartition.getLength();
} catch (BadLocationException e) {
13 years, 9 months
JBoss Tools SVN: r42206 - in trunk/download.jboss.org/jbosstools/updates/requirements: birt and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-25 18:31:14 -0400 (Mon, 25 Jun 2012)
New Revision: 42206
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/atlassian/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
Log:
update to Juno SR0 requirements (JBIDE-11549)
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/atlassian/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/atlassian/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/atlassian/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -22,11 +22,11 @@
<!-- <property name="URL1" value="http://download.eclipse.org/mylyn/releases/latest" /> -->
<!-- TODO: make sure that the version of Mylyn in Juno (or on the URL above?) is the same as the version used on the Atlassian site! -->
<property name="URL1" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/atlassian/3.0.4.v20120406/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/atlassian/3.0.5.v20120518/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.0.4.v20120406" name="atlassian 3.0.4.v20120406" />
+ <repository location="file:${destination}/3.0.5.v20120518" name="atlassian 3.0.5.v20120518" />
<source>
<repository location="${URL1}" />
</source>
@@ -41,6 +41,6 @@
<iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.0.4.v20120406/" artifactRepository="file:${destination}/3.0.4.v20120406/" publishartifacts="true" source="${destination}/3.0.4.v20120406/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.0.5.v20120518/" artifactRepository="file:${destination}/3.0.5.v20120518/" publishartifacts="true" source="${destination}/3.0.5.v20120518/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -23,12 +23,12 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/birt/update-site/4.2-interim/" />
+ <property name="URL" value="http://download.eclipse.org/birt/update-site/4.2/" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/4.2.0.v20120320/" name="BIRT 4.2.0.v20120320 (Chart + WTP support only)" />
+ <repository location="file:${destination}/4.2.0.v20120613/" name="BIRT 4.2.0.v20120613 (Chart + WTP support only)" />
<source>
<repository location="${URL}" />
</source>
@@ -43,9 +43,9 @@
</p2.mirror>
<delete>
- <fileset dir="${destination}/4.2.0.v20120320/" includes="**/artifacts.jar, **/contents.jar"/>
+ <fileset dir="${destination}/4.2.0.v20120613/" includes="**/artifacts.jar, **/contents.jar"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.2.0.v20120320/" artifactRepository="file:${destination}/4.2.0.v20120320/" publishartifacts="true" source="${destination}/4.2.0.v20120320/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.2.0.v20120613/" artifactRepository="file:${destination}/4.2.0.v20120613/" publishartifacts="true" source="${destination}/4.2.0.v20120613/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/ecf/build.xml -Ddestination=/tmp/ecf-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.4/site.p2" />
+ <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.6/site.p2" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.5.4/" name="ECF plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.5.6/" name="ECF plugins for Eclipse 3.6+" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.4/" artifactRepository="file:${destination}/3.5.4/" publishartifacts="true" source="${destination}/3.5.4/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.6/" artifactRepository="file:${destination}/3.5.6/" publishartifacts="true" source="${destination}/3.5.6/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -17,13 +17,13 @@
-->
<target name="mirror">
<!-- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.8milestones/S-3.8M6-2012031..."/> -->
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/4.2milestones/S-4.2M6-2012031..."/>
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400/"/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/S-4.2M6-201203151300/" name="Eclipse S-4.2M6-201203151300" />
+ <repository location="file:${destination}/R-4.2-201206081400/" name="Eclipse R-4.2-201206081400" />
<source>
<repository location="${URL}" />
</source>
@@ -31,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/S-4.2M6-201203151300/" artifactRepository="file:${destination}/S-4.2M6-201203151300/" publishartifacts="true" source="${destination}/S-4.2M6-201203151300/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/R-4.2-201206081400/" artifactRepository="file:${destination}/R-4.2-201206081400/" publishartifacts="true" source="${destination}/R-4.2-201206081400/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -17,12 +17,12 @@
-->
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/juno/" />
<property name="compress" value="true" />
- <property name="URL1" value="http://download.eclipse.org/releases/juno/201203230900/" />
+ <property name="URL1" value="http://download.eclipse.org/releases/juno/201206270900/" />
<target name="run" depends="mirror,regen"/>
<target name="mirror">
<p2.mirror>
- <repository location="file:${destination}/201203230900-M6/" name="Juno 201203230900-M6" />
+ <repository location="file:${destination}/201206270900-R/" name="Juno 201206270900-R" />
<source>
<repository location="${URL1}" />
</source>
@@ -34,8 +34,8 @@
<!-- remove OTDT patched version of o.e.jdt.core, and all other o.e.ot.otdt features/plugins -->
<delete>
- <fileset dir="${destination}/201203230900-M6/" includes="**/org.eclipse.jdt.core_*OTDT*.jar*, **/org.eclipse.objectteams.otdt*.jar*"/>
+ <fileset dir="${destination}/201206270900-R/" includes="**/org.eclipse.jdt.core_*OTDT*.jar*, **/org.eclipse.objectteams.otdt*.jar*"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201203230900-M6/" artifactRepository="file:${destination}/201203230900-M6/" publishartifacts="true" source="${destination}/201203230900-M6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201206270900-R/" artifactRepository="file:${destination}/201206270900-R/" publishartifacts="true" source="${destination}/201206270900-R/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/orbit/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -16,12 +16,12 @@
-f ~/RHDS/updates/requirements/orbit/build.xml -Ddestination=/tmp/orbit-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.eclipse.org/tools/orbit/downloads/drops/S20120308061416/r..." />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/orbit/S20120308061416/" />
+ <property name="URL1" value="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/r..." />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/orbit/R20120526062928/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/S20120308061416" name="Eclipse Orbit S20120308061416" />
+ <repository location="file:${destination}/R20120526062928" name="Eclipse Orbit R20120526062928" />
<source>
<repository location="${URL1}" />
</source>
@@ -29,6 +29,6 @@
<slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/S20120308061416/" artifactRepository="file:${destination}/S20120308061416/" publishartifacts="true" source="${destination}/S20120308061416/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/R20120526062928/" artifactRepository="file:${destination}/R20120526062928/" publishartifacts="true" source="${destination}/R20120526062928/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-06-25 17:36:44 UTC (rev 42205)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-06-25 22:31:14 UTC (rev 42206)
@@ -23,13 +23,13 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.4.0/S-3.4.0M6-201..."/>
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.4.0/R-3.4.0-20120..."/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/S-3.4.0M6-20120319200442/" name="Web Tools S-3.4.0M6-20120319200442" />
+ <repository location="file:${destination}/R-3.4.0-20120612174739/" name="Web Tools R-3.4.0-20120612174739" />
<source>
<repository location="${URL}" />
</source>
@@ -38,6 +38,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/S-3.4.0M6-20120319200442/" artifactRepository="file:${destination}/S-3.4.0M6-20120319200442/" publishartifacts="true" source="${destination}/S-3.4.0M6-20120319200442/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/R-3.4.0-20120612174739/" artifactRepository="file:${destination}/R-3.4.0-20120612174739/" publishartifacts="true" source="${destination}/R-3.4.0-20120612174739/" compress="${compress}" />
</target>
</project>
13 years, 9 months
JBoss Tools SVN: r42205 - in trunk/openshift/features: org.jboss.tools.openshift.express.test.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-25 13:36:44 -0400 (Mon, 25 Jun 2012)
New Revision: 42205
Modified:
trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature/
trunk/openshift/features/org.jboss.tools.openshift.express.test.feature/
Log:
target folder added to svn:ignore
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.egit.integration.test.feature
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.express.test.feature
___________________________________________________________________
Added: svn:ignore
+ target
13 years, 9 months
JBoss Tools SVN: r42204 - in trunk/maven: features/org.jboss.tools.maven.profiles.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-25 13:32:51 -0400 (Mon, 25 Jun 2012)
New Revision: 42204
Modified:
trunk/maven/features/org.jboss.tools.maven.jdt.feature/
trunk/maven/features/org.jboss.tools.maven.profiles.feature/
trunk/maven/plugins/org.jboss.tools.maven.jdt/
Log:
target folder added to svn:ignore
Property changes on: trunk/maven/features/org.jboss.tools.maven.jdt.feature
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/maven/features/org.jboss.tools.maven.profiles.feature
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.jdt
___________________________________________________________________
Added: svn:ignore
+ target
13 years, 9 months
JBoss Tools SVN: r42203 - trunk/maven/features/org.jboss.tools.maven.gwt.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-25 13:29:46 -0400 (Mon, 25 Jun 2012)
New Revision: 42203
Modified:
trunk/maven/features/org.jboss.tools.maven.gwt.feature/
Log:
target folder added to svn:ignore
Property changes on: trunk/maven/features/org.jboss.tools.maven.gwt.feature
___________________________________________________________________
Added: svn:ignore
+ target
13 years, 9 months
JBoss Tools SVN: r42202 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2012-06-25 13:00:18 -0400 (Mon, 25 Jun 2012)
New Revision: 42202
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
Log:
https://issues.jboss.org/browse/JBDS-2209 - remove duplicated bpel.facet.core project facet definition.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2012-06-25 14:59:32 UTC (rev 42201)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2012-06-25 17:00:18 UTC (rev 42202)
@@ -93,8 +93,10 @@
An uninstall action was added to allow the facet to be swapped out with the
deprecated jbt.bpel.facet.core facet, or to be removed altogether
-->
+
<extension point="org.eclipse.wst.common.project.facet.core.facets">
+<!--
<project-facet id="bpel.facet.core">
<label>%BPEL_CORE_FACET_LABEL</label>
<description>%BPEL_CORE_FACET_DESCRIPTION</description>
@@ -110,6 +112,7 @@
</and>
</constraint>
</project-facet-version>
+-->
<!--
<action facet="bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
13 years, 9 months
JBoss Tools SVN: r42201 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-06-25 10:59:32 -0400 (Mon, 25 Jun 2012)
New Revision: 42201
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
Log:
new test JAXRSToolingIntegrationTest added into test suite
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-06-25 14:59:12 UTC (rev 42200)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-06-25 14:59:32 UTC (rev 42201)
@@ -12,6 +12,7 @@
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ws.ui.bot.test.annotation.AnnotationPropertiesTest;
+import org.jboss.tools.ws.ui.bot.test.integration.JAXRSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.integration.SOAPWSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.rest.DefaultValueAnnotationSupportTest;
import org.jboss.tools.ws.ui.bot.test.rest.MatrixAnnotationSupportTest;
@@ -67,6 +68,7 @@
DefaultValueAnnotationSupportTest.class,
RESTfulValidationTest.class,
RESTfulCompletionTest.class,
+ JAXRSToolingIntegrationTest.class,
SOAPWSToolingIntegrationTest.class,
ApplicationPathAnnotationTest.class,
BottomUpWSTest.class,
13 years, 9 months
JBoss Tools SVN: r42200 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-06-25 10:59:12 -0400 (Mon, 25 Jun 2012)
New Revision: 42200
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java
Log:
new test JAXRSToolingIntegrationTest has been implemented
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-06-25 14:58:41 UTC (rev 42199)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-06-25 14:59:12 UTC (rev 42200)
@@ -17,6 +17,7 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.RESTFullExplorer;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Type;
+import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -31,12 +32,21 @@
private static String projectName = "integration1";
private String localhostUrl = "http://localhost:8080/";
private String serviceUrl = localhostUrl + projectName + "/rest/";
+ private WsTesterView wsTesterView = new WsTesterView();
@BeforeClass
public static void prepareWS() {
importRestWSProject(projectName);
+ servers.addProjectToServer(
+ projectName, configuredState.getServer().name);
}
+ @After
+ public void minimizeTester() {
+ /* minimize web service tester */
+ wsTesterView.minimize();
+ }
+
@Test
public void testGetMethod() {
/* get JAX-RS REST Web Services */
@@ -47,15 +57,12 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- WsTesterView wsTesterView = showWSTester();
+ wsTesterView = showWSTester();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.GET);
assertEquals("GET method", wsTesterView.getResponseBody());
assertEquals("[HTTP/1.1 200 OK]", wsTesterView.getResponseHeaders()[0]);
-
- /* minimize web service tester */
- wsTesterView.minimize();
}
@Test
@@ -68,15 +75,12 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- WsTesterView wsTesterView = showWSTester();
+ wsTesterView = showWSTester();
assertEquals(serviceUrl + "post", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
assertEquals("POST method", wsTesterView.getResponseBody());
assertEquals("[HTTP/1.1 200 OK]", wsTesterView.getResponseHeaders()[0]);
-
- /* minimize web service tester */
- wsTesterView.minimize();
}
@Test
@@ -89,15 +93,12 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- WsTesterView wsTesterView = showWSTester();
+ wsTesterView = showWSTester();
assertEquals(serviceUrl + "put", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.PUT);
assertEquals("PUT method", wsTesterView.getResponseBody());
assertEquals("[HTTP/1.1 200 OK]", wsTesterView.getResponseHeaders()[0]);
-
- /* minimize web service tester */
- wsTesterView.minimize();
}
@Test
@@ -110,15 +111,12 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- WsTesterView wsTesterView = showWSTester();
- assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
+ wsTesterView = showWSTester();
+ assertEquals(serviceUrl + "delete", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.DELETE);
assertEquals("DELETE method", wsTesterView.getResponseBody());
assertEquals("[HTTP/1.1 200 OK]", wsTesterView.getResponseHeaders()[0]);
-
- /* minimize web service tester */
- wsTesterView.minimize();
}
@Test
@@ -131,20 +129,16 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- WsTesterView wsTesterView = showWSTester();
+ wsTesterView = showWSTester();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
assertFalse(wsTesterView.getResponseBody().equals("GET method"));
assertEquals("[HTTP/1.1 405 Method Not Allowed]", wsTesterView.getResponseHeaders()[0]);
-
- /* minimize web service tester */
- wsTesterView.minimize();
}
private WsTesterView showWSTester() {
- WsTesterView wsTesterView = new WsTesterView();
- wsTesterView.show();
+ wsTesterView.show();
return wsTesterView;
}
13 years, 9 months
JBoss Tools SVN: r42199 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-06-25 10:58:41 -0400 (Mon, 25 Jun 2012)
New Revision: 42199
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
Log:
enhancement of runRestServiceOnConfiguredServer method
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-06-25 14:58:05 UTC (rev 42198)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-06-25 14:58:41 UTC (rev 42199)
@@ -14,9 +14,11 @@
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.ViewIsActive;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
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.types.IDELabel;
import org.jboss.tools.ws.ui.bot.test.WSTestBase;
import org.jboss.tools.ws.ui.bot.test.uiutils.RESTFullExplorer;
import org.jboss.tools.ws.ui.bot.test.uiutils.RunOnServerDialog;
@@ -159,6 +161,7 @@
protected void runRestServiceOnConfiguredServer(String webService) {
RunOnServerDialog dialog = restfulWizard.runOnServer(restfulWizard.restService(webService));
dialog.chooseExistingServer().selectServer(configuredState.getServer().name).finish();
+ bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER));
}
protected SWTBotTreeItem[] restfulServicesForProject(String projectName) {
13 years, 9 months