JBoss Tools SVN: r34371 - trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-08-29 10:32:54 -0400 (Mon, 29 Aug 2011)
New Revision: 34371
Added:
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/AUTHORS.txt
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/COPYRIGHT.txt
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.properties
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/license.html
Modified:
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml
Log:
JBIDE-9602 Add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/AUTHORS.txt
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/AUTHORS.txt (rev 0)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/AUTHORS.txt 2011-08-29 14:32:54 UTC (rev 34371)
@@ -0,0 +1 @@
+Dan Florian (dflorian(a)redhat.com)
\ No newline at end of file
Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/AUTHORS.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/COPYRIGHT.txt
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/COPYRIGHT.txt (rev 0)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/COPYRIGHT.txt 2011-08-29 14:32:54 UTC (rev 34371)
@@ -0,0 +1,9 @@
+ModeShape Tools is copyright 2011 Red Hat, Inc.
+Some portions may be licensed to Red Hat, Inc. under one or more
+contributor license agreements. See the AUTHORS.txt file in the
+distribution for a full listing of individual contributors.
+
+ModeShape Tools is free software, and is made available by Red Hat, Inc.
+under the terms of the Eclipse Public License v1.0 which accompanies
+this distribution and is available at
+http://www.eclipse.org/legal/epl-v10.html.
\ No newline at end of file
Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/COPYRIGHT.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties 2011-08-29 14:15:11 UTC (rev 34370)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties 2011-08-29 14:32:54 UTC (rev 34371)
@@ -1 +1,10 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ AUTHORS.txt,\
+ COPYRIGHT.txt,\
+ license.html,\
+ feature.properties
+src.includes = AUTHORS.txt,\
+ COPYRIGHT.txt,\
+ license.html,\
+ feature.xml,\
+ feature.properties
Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.properties
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.properties (rev 0)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.properties 2011-08-29 14:32:54 UTC (rev 34371)
@@ -0,0 +1,36 @@
+#
+# See the COPYRIGHT.txt file distributed with this work for information
+# regarding copyright ownership.
+#
+# This software is made available by Red Hat, Inc. under the terms of the
+# Eclipse Public License v1.0 which accompanies this distribution and is
+# available at http://www.eclipse.org/legal/epl-v10.html.
+#
+# See the AUTHORS.txt file in the distribution for a full listing of
+# individual contributors.
+#
+
+featureName = JBoss Tools - Tests - ModeShape
+featureProvider = JBoss by Red Hat
+
+descriptionUrl=http://www.jboss.org/tools
+description = Provides a resource publishing and unpublishing capability to ModeShape repositories.
+
+copyright = ModeShape Tools is copyright 2011 Red Hat, Inc.\n\
+Some portions may be licensed to Red Hat, Inc. under one or more\n\
+contributor license agreements. See the AUTHORS.txt file in the\n\
+distribution for a full listing of individual contributors.\n\
+\n\
+ModeShape Tools is free software, and is made available by Red Hat, Inc.\n\
+under the terms of the Eclipse Public License v1.0 which accompanies\n\
+this distribution and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html.
+
+licenseUrl = license.html
+license = Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2011-08-29 14:15:11 UTC (rev 34370)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2011-08-29 14:32:54 UTC (rev 34371)
@@ -1,16 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.modeshape.rest.test.feature" label="JBoss Tools - Tests - ModeShape" version="1.1.0.qualifier" provider-name="JBoss by Red Hat">
+<feature
+ id="org.jboss.tools.modeshape.rest.test.feature"
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%featureProvider">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+<!--
+ - See the COPYRIGHT.txt file distributed with this work for information
+ - regarding copyright ownership.
+ -
+ - This software is made available by Red Hat, Inc. under the terms of the
+ - Eclipse Public License v1.0 which accompanies this distribution and is
+ - available at http://www.eclipse.org/legal/epl-v10.html.
+ -
+ - See the AUTHORS.txt file in the distribution for a full listing of
+ - individual contributors.
+ -->
+
+ <description url="%descriptionUrl">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseUrl">
+ %license
</license>
<plugin id="org.jboss.tools.modeshape.rest.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/license.html
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/license.html (rev 0)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/license.html 2011-08-29 14:32:54 UTC (rev 34371)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r34370 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-29 10:15:11 -0400 (Mon, 29 Aug 2011)
New Revision: 34370
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
Log:
Uncommented CDI tests
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-29 14:08:09 UTC (rev 34369)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-29 14:15:11 UTC (rev 34370)
@@ -41,10 +41,10 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- //CdiATWizardTest.class,
- //BeansEditorTest.class,
+ CdiATWizardTest.class,
+ BeansEditorTest.class,
CDIQuickFixTest.class,
- //CDIHyperlinksTest.class
+ CDIHyperlinksTest.class
})
public class CDIAllBotTests {
}
14 years, 3 months
JBoss Tools SVN: r34369 - in trunk: cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-29 10:08:09 -0400 (Mon, 29 Aug 2011)
New Revision: 34369
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean2.java.cdi
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/org.eclipse.wst.common.project.facet.core.xml
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
Log:
New CDI tests operating on Quick Fixes have been added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean2.java.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean2.java.cdi (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean2.java.cdi 2011-08-29 14:08:09 UTC (rev 34369)
@@ -0,0 +1,15 @@
+package org.cdi.test;
+
+import javax.ejb.Singleton;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Singleton
+public class MyBean {
+ @AroundInvoke
+ public Object alwaysReturnThis(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-29 09:56:21 UTC (rev 34368)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-29 14:08:09 UTC (rev 34369)
@@ -34,17 +34,17 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 4min
+ * Suite duration: aprox. 9min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- CdiATWizardTest.class,
- BeansEditorTest.class,
+ //CdiATWizardTest.class,
+ //BeansEditorTest.class,
CDIQuickFixTest.class,
- CDIHyperlinksTest.class
+ //CDIHyperlinksTest.class
})
public class CDIAllBotTests {
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-08-29 09:56:21 UTC (rev 34368)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-08-29 14:08:09 UTC (rev 34369)
@@ -7,7 +7,6 @@
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
@@ -17,7 +16,6 @@
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
import org.junit.After;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -38,7 +36,7 @@
private static final String PACKAGE_NAME = "org.cdi.test";
private static SWTBotTreeItem[] problemsTrees;
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
- private enum ANNOTATIONS {TARGET, RETENTION, NAMED, TYPED,DISPOSES, OBSERVES}
+ private enum ANNOTATIONS {TARGET, RETENTION, NAMED, TYPED, DISPOSES, OBSERVES, INTERCEPTOR, DECORATOR}
private enum CDICOMPONENT {STEREOSCOPE, QUALIFIER, SCOPE, BEAN}
private SWTBotEclipseEditor ed;
@@ -151,76 +149,89 @@
@Test
public void testStereoscopeQF() {
- prepareCdiComponent(CDICOMPONENT.STEREOSCOPE, "S1");
+ String className = "S1";
+ prepareCdiComponent(CDICOMPONENT.STEREOSCOPE, className);
// 1.QF - https://issues.jboss.org/browse/JBIDE-7630
- checkTargetAnnotation(CDICOMPONENT.STEREOSCOPE, ed);
+ checkTargetAnnotation(CDICOMPONENT.STEREOSCOPE, ed, className);
// 2.QF - https://issues.jboss.org/browse/JBIDE-7631
- checkRetentionAnnotation(CDICOMPONENT.STEREOSCOPE, ed);
+ checkRetentionAnnotation(CDICOMPONENT.STEREOSCOPE, ed, className);
// 3.QF - https://issues.jboss.org/browse/JBIDE-7634
- checkNamedAnnotation(CDICOMPONENT.STEREOSCOPE, ed);
+ checkNamedAnnotation(CDICOMPONENT.STEREOSCOPE, ed, className);
// 4.QF - https://issues.jboss.org/browse/JBIDE-7640
- checkTypedAnnotation(CDICOMPONENT.STEREOSCOPE, ed);
+ checkTypedAnnotation(CDICOMPONENT.STEREOSCOPE, ed, className);
}
@Test
public void testQualifiersQF() {
- prepareCdiComponent(CDICOMPONENT.QUALIFIER, "Q2");
+ String className = "Q2";
+ prepareCdiComponent(CDICOMPONENT.QUALIFIER, className);
// 1.QF - https://issues.jboss.org/browse/JBIDE-7631
- checkRetentionAnnotation(CDICOMPONENT.QUALIFIER, ed);
+ checkRetentionAnnotation(CDICOMPONENT.QUALIFIER, ed, className);
// 2.QF - https://issues.jboss.org/browse/JBIDE-7632
- checkTargetAnnotation(CDICOMPONENT.QUALIFIER, ed);
+ checkTargetAnnotation(CDICOMPONENT.QUALIFIER, ed, className);
}
@Test
public void testScopeQF() {
- prepareCdiComponent(CDICOMPONENT.SCOPE, "Scope1");
+ String className = "Scope1";
+ prepareCdiComponent(CDICOMPONENT.SCOPE, className);
// 1.QF - https://issues.jboss.org/browse/JBIDE-7631
- checkRetentionAnnotation(CDICOMPONENT.SCOPE, ed);
+ checkRetentionAnnotation(CDICOMPONENT.SCOPE, ed, className);
// 2.QF - https://issues.jboss.org/browse/JBIDE-7633
- checkTargetAnnotation(CDICOMPONENT.SCOPE, ed);
+ checkTargetAnnotation(CDICOMPONENT.SCOPE, ed, className);
}
@Test
public void testBeanQF() {
- prepareCdiComponent(CDICOMPONENT.BEAN, "MyBean");
+ String className = "MyBean";
+ prepareCdiComponent(CDICOMPONENT.BEAN, className);
// 1.QF - https://issues.jboss.org/browse/JBIDE-7664
- checkConstructor(CDICOMPONENT.BEAN, ed);
+ checkConstructor(CDICOMPONENT.BEAN, ed, className);
// 2.QF - https://issues.jboss.org/browse/JBIDE-7665
- checkProducerMethod(CDICOMPONENT.BEAN, ed);
+ checkProducerMethod(CDICOMPONENT.BEAN, ANNOTATIONS.DISPOSES, ed, className);
// 3.QF - https://issues.jboss.org/browse/JBIDE-7667
- checkObserverDisposerMethod(CDICOMPONENT.BEAN, ed);
+ checkObserverDisposerMethod(CDICOMPONENT.BEAN, ed, className);
// 4.QF - https://issues.jboss.org/browse/JBIDE-7668
+ checkObserWithDisposParamMethod(CDICOMPONENT.BEAN, ed, className);
// 5.QF - https://issues.jboss.org/browse/JBIDE-7680
+ checkSessionBean(CDICOMPONENT.BEAN, ed, className);
}
-
- @Ignore("not ready yet")
+
@Test
public void testInterDecorQF() {
- /*
- * 5 QF
- *
- * tu vytvorim jednotnu metodu, s jednym parametrom - ci iner alebo
- * decor jediny zmysel pri vytvarani komponenty, potom by to malo byt
- * rovnake
- */
+ String className = "InterDecor";
+ prepareCdiComponent(CDICOMPONENT.BEAN, className);
+
+ // 1.QF - https://issues.jboss.org/browse/JBIDE-7636
+ checkNamedAnnotation(CDICOMPONENT.BEAN, ed, className);
+
+ // 2.QF - https://issues.jboss.org/browse/JBIDE-7683
+ checkProducerMethod(CDICOMPONENT.BEAN, ANNOTATIONS.INTERCEPTOR, ed, className);
+
+ // 3.QF - https://issues.jboss.org/browse/JBIDE-7684
+
+
+ // 4.QF - https://issues.jboss.org/browse/JBIDE-7685
+
+
+ // 5.QF - https://issues.jboss.org/browse/JBIDE-7686
}
private void prepareCdiComponent(CDICOMPONENT component, String name) {
createComponent(component, name);
- checkStartupWarnings(bot);
switch (component) {
case QUALIFIER:
CDIUtil.replaceInEditor(ed, bot, "@Target({ TYPE, METHOD, PARAMETER, FIELD })",
@@ -231,8 +242,6 @@
CDIUtil.replaceInEditor(ed, bot, "@Target({ TYPE, METHOD, FIELD })",
"@Target({TYPE, METHOD, FIELD})");
break;
- default:
- break;
}
}
@@ -252,39 +261,45 @@
CDIUtil.bean(PACKAGE_NAME, name, true, false, false, false, null,
null, null, null).finish();
break;
- default:
- break;
}
util.waitForNonIgnoredJobs();
ed = bot.activeEditor().toTextEditor();
}
- private void prepareNamedAnnotation(SWTBotEclipseEditor ed, boolean add) {
- if (add) {
- ed.toTextEditor().insertText(ed.getLineCount()-4 , 0,
- "@Named(\"Name\")" + LINE_SEPARATOR);
- ed.toTextEditor().insertText(6 , 0, "import javax.inject.Named;" + LINE_SEPARATOR);
+ private void prepareNamedAnnotation(SWTBotEclipseEditor ed, CDICOMPONENT comp,
+ String className, boolean add) {
+ if (comp == CDICOMPONENT.BEAN) {
+ CDIUtil.insertInEditor(ed, bot, 1, 0, "import javax.inject.Named;" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 3, 0, "@Named" + LINE_SEPARATOR);
+ if (add) {
+ CDIUtil.insertInEditor(ed, bot, 2, 0, "import javax.decorator.Decorator;" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 4, 0, "@Decorator" + LINE_SEPARATOR);
+ } else {
+ CDIUtil.replaceInEditor(ed, bot, "import javax.decorator.Decorator;",
+ "import javax.interceptor.Interceptor;");
+ CDIUtil.replaceInEditor(ed, bot, "@Decorator", "@Interceptor");
+ }
} else {
- CDIUtil.replaceInEditor(ed, bot, "@Named", "");
- CDIUtil.replaceInEditor(ed, bot,
- "import javax.inject.Named;", "");
+ if (add) {
+ CDIUtil.insertInEditor(ed, bot, ed.getLineCount()-4, 0, "@Named(\"Name\")" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 6 , 0, "import javax.inject.Named;" + LINE_SEPARATOR);
+ } else {
+ CDIUtil.replaceInEditor(ed, bot, "@Named", "");
+ CDIUtil.replaceInEditor(ed, bot,
+ "import javax.inject.Named;", "");
+ }
}
- bot.sleep(Timing.time1S());
- ed.save();
}
private void prepareTypedAnnotation(SWTBotEclipseEditor ed) {
- ed.toTextEditor().insertText(ed.getLineCount()-4 , 0,
- "@Typed" + LINE_SEPARATOR);
- ed.toTextEditor().insertText(6 , 0, "import javax.enterprise.inject.Typed;" + LINE_SEPARATOR);
- bot.sleep(Timing.time1S());
- ed.save();
+ CDIUtil.insertInEditor(ed, bot, ed.getLineCount()-4 , 0, "@Typed" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 6 , 0, "import javax.enterprise.inject.Typed;" + LINE_SEPARATOR);
}
private void prepareInjectAnnot(SWTBotEclipseEditor ed) {
- ed.toTextEditor().insertText(3 , 1, "@Inject" + LINE_SEPARATOR);
- ed.toTextEditor().insertText(1 , 0, "import javax.inject.Inject;" + LINE_SEPARATOR);
- ed.toTextEditor().insertText(6 , 15, "String aaa");
+ CDIUtil.insertInEditor(ed, bot, 3 , 1, "@Inject" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 1 , 0, "import javax.inject.Inject;" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 6 , 15, "String aaa");
}
private void prepareProducer(SWTBotEclipseEditor ed) {
@@ -299,20 +314,35 @@
CDIUtil.replaceInEditor(ed, bot, "String produceString", "void method");
CDIUtil.replaceInEditor(ed, bot, "return \"test\";", "");
}
-
- private void checkStartupWarnings(SWTBotExt bot) {
- SWTBotTreeItem[] warningTrees = ProblemsView
- .getFilteredWarningsTreeItems(bot, null, "/" + PROJECT_NAME,
- "S1.java", "CDI Problem");
- assertTrue(warningTrees.length == 0);
+
+ private void prepareObserWithDisposParam(SWTBotEclipseEditor ed) {
+ prepareProducer(ed);
+ CDIUtil.replaceInEditor(ed, bot, "import javax.inject.Inject;", "import javax.enterprise.event.Observes;" +
+ LINE_SEPARATOR + "import javax.enterprise.inject.Disposes;" + LINE_SEPARATOR);
+ CDIUtil.replaceInEditor(ed, bot, "@Inject", "");
+ CDIUtil.replaceInEditor(ed, bot, "MyBean(String aaa)",
+ "void method(@Observes String param1, @Disposes String param2)");
}
- private void checkTargetAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
- checkTargetAnnotWithReplac(comp, ed, "@Target({TYPE, FIELD})");
- checkTargetAnnotWithReplac(comp, ed, "");
+ private void prepareCheckSessionBean(String replacement) {
+ if (replacement.equals("@Decorator")) {
+ CDIUtil.insertInEditor(ed, bot, 3, 0, "import javax.decorator.Decorator;" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 4, 0, "import javax.ejb.Stateless;" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 5, 0, "@Decorator" + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 6, 0, "@Stateless" + LINE_SEPARATOR);
+ } else {
+ CDIUtil.copyResourceToClass(ed, CDIQuickFixTest.class
+ .getResourceAsStream("/resources/cdi/MyBean2.java.cdi"), false);
+ }
}
+
+ private void checkTargetAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ checkTargetAnnotWithReplac(comp, ed, className, "@Target({TYPE, FIELD})");
+ checkTargetAnnotWithReplac(comp, ed, className, "");
+ }
- private void checkTargetAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
+ private void checkTargetAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
switch (comp) {
case STEREOSCOPE:
case SCOPE:
@@ -330,8 +360,6 @@
CDIUtil.replaceInEditor(ed, bot,
"import static java.lang.annotation.ElementType.PARAMETER;", "");
break;
- default:
- break;
}
CDIUtil.replaceInEditor(ed, bot,
"import static java.lang.annotation.ElementType.METHOD;", "");
@@ -343,15 +371,16 @@
CDIUtil.replaceInEditor(ed, bot,
"import static java.lang.annotation.ElementType.FIELD;", "");
}
- checkSimpleQuickFix(ANNOTATIONS.TARGET, comp, replacement, ed);
+ checkQuickFix(ANNOTATIONS.TARGET, comp, className, replacement, ed);
}
- private void checkRetentionAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
- checkRetenAnnotWithReplac(comp, ed, "@Retention(CLASS)");
- checkRetenAnnotWithReplac(comp, ed, "");
+ private void checkRetentionAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ checkRetenAnnotWithReplac(comp, ed, className, "@Retention(CLASS)");
+ checkRetenAnnotWithReplac(comp, ed, className, "");
}
- private void checkRetenAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
+ private void checkRetenAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
CDIUtil.replaceInEditor(ed, bot, "@Retention(RUNTIME)", replacement);
if (replacement.equals("@Retention(CLASS)")) {
CDIUtil.replaceInEditor(ed, bot,
@@ -364,144 +393,197 @@
CDIUtil.replaceInEditor(ed, bot,
"import java.lang.annotation.Retention;", "");
}
-
- checkSimpleQuickFix(ANNOTATIONS.RETENTION, comp, replacement, ed);
+ checkQuickFix(ANNOTATIONS.RETENTION, comp, className, replacement, ed);
}
- private void checkNamedAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
- prepareNamedAnnotation(ed, true);
- checkNamedAnnotWithReplac(comp, ed, "@Named");
- prepareNamedAnnotation(ed, false);
- prepareNamedAnnotation(ed, true);
- checkNamedAnnotWithReplac(comp, ed, "");
+ private void checkNamedAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed,String className) {
+ if (className.equals("InterDecor")) {
+ prepareNamedAnnotation(ed, comp, className, true);
+ checkNamedAnnotWithReplac(comp, ed, className, "@Named");
+ prepareNamedAnnotation(ed, comp, className, false);
+ checkNamedAnnotWithReplac(comp, ed, className, "@Named");
+ } else {
+ prepareNamedAnnotation(ed, comp, className, true);
+ checkNamedAnnotWithReplac(comp, ed, className, "@Named");
+ prepareNamedAnnotation(ed, comp, className, false);
+ prepareNamedAnnotation(ed, comp, className, true);
+ checkNamedAnnotWithReplac(comp, ed, className, "");
+ }
}
- private void checkNamedAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
- checkSimpleQuickFix(ANNOTATIONS.NAMED, comp, replacement, ed);
+ private void checkNamedAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
+ checkQuickFix(ANNOTATIONS.NAMED, comp, className, replacement, ed);
}
- private void checkTypedAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
+ private void checkTypedAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
prepareTypedAnnotation(ed);
- checkTypedAnnotWithReplac(comp, ed, "");
+ checkTypedAnnotWithReplac(comp, ed, className, "");
}
- private void checkTypedAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
- checkSimpleQuickFix(ANNOTATIONS.TYPED, comp, replacement, ed);
+ private void checkTypedAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
+ checkQuickFix(ANNOTATIONS.TYPED, comp, className, replacement, ed);
}
- private void checkConstructor(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
+ private void checkConstructor(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
prepareInjectAnnot(ed);
- checkConstructorWithReplac(comp, ed, "@Disposes");
- checkConstructorWithReplac(comp, ed, "@Observes");
+ checkConstructorWithReplac(comp, ed, className, "@Disposes");
+ checkConstructorWithReplac(comp, ed, className, "@Observes");
}
private void checkConstructorWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
- String replacement) {
- ed.toTextEditor().insertText(6 , 15, replacement + " ");
- dispObserCompletion(comp, ed, replacement);
+ String className, String replacement) {
+ CDIUtil.insertInEditor(ed, bot, 6, 15, replacement + " ");
+ dispObserCompletion(comp, ed, className, replacement);
}
- private void checkProducerMethod(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
- prepareProducer(ed);
- checkProducerWithReplac(comp, ed, "@Disposes");
- checkProducerWithReplac(comp, ed, "@Observes");
+ private void checkProducerMethod(CDICOMPONENT comp, ANNOTATIONS annonType, SWTBotEclipseEditor ed,
+ String className) {
+ if (className.equals("InterDecor")) {
+ prepareProducer(ed);
+ CDIUtil.replaceInEditor(ed, bot, "MyBean", "InterDecor");
+ checkProducerWithReplac(comp, annonType, ed, className, "@Interceptor");
+ prepareProducer(ed);
+ CDIUtil.replaceInEditor(ed, bot, "MyBean", "InterDecor");
+ checkProducerWithReplac(comp, annonType, ed, className, "@Decorator");
+ } else {
+ prepareProducer(ed);
+ checkProducerWithReplac(comp, annonType, ed, className, "@Disposes");
+ checkProducerWithReplac(comp, annonType, ed, className, "@Observes");
+ }
}
- private void checkProducerWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
- ed.toTextEditor().insertText(11, 29, replacement + " ");
- dispObserCompletion(comp, ed, replacement);
+ private void checkProducerWithReplac(CDICOMPONENT comp, ANNOTATIONS annonType,
+ SWTBotEclipseEditor ed, String className, String replacement) {
+ if (className.equals("InterDecor")) {
+ String annot = replacement.equals("@Interceptor")?"@Interceptor":"@Decorator";
+ String importAnnot = replacement.equals("@Interceptor")?
+ "import javax.interceptor.Interceptor;":
+ "import javax.decorator.Decorator;";
+ CDIUtil.insertInEditor(ed, bot, 3, 0, annot + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 1, 0, importAnnot + LINE_SEPARATOR);
+ checkQuickFix(replacement.equals("@Interceptor")?ANNOTATIONS.INTERCEPTOR:
+ ANNOTATIONS.DECORATOR, comp, className, replacement, ed);
+ } else {
+ CDIUtil.insertInEditor(ed, bot, 11, 29, replacement + " ");
+ dispObserCompletion(comp, ed, className, replacement);
+ }
}
- private void checkObserverDisposerMethod(CDICOMPONENT comp, SWTBotEclipseEditor ed) {
+ private void checkObserverDisposerMethod(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
prepareObserverDisposer(ed);
- checkObserverDisposerWithReplac(comp, ed, "@Disposes");
- checkObserverDisposerWithReplac(comp, ed, "@Observes");
+ checkObserverDisposerWithReplac(comp, ed, className, "@Disposes");
+ checkObserverDisposerWithReplac(comp, ed, className, "@Observes");
}
private void checkObserverDisposerWithReplac(CDICOMPONENT comp,
- SWTBotEclipseEditor ed, String replacement) {
- ed.toTextEditor().insertText(10, 20, replacement + " ");
- dispObserCompletion(comp, ed, replacement);
+ SWTBotEclipseEditor ed, String className, String replacement) {
+ CDIUtil.insertInEditor(ed, bot, 10, 20, replacement + " ");
+ dispObserCompletion(comp, ed, className, replacement);
}
- private void dispObserCompletion(CDICOMPONENT comp, SWTBotEclipseEditor ed, String replacement) {
- ed.toTextEditor().insertText(2 , 0, "import javax.enterprise." +
+ private void checkObserWithDisposParamMethod(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ prepareObserWithDisposParam(ed);
+ checkObserWithDisposParamWithReplac(comp, ed, className, "@Disposes");
+ checkObserWithDisposParamWithReplac(comp, ed, className, "@Observes");
+ }
+
+ private void checkObserWithDisposParamWithReplac(CDICOMPONENT comp,
+ SWTBotEclipseEditor ed, String className, String replacement) {
+ if (replacement.equals("@Observes")) {
+ CDIUtil.insertInEditor(ed, bot, 3, 0, "import javax.enterprise.inject.Disposes;");
+ CDIUtil.insertInEditor(ed, bot, 6, 46, "@Disposes ");
+ }
+ checkQuickFix(replacement.equals("@Disposes")?ANNOTATIONS.DISPOSES:ANNOTATIONS.OBSERVES,
+ CDICOMPONENT.BEAN, className, "", ed);
+ }
+
+ private void checkSessionBean(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ checkSessionBeanWithReplac(comp, ed, className, "@Decorator");
+ checkSessionBeanWithReplac(comp, ed, className, "@Interceptor");
+ }
+
+ private void checkSessionBeanWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
+ prepareCheckSessionBean(replacement);
+ checkQuickFix(replacement.equals("@Decorator")?ANNOTATIONS.DECORATOR:ANNOTATIONS.INTERCEPTOR,
+ comp, className, replacement, ed);
+ }
+
+ private void dispObserCompletion(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className, String replacement) {
+ CDIUtil.insertInEditor(ed, bot, 2 , 0, "import javax.enterprise." +
(replacement.contains("Disposes")?"inject.":"event.") +
(replacement.substring(1) + ";" + LINE_SEPARATOR));
- bot.sleep(Timing.time1S());
- ed.save();
ANNOTATIONS annonType = (replacement.equals("@Disposes")?ANNOTATIONS.DISPOSES:ANNOTATIONS.OBSERVES);
- checkSimpleQuickFix(annonType, comp, replacement, ed);
+ checkQuickFix(annonType, comp, className, replacement, ed);
}
- private void checkSimpleQuickFix(ANNOTATIONS annonType, CDICOMPONENT comp, String replacement,
+ private void checkQuickFix(ANNOTATIONS annonType, CDICOMPONENT comp, String className, String replacement,
SWTBotEclipseEditor ed) {
- String className = null;
- setClassName(comp, className);
- problemsTrees = getProblems(annonType, className);
+ String componentClass = className + ".java";
+ problemsTrees = getProblems(annonType, comp, componentClass);
assertTrue(problemsTrees.length != 0);
- resolve(annonType, comp, replacement, ed);
- problemsTrees = getProblems(annonType, className);
+ resolveQuickFix(annonType, comp, replacement, ed);
+ problemsTrees = getProblems(annonType, comp, componentClass);
assertTrue(problemsTrees.length == 0);
}
- private void setClassName(CDICOMPONENT comp, String className) {
- switch (comp) {
- case STEREOSCOPE:
- className = "S1.java";
- break;
- case QUALIFIER:
- className = "Q2.java";
- break;
- case SCOPE:
- className = "Scope1.java";
- break;
- case BEAN:
- className = "MyBean.java";
- break;
- default:
- break;
- }
- }
-
- private SWTBotTreeItem[] getProblems(ANNOTATIONS annonType, String className) {
+ private SWTBotTreeItem[] getProblems(ANNOTATIONS annonType, CDICOMPONENT comp, String className) {
SWTBotTreeItem[] problemsTree;
+ boolean warningType = true;
switch (annonType) {
case NAMED:
+ warningType = ((comp == CDICOMPONENT.BEAN)?true:false);
+ break;
case TYPED:
case DISPOSES:
case OBSERVES:
- problemsTree = ProblemsView.getFilteredErrorsTreeItems(bot, null, "/"
- + PROJECT_NAME, className, "CDI Problem");
+ case DECORATOR:
+ case INTERCEPTOR:
+ warningType = false;
break;
- default:
- problemsTree = ProblemsView.getFilteredWarningsTreeItems(bot, null, "/"
+ }
+ String problemsContains = null;
+ if (warningType) {
+ problemsTree = ProblemsView.getFilteredWarningsTreeItems(bot, problemsContains, "/"
+ PROJECT_NAME, className, "CDI Problem");
- break;
+ } else {
+ if (className.equals("InterDecor.java")) {
+ problemsContains = "Producer cannot be declared in";
+ }
+ problemsTree = ProblemsView.getFilteredErrorsTreeItems(bot, problemsContains, "/"
+ + PROJECT_NAME, className, "CDI Problem");
}
return problemsTree;
}
- private void resolve(ANNOTATIONS annonType, CDICOMPONENT comp, String replacement,
+ private void resolveQuickFix(ANNOTATIONS annonType, CDICOMPONENT comp, String replacement,
SWTBotEclipseEditor ed) {
+ int index = indexDetermine(annonType, comp, replacement);
+ resolve(annonType, replacement, index);
+ }
+
+ private int indexDetermine(ANNOTATIONS annonType, CDICOMPONENT comp, String replacement) {
boolean chooseFirstOption = true;
if (annonType == ANNOTATIONS.NAMED && replacement.equals("")) {
chooseFirstOption = false;
- } else {
- if ((comp == CDICOMPONENT.BEAN && annonType == ANNOTATIONS.DISPOSES) ||
- (comp == CDICOMPONENT.BEAN && annonType == ANNOTATIONS.OBSERVES)) {
- if (problemsTrees[0].getText().contains("Producer method has a parameter annotated "
- + replacement) ||
- problemsTrees[0].getText().contains("method cannot be annotated @Inject")) {
- chooseFirstOption = false;
- }
+ }
+ if ((comp == CDICOMPONENT.BEAN && annonType == ANNOTATIONS.DISPOSES) ||
+ (comp == CDICOMPONENT.BEAN && annonType == ANNOTATIONS.OBSERVES)) {
+ if ((problemsTrees[0].getText().contains("Producer method has a parameter annotated "
+ + replacement)) ||
+ (problemsTrees[0].getText().contains("method cannot be annotated @Inject")) ||
+ (annonType == ANNOTATIONS.OBSERVES &&
+ problemsTrees[0].getText().contains("Observer method has a parameter annotated @Disposes"))) {
+ chooseFirstOption = false;
}
}
- resolveWithAnnonType(annonType, replacement, chooseFirstOption?0:1);
+ return chooseFirstOption?0:1;
}
- private void resolveWithAnnonType(ANNOTATIONS annonType, String replacement, int index) {
+ private void resolve(ANNOTATIONS annonType, String replacement, int index) {
CDIUtil.openQuickFix(problemsTrees[0], bot);
bot.table(0).click(index, 0);
assertFalse(bot.button("Finish").isEnabled());
@@ -510,15 +592,13 @@
bot.clickButton("Finish");
bot.sleep(Timing.time1S());
util.waitForNonIgnoredJobs();
- afterResolveclearImports(annonType, replacement);
+ clearImports(annonType, replacement);
}
- private void afterResolveclearImports(ANNOTATIONS annonType, String replacement) {
- if (annonType == ANNOTATIONS.RETENTION) {
- if (replacement.equals("@Retention(CLASS)")) {
- CDIUtil.replaceInEditor(ed, bot,
- "import static java.lang.annotation.RetentionPolicy.CLASS;","");
- }
+ private void clearImports(ANNOTATIONS annonType, String replacement) {
+ if (annonType == ANNOTATIONS.RETENTION && replacement.equals("@Retention(CLASS)")) {
+ CDIUtil.replaceInEditor(ed, bot,
+ "import static java.lang.annotation.RetentionPolicy.CLASS;","");
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-29 09:56:21 UTC (rev 34368)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-29 14:08:09 UTC (rev 34369)
@@ -77,6 +77,12 @@
ed.save();
}
+ public static void insertInEditor(SWTBotEclipseEditor ed, SWTBotExt bot, int line, int row, String insertText) {
+ ed.toTextEditor().insertText(line , row, insertText);
+ bot.sleep(Timing.time1S());
+ ed.save();
+ }
+
public static void disableFolding(SWTBotExt bot, SWTUtilExt util) {
editFolding(bot, util, false);
}
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-08-29 14:08:09 UTC (rev 34369)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.6"/>
+</faceted-project>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-08-29 09:56:21 UTC (rev 34368)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-08-29 14:08:09 UTC (rev 34369)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
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.ServerType;
@@ -32,9 +33,15 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
-@Require(server =
+@Require(server=
@Server(type = ServerType.EAP), perspective = "Java EE")
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ EAPCompAllTests.class})
+
+
public class EAPFromJavaTest extends WSTestBase {
private static final Logger L = Logger.getLogger(EAPFromJavaTest.class.getName());
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-08-29 09:56:21 UTC (rev 34368)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-08-29 14:08:09 UTC (rev 34369)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
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.ServerType;
@@ -32,9 +33,13 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
-@Require(server =
+@Require(server=
@Server(type = ServerType.EAP), perspective = "Java EE")
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ EAPCompAllTests.class})
public class EAPFromWSDLTest extends WSTestBase {
private static final Logger L = Logger.getLogger(EAPFromWSDLTest.class.getName());
14 years, 3 months
JBoss Tools SVN: r34368 - trunk/gwt/features/org.jboss.tools.gwt.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:56:21 -0400 (Mon, 29 Aug 2011)
New Revision: 34368
Modified:
trunk/gwt/features/org.jboss.tools.gwt.feature/build.properties
trunk/gwt/features/org.jboss.tools.gwt.feature/feature.properties
trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml
Log:
corrected build.properties, extracted keys from features.xml
Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/build.properties
===================================================================
--- trunk/gwt/features/org.jboss.tools.gwt.feature/build.properties 2011-08-29 09:46:24 UTC (rev 34367)
+++ trunk/gwt/features/org.jboss.tools.gwt.feature/build.properties 2011-08-29 09:56:21 UTC (rev 34368)
@@ -1,3 +1,12 @@
bin.includes = feature.xml,\
license.html,\
feature.properties
+src.includes = build.properties,\
+ feature.properties,\
+ feature.xml,\
+ license.html
+src.includes = build.properties,\
+ feature.properties,\
+ feature.xml,\
+ license.html,\
+ .project
Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/feature.properties
===================================================================
--- trunk/gwt/features/org.jboss.tools.gwt.feature/feature.properties 2011-08-29 09:46:24 UTC (rev 34367)
+++ trunk/gwt/features/org.jboss.tools.gwt.feature/feature.properties 2011-08-29 09:56:21 UTC (rev 34368)
@@ -26,6 +26,9 @@
# "description" property - description of the feature
description=JBoss GWT Integration (Experimental)
+# "descriptionURL" property - the web address to get further informations about this feature
+descriptionURL=http://www.jboss.org/tools
+
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2011 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss by Red Hat - Initial implementation.
Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml
===================================================================
--- trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml 2011-08-29 09:46:24 UTC (rev 34367)
+++ trunk/gwt/features/org.jboss.tools.gwt.feature/feature.xml 2011-08-29 09:56:21 UTC (rev 34368)
@@ -5,11 +5,11 @@
version="1.0.2.qualifier"
provider-name="%providerName">
- <description url="http://www.example.com/description">
+ <description url="%descriptionURL">
%description
</description>
- <copyright url="http://www.example.com/copyright">
+ <copyright>
%copyright
</copyright>
14 years, 3 months
JBoss Tools SVN: r34367 - trunk/usage/features/org.jboss.tools.usage.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:46:24 -0400 (Mon, 29 Aug 2011)
New Revision: 34367
Added:
trunk/usage/features/org.jboss.tools.usage.test.feature/license.html
Log:
[JBIDE-9593] corrected build.properties, extracted keys from feature.xml to feature.properties
Added: trunk/usage/features/org.jboss.tools.usage.test.feature/license.html
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.test.feature/license.html (rev 0)
+++ trunk/usage/features/org.jboss.tools.usage.test.feature/license.html 2011-08-29 09:46:24 UTC (rev 34367)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/usage/features/org.jboss.tools.usage.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r34366 - trunk/usage/features/org.jboss.tools.usage.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:27:41 -0400 (Mon, 29 Aug 2011)
New Revision: 34366
Modified:
trunk/usage/features/org.jboss.tools.usage.test.feature/build.properties
trunk/usage/features/org.jboss.tools.usage.test.feature/feature.properties
trunk/usage/features/org.jboss.tools.usage.test.feature/feature.xml
Log:
[JBIDE-9593] corrected build.properties, extracted keys from feature.xml to feature.properties
Modified: trunk/usage/features/org.jboss.tools.usage.test.feature/build.properties
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.test.feature/build.properties 2011-08-29 09:25:14 UTC (rev 34365)
+++ trunk/usage/features/org.jboss.tools.usage.test.feature/build.properties 2011-08-29 09:27:41 UTC (rev 34366)
@@ -1 +1,8 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
+src.includes = feature.properties,\
+ feature.xml,\
+ license.html,\
+ build.properties,\
+ .project
Modified: trunk/usage/features/org.jboss.tools.usage.test.feature/feature.properties
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.test.feature/feature.properties 2011-08-29 09:25:14 UTC (rev 34365)
+++ trunk/usage/features/org.jboss.tools.usage.test.feature/feature.properties 2011-08-29 09:27:41 UTC (rev 34366)
@@ -26,6 +26,9 @@
# "description" property - description of the feature
description=JBoss Tools - Tests - Usage Reporting
+# "descriptionURL" property - the web address to get further informations about this feature
+descriptionURL=http://www.jboss.org/tools
+
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2008-2011 Red Hat, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
Modified: trunk/usage/features/org.jboss.tools.usage.test.feature/feature.xml
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.test.feature/feature.xml 2011-08-29 09:25:14 UTC (rev 34365)
+++ trunk/usage/features/org.jboss.tools.usage.test.feature/feature.xml 2011-08-29 09:27:41 UTC (rev 34366)
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.tools.usage.test.feature"
- label="JBoss Tools - Tests - Usage Reporting"
- version="1.1.0.qualifier">
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="%descriptionURL">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
<plugin
14 years, 3 months
JBoss Tools SVN: r34365 - trunk/usage/features/org.jboss.tools.usage.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:25:14 -0400 (Mon, 29 Aug 2011)
New Revision: 34365
Modified:
trunk/usage/features/org.jboss.tools.usage.feature/build.properties
trunk/usage/features/org.jboss.tools.usage.feature/feature.properties
trunk/usage/features/org.jboss.tools.usage.feature/feature.xml
Log:
corrected build.properties, extracted keys from features.xml
Modified: trunk/usage/features/org.jboss.tools.usage.feature/build.properties
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.feature/build.properties 2011-08-29 09:22:08 UTC (rev 34364)
+++ trunk/usage/features/org.jboss.tools.usage.feature/build.properties 2011-08-29 09:25:14 UTC (rev 34365)
@@ -1,3 +1,7 @@
bin.includes = feature.xml,\
license.html,\
- feature.properties
+ feature.properties,\
+ build.properties
+src.includes = feature.xml,\
+ feature.properties,\
+ license.html
Modified: trunk/usage/features/org.jboss.tools.usage.feature/feature.properties
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.feature/feature.properties 2011-08-29 09:22:08 UTC (rev 34364)
+++ trunk/usage/features/org.jboss.tools.usage.feature/feature.properties 2011-08-29 09:25:14 UTC (rev 34365)
@@ -26,6 +26,9 @@
# "description" property - description of the feature
description=JBoss Tools Usage Reporting
+# "descriptionURL" property - the web address to get further informations about this feature
+descriptionURL=http://www.jboss.org/tools
+
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2008-2011 Red Hat, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
Modified: trunk/usage/features/org.jboss.tools.usage.feature/feature.xml
===================================================================
--- trunk/usage/features/org.jboss.tools.usage.feature/feature.xml 2011-08-29 09:22:08 UTC (rev 34364)
+++ trunk/usage/features/org.jboss.tools.usage.feature/feature.xml 2011-08-29 09:25:14 UTC (rev 34365)
@@ -5,7 +5,7 @@
version="1.1.0.qualifier"
provider-name="%providerName">
- <description>
+ <description url="%descriptionURL">
%description
</description>
14 years, 3 months
JBoss Tools SVN: r34364 - trunk/as/features/org.jboss.ide.eclipse.as.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:22:08 -0400 (Mon, 29 Aug 2011)
New Revision: 34364
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.properties
Log:
corrected build.properties, extracted keys from features.xml
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.properties
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.properties 2011-08-29 09:21:01 UTC (rev 34363)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.properties 2011-08-29 09:22:08 UTC (rev 34364)
@@ -23,20 +23,29 @@
# "description" property - description of the feature
description=Provides WTP server adapters for JBoss installations. These adapters are capable of deployment and providing classpaths for projects. Zipped or exploded deployments, JMX integration, and other extensions are included.
-# "copyright" property
-copyright=JBoss, Home of Professional Open Source\nCopyright JBoss by Red Hat, and individual contributors as indicated\nby the @authors tag, 2006-2011. See the copyright.txt in the distribution\nfor a full listing of individual contributors.
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=Copyright (c) 2008-2011 Red Hat, Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http\://www.eclipse.org/legal/epl-v10.html\n\n\
+Contributors\:\n\
+JBoss by Red Hat - Initial implementation.
+ ############### end of copyright property ####################################
-# "descriptionURL" property - the web address to get further informations about this feature
-descriptionURL=http://www.jboss.org/tools
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
-# "license" property
-license=Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
-
-# "licenseURL" property
-licenseURL=license.html
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
14 years, 3 months
JBoss Tools SVN: r34363 - in trunk/usage/features: org.jboss.tools.usage.test.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:21:01 -0400 (Mon, 29 Aug 2011)
New Revision: 34363
Modified:
trunk/usage/features/org.jboss.tools.usage.feature/
trunk/usage/features/org.jboss.tools.usage.test.feature/
Log:
added .settings to .svnignore
Property changes on: trunk/usage/features/org.jboss.tools.usage.feature
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
build
+ target
buildlog.latest.txt
bin
build
.settings
Property changes on: trunk/usage/features/org.jboss.tools.usage.test.feature
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
build
+ target
buildlog.latest.txt
bin
build
.settings
14 years, 3 months
JBoss Tools SVN: r34362 - trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-29 05:18:03 -0400 (Mon, 29 Aug 2011)
New Revision: 34362
Added:
trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature/license.html
Log:
[JBIDE-9601] corrected build.properties, extracted keys from feature.xml to feature.properties
Added: trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature/license.html
===================================================================
--- trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature/license.html (rev 0)
+++ trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature/license.html 2011-08-29 09:18:03 UTC (rev 34362)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/deltacloud/features/org.jboss.tools.deltacloud.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
14 years, 3 months