JBoss Tools SVN: r43627 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-12 20:08:42 -0400 (Wed, 12 Sep 2012)
New Revision: 43627
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2012-09-12 20:38:49 UTC (rev 43626)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2012-09-13 00:08:42 UTC (rev 43627)
@@ -14,11 +14,11 @@
UNPROXYABLE_BEAN_FINAL_TYPE=Injection point whose declared type ({0} is a final class) cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
UNPROXYABLE_BEAN_TYPE_WITH_FM=Injection point whose declared type ({0} is a class with final methods) cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
-UNPROXYABLE_BEAN_ARRAY_TYPE_2=Bean {1} with a normal scope cannot have as legal an array type {0} that cannot be proxied by the container [JSR-299 �5.4.1]
-UNPROXYABLE_BEAN_PRIMITIVE_TYPE_2=Bean {1} with a normal scope cannot have as legal a primitive type {0} that cannot be proxied by the container [JSR-299 �5.4.1]
-UNPROXYABLE_BEAN_TYPE_WITH_NPC_2=Bean {1} with a normal scope cannot have as legal a type {0} (with a non-private constructor with no parameters) that cannot be proxied by the container [JSR-299 �5.4.1]
-UNPROXYABLE_BEAN_FINAL_TYPE_2=Bean {1} with a normal scope cannot have as legal a type {0} (final class) that cannot be proxied by the container [JSR-299 �5.4.1]
-UNPROXYABLE_BEAN_TYPE_WITH_FM_2=Bean {1} with a normal scope cannot have as legal a type {0} (with final methods) that cannot be proxied by the container [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_ARRAY_TYPE_2=Array type {0} is not a legal type of normal scoped bean {1} because it cannot be proxied by the container [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_PRIMITIVE_TYPE_2=Primitive type {0} is not a legal type of normal scoped bean {1} because it cannot be proxied by the container [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_TYPE_WITH_NPC_2=Type {0} (with a non-private constructor with no parameters) is not a legal type of normal scoped bean {1} because it cannot be proxied by the container [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_FINAL_TYPE_2=Type {0} (final class) is not a legal type of normal scoped bean {1} because it cannot be proxied by the container [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_TYPE_WITH_FM_2=Type {0} (with final methods) is not a legal type of normal scoped bean {1} because it cannot be proxied by the container [JSR-299 �5.4.1]
DECORATOR_RESOLVES_TO_FINAL_CLASS=Decorator must not be bound to a managed bean implemented by a class {0} which is declared final [JSR-299 �8.3]
DECORATOR_RESOLVES_TO_FINAL_METHOD=Decorator matches a managed bean {0} with a non-static, non-private, final method {1}, and the decorator also implements that method [JSR-299 �8.3]
13 years, 3 months
JBoss Tools SVN: r43626 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-12 16:38:49 -0400 (Wed, 12 Sep 2012)
New Revision: 43626
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.qfxresult
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
Log:
CDI hyper links should work on modified files correctly https://issues.jboss.org/browse/JBIDE-12404
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2012-09-12 19:46:56 UTC (rev 43625)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2012-09-12 20:38:49 UTC (rev 43626)
@@ -49,6 +49,12 @@
}
public Set<? extends ICDIElement> getCDIElements() {
- return null;
+ Display display = Display.getCurrent();
+ if(display == null) {
+ display = Display.getDefault();
+ }
+ AssignableBeansDialog dialog = new AssignableBeansDialog(display.getActiveShell());
+ dialog.setInjectionPoint(injectionPoint);
+ return dialog.beans;
}
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.java 2012-09-12 20:38:49 UTC (rev 43626)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.openon;
+
+
+public class TestInjections {
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/TestInjections.qfxresult 2012-09-12 20:38:49 UTC (rev 43626)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.jbt.openon;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+public class TestInjections {
+ @Inject private Logger logger;
+
+ @Produces Logger ll;
+
+ public Logger getLogger()
+ {
+ return logger;
+ }
+
+ public void doSomething()
+ {
+ logger.log("Test message");
+ }
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2012-09-12 19:46:56 UTC (rev 43625)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2012-09-12 20:38:49 UTC (rev 43626)
@@ -90,6 +90,45 @@
CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector());
}
+
+ public void testInjectedPointHyperlinkDetectorForAsYouType() throws Exception {
+ String[] paths = new String[]{
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/BasicLogger.java",
+ "/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/TestInjections.java"
+ };
+ Collection<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/BasicLogger.java", true);
+ IBean bean=null;
+ for(IBean b : beans){
+ bean = b;
+ }
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+ regionList.add(new TestRegion(/*115, 6*/"Inject", new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths)
+ })); // Inject
+ regionList.add(new TestRegion(/*133, 6*/"Logger", new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths)
+ })); // Logger
+ regionList.add(new TestRegion(/*140, 6*/"logger", new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths)
+ })); // logger
+ regionList.add(new TestRegion(/*196, 6*/"logger", new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths)
+ })); // logger
+ regionList.add(new TestRegion(/*250, 6*/"logger", new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE, paths)
+ })); // logger
+
+ CDIHyperlinkTestUtil.checkRegionsForAsYouType(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/TestInjections.java",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/TestInjections.qfxresult",
+ regionList,
+ new InjectedPointHyperlinkDetector());
+ }
public void testInjectedPointHyperlinkDetectorWithComment() throws Exception {
Collection<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/BasicLogger.java", true);
@@ -99,19 +138,24 @@
}
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
regionList.add(new TestRegion("Inject", new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean)
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE)
})); // Inject
regionList.add(new TestRegion("Logger", new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean)
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE)
})); // Logger
regionList.add(new TestRegion("logger", new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean)
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE)
})); // logger
regionList.add(new TestRegion("logger", new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean)
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE)
})); // logger
regionList.add(new TestRegion("logger", new TestHyperlink[]{
- new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean)
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean),
+ new TestHyperlink(AssignableBeansHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE)
})); // logger
CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector());
13 years, 3 months
JBoss Tools SVN: r43625 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-12 15:46:56 -0400 (Wed, 12 Sep 2012)
New Revision: 43625
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
Log:
CDI hyper links should work on modified files correctly https://issues.jboss.org/browse/JBIDE-12404
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2012-09-12 13:02:08 UTC (rev 43624)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2012-09-12 19:46:56 UTC (rev 43625)
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import org.apache.tools.ant.util.FileUtils;
import org.eclipse.core.resources.IContainer;
@@ -246,32 +247,32 @@
* @param beans
*/
public static List<IBean> sortBeans(Collection<IBean> beans) {
- Set<IBean> alternativeBeans = new HashSet<IBean>();
- Set<IBean> selectedAlternativeBeans = new HashSet<IBean>();
- Set<IBean> nonAlternativeBeans = new HashSet<IBean>();
- Set<IBean> decorators = new HashSet<IBean>();
- Set<IBean> interceptors = new HashSet<IBean>();
+ TreeMap<String, IBean> alternativeBeans = new TreeMap<String, IBean>();
+ TreeMap<String, IBean> selectedAlternativeBeans = new TreeMap<String, IBean>();
+ TreeMap<String, IBean> nonAlternativeBeans = new TreeMap<String, IBean>();
+ TreeMap<String, IBean> decorators = new TreeMap<String, IBean>();
+ TreeMap<String, IBean> interceptors = new TreeMap<String, IBean>();
for (IBean bean : beans) {
if (bean.isSelectedAlternative()) {
- selectedAlternativeBeans.add(bean);
+ selectedAlternativeBeans.put(bean.getElementName(), bean);
} else if (bean.isAlternative()) {
- alternativeBeans.add(bean);
+ alternativeBeans.put(bean.getElementName(), bean);
} else if (bean instanceof IDecorator) {
- decorators.add(bean);
+ decorators.put(bean.getElementName(), bean);
} else if (bean instanceof IInterceptor) {
- interceptors.add(bean);
+ interceptors.put(bean.getElementName(), bean);
} else {
- nonAlternativeBeans.add(bean);
+ nonAlternativeBeans.put(bean.getElementName(), bean);
}
}
ArrayList<IBean> sortedBeans = new ArrayList<IBean>();
- sortedBeans.addAll(selectedAlternativeBeans);
- sortedBeans.addAll(nonAlternativeBeans);
- sortedBeans.addAll(alternativeBeans);
- sortedBeans.addAll(decorators);
- sortedBeans.addAll(interceptors);
+ sortedBeans.addAll(selectedAlternativeBeans.values());
+ sortedBeans.addAll(nonAlternativeBeans.values());
+ sortedBeans.addAll(alternativeBeans.values());
+ sortedBeans.addAll(decorators.values());
+ sortedBeans.addAll(interceptors.values());
return sortedBeans;
}
13 years, 3 months
JBoss Tools SVN: r43624 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-12 09:02:08 -0400 (Wed, 12 Sep 2012)
New Revision: 43624
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
Log:
debugging why shortcuts do not work on Mac with JDK 1.7
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-12 12:57:51 UTC (rev 43623)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-12 13:02:08 UTC (rev 43624)
@@ -143,12 +143,12 @@
* @return
*/
public SWTBot preferenceOpen(IPreference pref) {
- log.debug("java.awt.headless: " + System.getProperty("java.awt.headless"));
- log.debug("javaplugin.version: " + System.getProperty("javaplugin.version"));
- log.debug("os.name: " + System.getProperty("os.name"));
- log.debug("DISPLAY: " + System.getenv("DISPLAY"));
+ System.out.println("java.awt.headless: " + System.getProperty("java.awt.headless"));
+ System.out.println("javaplugin.version: " + System.getProperty("javaplugin.version"));
+ System.out.println("os.name: " + System.getProperty("os.name"));
+ System.out.println("DISPLAY: " + System.getenv("DISPLAY"));
String osName = System.getProperty("os.name");
- log.debug("Result: " + Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) &&
+ System.out.println("Result: " + Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) &&
(System.getenv("DISPLAY") == null)));
if (SWTJBTExt.isRunningOnMacOs()){
13 years, 3 months
JBoss Tools SVN: r43623 - trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-12 08:57:51 -0400 (Wed, 12 Sep 2012)
New Revision: 43623
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
Log:
JBIDE-12441
Wrong cursor position after using code assist for EL with '[]'
JUnit Test Case is fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-09-12 12:51:53 UTC (rev 43622)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-09-12 12:57:51 UTC (rev 43623)
@@ -12,5 +12,5 @@
<h:outputText value="#{mybean2['10']}"/>
<h:outputText value="#{mybean2[]}"/>
<h:outputText value="#{mybean2['100'].ch}"/>
-<h:outputText value="#{myBean.myMap['100'].size"/>
+<h:outputText value="#{myBean.myMap['100'].siz}"/>
</html>
\ No newline at end of file
13 years, 3 months
JBoss Tools SVN: r43622 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-12 08:51:53 -0400 (Wed, 12 Sep 2012)
New Revision: 43622
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
Log:
debugging why shortcuts do not work on Mac with JDK 1.7
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-12 12:22:44 UTC (rev 43621)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-12 12:51:53 UTC (rev 43622)
@@ -143,6 +143,14 @@
* @return
*/
public SWTBot preferenceOpen(IPreference pref) {
+ log.debug("java.awt.headless: " + System.getProperty("java.awt.headless"));
+ log.debug("javaplugin.version: " + System.getProperty("javaplugin.version"));
+ log.debug("os.name: " + System.getProperty("os.name"));
+ log.debug("DISPLAY: " + System.getenv("DISPLAY"));
+ String osName = System.getProperty("os.name");
+ log.debug("Result: " + Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) &&
+ (System.getenv("DISPLAY") == null)));
+
if (SWTJBTExt.isRunningOnMacOs()){
bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
}
13 years, 3 months
JBoss Tools SVN: r43621 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-12 08:22:44 -0400 (Wed, 12 Sep 2012)
New Revision: 43621
Added:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
Log:
JBIDE-12596 : workaround baaad typo in descriptor name
Added: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... 2012-09-12 12:22:44 UTC (rev 43621)
@@ -0,0 +1,375 @@
+<projects>
+ <!--
+ Beware : the project name MUST NOT be changed. It's referenced in JBoss Central
+ -->
+
+ <!-- Java EE Web Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-webapp</name>
+ <included-projects>jboss-javaee6-webapp</included-projects>
+ <shortDescription>Java EE Web Project</shortDescription>
+ <priority>1</priority>
+ <description>
+This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
+This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-archetype:7.1.1.CR1 Maven archetype.
+ </description>
+ <size>8192</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1.CR1</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.examples</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.examples</javaPackage>
+ <properties>
+ <property name="name" value="Java EE 6 webapp project"/>
+ </properties>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/newwebprj_wiz.gif" />
+ </project>
+ <!-- Java EE Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>multi-javaee6-archetype</name>
+ <included-projects>multi-javaee6-archetype</included-projects>
+ <shortDescription>Java EE Project</shortDescription>
+ <priority>2</priority>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR.
+
+This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-ear-archetype:7.1.1.CR1 Maven archetype.
+ </description>
+ <size>13806</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-ear-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1.CR1</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example</javaPackage>
+ </mavenArchetype>
+ <!--targetProjectFacet facet="jst.ear" version="6.0"/-->
+ <tags>wizard</tags>
+ <icon path="icons/ear-wiz-icon.gif" />
+ </project>
+ <!-- HTML5 project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-poh5-archetype</name>
+ <included-projects>jboss-javaee6-poh5</included-projects>
+ <shortDescription>HTML5 Project</shortDescription>
+ <priority>3</priority>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
+
+This project is based on the org.jboss.aerogear.archetypes:jboss-html5-mobile-archetype:1.0.0.M5 Maven archetype.
+ </description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.aerogear.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-html5-mobile-archetype</archetypeArtifactId>
+ <archetypeVersion>1.0.0.M5</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>poh5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.html5</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/html5.png" />
+ </project>
+ <!-- Richfaces project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>richfaces-archetype-simpleapp</name>
+ <included-projects>richfaces-archetype-simpleapp</included-projects>
+ <shortDescription>RichFaces Project</shortDescription>
+ <priority>4</priority>
+ <description>An archetype that generates a simple Richfaces application
+
+This project is based on the org.richfaces.archetypes:richfaces-archetype-kitchensink:4.2.2.Final-2 Maven archetype.</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.richfaces.archetypes</archetypeGroupId>
+ <archetypeArtifactId>richfaces-archetype-kitchensink</archetypeArtifactId>
+ <archetypeVersion>4.2.2.Final-2</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ <archetypeRepository>https://repository.jboss.org/nexus/content/repositories/jboss_releases_st...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>richfaces-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.richfaces</javaPackage>
+ <properties>
+ <property name="richfaces-enterprise-version" value="4.2.2.Final-redhat-1" /> <!-- RF is broken in WFK / WFK repo not available-->
+ <property name="richfaces-version" value="4.2.2.Final" />
+ <property name="javaee6-with-tools-enterprise-version" value="1.0.0.M12-redhat-1" />
+ </properties>
+ </mavenArchetype>
+ <essentialEnterpriseDependencies>org.jboss.bom:jboss-javaee-6.0-with-tools:pom:1.0.0.M12-redhat-1::,org.richfaces:richfaces-bom:pom:4.2.2.Final-redhat-1::,</essentialEnterpriseDependencies>
+ <!--
+ <essentialEnterpriseDependencies>org.richfaces:richfaces-bom:pom:4.2.1.Final-redhat-1::,</essentialEnterpriseDependencies>
+ -->
+ <tags>wizard</tags>
+ <icon path="icons/rf_logo.png" />
+ </project>
+ <!-- Spring MVC -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>spring-mvc-webapp</name>
+ <included-projects>spring-mvc-webapp</included-projects>
+ <shortDescription>Spring MVC Project</shortDescription>
+ <priority>5</priority>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
+
+This project is based on the org.jboss.spring.archetypes:spring-mvc-webapp:1.0.0.CR6 Maven archetype.</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.hibernate.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
+ <archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
+ <archetypeVersion>1.0.0.CR6</archetypeVersion>
+ <!--
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>springmvc</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.springmvc</javaPackage>
+ <!--
+ <properties>
+ <property name="springBomVersion" value="2.0.0-redhat-5" />
+ </properties>
+ -->
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/spring_wiz.gif" />
+ </project>
+ <!-- GWT/Errai Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>gwt-webapp</name>
+ <included-projects>gwt-kitchensink</included-projects>
+ <priority>6</priority>
+ <shortDescription>GWT Web Project</shortDescription>
+ <description>An archetype that generates a starter GWT application with Java EE 6 and Errai.
+Make sure you read the deployment instructions in README.md.
+
+This project is based on the org.jboss.errai.archetypes:jboss-errai-kitchensink-archetype:2.0.0.Final Maven archetype.</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.gwt.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">com.google.gwt.eclipse.core</property>
+ <property name="versions">[2.4,)</property>
+ <property name="description">This project example requires Google Plugin for Eclipse</property>
+ <property name="connectorIds">com.google.gwt.eclipse.sdkbundle.e37.feature,com.google.gdt.eclipse.suite.e37.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp, JBoss Maven GWT Integration and Google Plugin for Eclipse features.</importTypeDescription>
+ <!-- Activating the profile causes a build error :
+ 'dependencies.dependency.version' for org.jboss.as:jboss-as-arquillian-container-remote:jar is missing.
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ -->
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.errai.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-errai-kitchensink-archetype</archetypeArtifactId>
+ <archetypeVersion>2.0.0.Final</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>https://repository.jboss.org/nexus/content/groups/public/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>gwt-kitchensink</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.gwt.kitchensink</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/new-gdt-project.png" />
+ </project>
+
+</projects>
13 years, 3 months
JBoss Tools SVN: r43620 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: integration and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-12 05:31:58 -0400 (Wed, 12 Sep 2012)
New Revision: 43620
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
Log:
fixing test against 4.0.0 Alpha1
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -11,7 +11,6 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ws.ui.bot.test.annotation.AnnotationPropertiesTest;
import org.jboss.tools.ws.ui.bot.test.integration.JAXRSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.integration.SOAPWSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.rest.DefaultValueAnnotationSupportTest;
@@ -48,7 +47,7 @@
SimpleRESTWebServiceTest.class,
// AnnotationPropertiesTest.class, // not implemented yet
RESTfulExplorerTest.class,
- PathAnnotationSupportTest.class,
+ PathAnnotationSupportTest.class,
QueryAnnotationSupportTest.class,
MatrixAnnotationSupportTest.class,
DefaultValueAnnotationSupportTest.class,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/JAXRSToolingIntegrationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -17,8 +17,6 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.RESTFullExplorer;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Type;
-import org.junit.After;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -34,19 +32,26 @@
private String serviceUrl = localhostUrl + projectName + "/rest/";
private WsTesterView wsTesterView = new WsTesterView();
- @BeforeClass
- public static void prepareWS() {
- importRestWSProject(projectName);
- servers.addProjectToServer(
- projectName, configuredState.getServer().name);
+ @Override
+ public void setup() {
+ if (!projectExists(getWsProjectName())) {
+ importRestWSProject(projectName);
+ servers.addProjectToServer(projectName,
+ configuredState.getServer().name);
+ }
}
- @After
- public void minimizeTester() {
+ @Override
+ public void cleanup() {
/* minimize web service tester */
- wsTesterView.minimize();
+ wsTesterView.minimize();
}
+ @Override
+ protected String getWsProjectName() {
+ return projectName;
+ }
+
@Test
public void testGetMethod() {
/* get JAX-RS REST Web Services */
@@ -57,7 +62,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.GET);
@@ -75,7 +79,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "post", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
@@ -93,7 +96,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "put", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.PUT);
@@ -111,7 +113,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "delete", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.DELETE);
@@ -129,7 +130,6 @@
assertWebServiceTesterIsActive();
/* test generated url and response after invoking */
- wsTesterView.show();
assertEquals(serviceUrl + "get", wsTesterView.getServiceURL());
invokeMethodInWSTester(wsTesterView, Request_Type.POST);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/integration/SOAPWSToolingIntegrationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -17,7 +17,6 @@
import org.jboss.tools.ws.ui.bot.test.WSTestBase;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView;
import org.jboss.tools.ws.ui.bot.test.widgets.WsTesterView.Request_Type;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -43,15 +42,12 @@
"</soap:Body>" + LINE_SEPARATOR +
"</soap:Envelope>";
- @BeforeClass
- public static void prepareWS() {
- importWSTestProject(projectName);
- deploymentHelper.runProject(projectName);
- }
-
@Override
public void setup() {
-
+ if (!projectExists(getWsProjectName())) {
+ importWSTestProject(projectName);
+ deploymentHelper.runProject(projectName);
+ }
}
@Override
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/DefaultValueAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -21,8 +21,8 @@
private String queryParamType = "java.lang.String";
@Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
+ public void setup() {
+
}
@Test
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/MatrixAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,17 +30,9 @@
return projectName;
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testMatrixParamSupport() {
- /* prepare project */
- importRestWSProject("matrix1");
-
/* get RESTful services from JAX-RS REST explorer for the project */
SWTBotTreeItem[] restServices = restfulServicesForProject("matrix1");
@@ -56,7 +48,6 @@
public void testEditingMatrixParam() {
/* prepare project */
- importRestWSProject("matrix1");
resourceHelper.replaceInEditor(editorForClass("matrix1", "src",
"org.rest.test", "RestService.java").toTextEditor(),
matrixParam1, matrixParamNew, true);
@@ -76,7 +67,6 @@
public void testEditingTypeOfMatrixParam() {
/* prepare project */
- importRestWSProject("matrix1");
resourceHelper.replaceInEditor(editorForClass("matrix1", "src",
"org.rest.test", "RestService.java").toTextEditor(),
matrixParamType1, matrixParamTypeNew, true);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/PathAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,6 +30,11 @@
projectExplorer.deleteAllProjects();
}
+ @Override
+ public void setup() {
+
+ }
+
@Test
public void testAddingSimpleRESTMethods() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/QueryAnnotationSupportTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -28,8 +28,8 @@
private String queryTypeNew = "java.lang.Long";
@Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
+ public void setup() {
+
}
@Test
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulHelper.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -15,11 +15,11 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
@@ -43,14 +43,11 @@
private static final SWTOpenExt open = new SWTOpenExt(bot);
private static final ResourceHelper resourceHelper = new ResourceHelper();
- private static final String PATH_PARAM_VALID_ERROR = "@PathParam value";
- private static final String VALIDATION_PREFERENCE = "Validation";
- private static final String ENABLE_ALL = "Enable All";
- private static final String JAX_RS_VALIDATOR = "JAX-RS Metamodel Validator";
+ private static final String PATH_PARAM_VALID_ERROR = "@PathParam value";
private static final String VALIDATION_SETTINGS_CHANGED = "Validation Settings Changed";
private enum ConfigureOption {
- ADD, REMOVE;
+ ENABLE, DISABLE;
}
private SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName, String description) {
@@ -67,44 +64,26 @@
}
public void enableRESTValidation() {
- modifyRESTValidation(ConfigureOption.ADD);
+ modifyRESTValidation(ConfigureOption.ENABLE);
}
public void disableRESTValidation() {
- modifyRESTValidation(ConfigureOption.REMOVE);
+ modifyRESTValidation(ConfigureOption.DISABLE);
}
- /**
- * DO IT BETTER!!!!!!!!!!!!!!!!!!
- */
public void modifyRESTValidation(ConfigureOption option) {
- SWTBot validationBot = openPreferencePage(VALIDATION_PREFERENCE,
- new ArrayList<String>());
+ SWTBot validationBot = openPreferencePage("JAX-RS Validator",
+ Arrays.asList("JBoss Tools", "JAX-RS"));
- validationBot.button(ENABLE_ALL).click();
-
- if (option == ConfigureOption.REMOVE) {
-
- SWTBotTable validatorTable = validationBot.table();
- int restValidationRow = -1;
- for (int row = 0; row < validatorTable.rowCount(); row++) {
- if (validatorTable.getTableItem(row).getText()
- .equals(JAX_RS_VALIDATOR)) {
- restValidationRow = row;
- break;
- }
- }
-
- assertTrue(restValidationRow >= 0);
-
- validatorTable.click(restValidationRow, 1);
- validatorTable.click(restValidationRow, 2);
+ if (option == ConfigureOption.ENABLE) {
+ validationBot.checkBox(0).select();
+ } else {
+ validationBot.checkBox(0).deselect();
}
-
- validationBot.button("OK").click();
+ validationBot.button(IDELabel.Button.OK).click();
if (bot.activeShell().getText().equals(VALIDATION_SETTINGS_CHANGED)) {
- bot.activeShell().bot().button("Yes").click();
+ bot.activeShell().bot().button(IDELabel.Button.YES).click();
}
bot.sleep(Timing.time3S());
@@ -113,11 +92,11 @@
}
public void addRestSupport(String wsProjectName) {
- configureRestSupport(wsProjectName, ConfigureOption.ADD);
+ configureRestSupport(wsProjectName, ConfigureOption.ENABLE);
}
public void removeRestSupport(String wsProjectName) {
- configureRestSupport(wsProjectName, ConfigureOption.REMOVE);
+ configureRestSupport(wsProjectName, ConfigureOption.DISABLE);
}
public boolean isRestSupportEnabled(String wsProjectName) {
@@ -174,7 +153,7 @@
SWTBotMenu menu = new SWTBotMenu(
ContextMenuHelper.getContextMenu(
tree, IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false));
- menu.menu(option == ConfigureOption.ADD ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD
+ menu.menu(option == ConfigureOption.ENABLE ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD
.getLabel() : RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_REMOVE
.getLabel()).click();
bot.sleep(Timing.time2S());
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -50,12 +50,14 @@
@Override
public void setup() {
-
+ if (!projectExists(getWsProjectName())) {
+ importRestWSProject(getWsProjectName());
+ }
}
-
+
@Override
- public void cleanup() {
-
+ public void cleanup() {
+ projectExplorer.deleteAllProjects();
}
protected static void importRestWSProject(String projectName) {
@@ -65,7 +67,7 @@
projectExplorer.selectProject(projectName);
eclipse.cleanAllProjects();
- bot.sleep(Timing.time3S());
+ util.waitForNonIgnoredJobs();
// workaround for EAP 5.1
if (configuredState.getServer().type.equals("EAP")
@@ -163,7 +165,7 @@
protected void runRestServiceOnConfiguredServer(SWTBotTreeItem webService) {
RunOnServerDialog dialog = restfulWizard.runOnServer(webService);
dialog.chooseExistingServer().selectServer(configuredState.getServer().name).finish();
- bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER));
+ bot.waitUntil(new ViewIsActive(IDELabel.View.WEB_SERVICE_TESTER), TIME_20S);
}
protected SWTBotTreeItem[] restfulServicesForProject(String projectName) {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -39,16 +39,10 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testWithEmptyPrefix() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -65,7 +59,6 @@
public void testWithValidPrefixAtTheEnd() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -83,7 +76,6 @@
public void testWithValidPrefixInTheBeginning() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -100,7 +92,6 @@
public void testWithInvalidPrefixAtTheEnd() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -118,7 +109,6 @@
public void testWithInvalidPrefixInTheBeginning() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -135,7 +125,6 @@
public void testWithAllInvalidParamSelection() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -25,6 +25,11 @@
return "RestExplorerTest";
}
+ @Override
+ public void setup() {
+
+ }
+
@Test
public void testJaxRsExplorerSupport() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathAnnotationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -12,7 +12,6 @@
package org.jboss.tools.ws.ui.bot.test.rest.validation;
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,11 +28,6 @@
}
- @After
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testMultipleApplicationClasses() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-09-12 08:58:34 UTC (rev 43619)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-09-12 09:31:58 UTC (rev 43620)
@@ -30,16 +30,10 @@
return "restEmpty";
}
- @Override
- public void cleanup() {
- projectExplorer.deleteAllProjects();
- }
-
@Test
public void testCorrectValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -55,7 +49,6 @@
public void testBadValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -69,7 +62,6 @@
public void testCorrectToBadValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -86,7 +78,6 @@
public void testBadToCorrectValueValidation() {
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
@@ -106,7 +97,6 @@
restfulHelper.disableRESTValidation();
/* prepare project */
- importRestWSProject(getWsProjectName());
prepareRestfulResource(editorForClass(getWsProjectName(), "src",
"org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
"org.rest.test", "RestService",
13 years, 3 months
JBoss Tools SVN: r43618 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-09-12 04:54:43 -0400 (Wed, 12 Sep 2012)
New Revision: 43618
Added:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/swtbot.properties
Removed:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
Log:
org.jboss.tools.bpel.ui.bot.test.properties renamed to swtbot.properties
Deleted: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-09-12 08:36:15 UTC (rev 43617)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-09-12 08:54:43 UTC (rev 43618)
@@ -1,7 +0,0 @@
-# SWTBotTest properties
-# all properties are optional, all defined paths should exist
-# <java version>,<jre/jdk home>
-#JAVA=
-#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
-# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
-SERVER=AS,5.1,default,target/requirements/jboss-5.1.0.GA
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-09-12 08:36:15 UTC (rev 43617)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-09-12 08:54:43 UTC (rev 43618)
@@ -15,7 +15,7 @@
<properties>
<coverage.filter>org.jboss.tools.bpel.runtimes*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.bpel.runtimes</emma.instrument.bundles>
- <systemProperties>-Dswtbot.test.properties.file=./org.jboss.tools.bpel.ui.bot.test.properties</systemProperties>
+ <systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
<surefire.timeout>10800</surefire.timeout>
</properties>
Copied: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/swtbot.properties (from rev 43617, trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties)
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/swtbot.properties (rev 0)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/swtbot.properties 2012-09-12 08:54:43 UTC (rev 43618)
@@ -0,0 +1,7 @@
+# SWTBotTest properties
+# all properties are optional, all defined paths should exist
+# <java version>,<jre/jdk home>
+#JAVA=
+#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
+# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
+SERVER=AS,5.1,default,target/requirements/jboss-5.1.0.GA
13 years, 3 months