JBoss Tools SVN: r36960 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-05 13:24:23 -0500 (Mon, 05 Dec 2011)
New Revision: 36960
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/bin/
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/
Log:
proper svn ignore
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0
___________________________________________________________________
Modified: svn:ignore
- target
+ build
bin
target
buildlog.latest.txt
14 years
JBoss Tools SVN: r36959 - trunk/hibernatetools/plugins/org.hibernate.eclipse.libs.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-05 13:24:17 -0500 (Mon, 05 Dec 2011)
New Revision: 36959
Removed:
trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/bin/
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/
Log:
proper svn ignore
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs
___________________________________________________________________
Modified: svn:ignore
- target
+ build
bin
target
buildlog.latest.txt
14 years
JBoss Tools SVN: r36958 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-05 13:23:10 -0500 (Mon, 05 Dec 2011)
New Revision: 36958
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java
Log:
JBIDE-10343
https://issues.jboss.org/browse/JBIDE-10343
Convenience method addJSFNature is added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java 2011-12-05 17:50:00 UTC (rev 36957)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java 2011-12-05 18:23:10 UTC (rev 36958)
@@ -68,6 +68,19 @@
public void run(IAction action) {
ConvertProjectToFacetedFormRunnable.runInProgressDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), project);
+ addJSFNature(project, showDialog);
+ }
+
+ /**
+ * Convenience method that adds JBoss Tools JSF nature to the project.
+ * These are the limitations for the use of the method.
+ * 1) It should be run from UI thread.
+ * 2) It should be run on a faceted project.
+ *
+ * @param project
+ * @param showDialog
+ */
+ public static void addJSFNature(IProject project, boolean showDialog) {
try {
IFacetedProject fp = ProjectFacetsManager.create(project);
IFacetedProjectWorkingCopy wc = SharedWorkingCopyManager.getWorkingCopy(fp);
@@ -77,9 +90,9 @@
IProjectFacetVersion jsf = null;
for (IProjectFacetVersion v: vs) {
String id = v.getProjectFacet().getId();
- if("jst.web".equals(id)) {
+ if("jst.web".equals(id)) { //$NON-NLS-1$
web = v;
- } else if("jst.jsf".equals(id)) {
+ } else if("jst.jsf".equals(id)) { //$NON-NLS-1$
jsf = v;
}
}
@@ -92,19 +105,19 @@
}
if(web == null) {
- web = ProjectFacetsManager.getProjectFacet("jst.web").getLatestVersion();
+ web = ProjectFacetsManager.getProjectFacet("jst.web").getLatestVersion(); //$NON-NLS-1$
wc.addProjectFacet(web);
}
String webVersion = web.getVersionString();
- if("2.2".equals(webVersion)) {
- web = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.3");
+ if("2.2".equals(webVersion)) { //$NON-NLS-1$
+ web = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.3"); //$NON-NLS-1$ //$NON-NLS-2$
wc.changeProjectFacetVersion(web);
webVersion = web.getVersionString();
}
if(jsf == null) {
- jsf = ProjectFacetsManager.getProjectFacet("jst.jsf").getLatestVersion();
- if("2.3".equals(webVersion) || "2.4".equals(webVersion)) {
- jsf = ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion("1.1");
+ jsf = ProjectFacetsManager.getProjectFacet("jst.jsf").getLatestVersion(); //$NON-NLS-1$
+ if("2.3".equals(webVersion) || "2.4".equals(webVersion)) { //$NON-NLS-1$ //$NON-NLS-2$
+ jsf = ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion("1.1"); //$NON-NLS-1$ //$NON-NLS-2$
}
wc.addProjectFacet(jsf);
}
14 years
JBoss Tools SVN: r36957 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: tejones
Date: 2011-12-05 12:50:00 -0500 (Mon, 05 Dec 2011)
New Revision: 36957
Added:
workspace/tejones/
Log:
14 years
JBoss Tools SVN: r36956 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: annotations and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-05 12:22:50 -0500 (Mon, 05 Dec 2011)
New Revision: 36956
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/annotations/JSFEnvironment.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
Log:
Removing redundant parameter in method + javaDoc + copyright added
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-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -52,7 +52,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 27min
+ * Suite duration: aprox. 28min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
@@ -79,7 +79,7 @@
OpenOnTest.class,
FindObserverForEventTest.class,
Seam3Test.class
- })
+})
public class CDIAllBotTests extends CDITestBase {
/*
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java 2011-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.cdi.bot.test.annotations;
public enum JSFEnvironment {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.cdi.bot.test.annotations;
public enum JSFTemplate {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -74,7 +74,6 @@
assertTrue(checkBeanXMLAlternativeOpenOn(getProjectName(), "A1"));
}
-
// https://issues.jboss.org/browse/JBIDE-6251
@Test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -19,6 +19,11 @@
public class BeansXMLQuickFixTestBase extends QuickFixTestBase {
+ /**
+ * Method firstly gets beans.xml validation problem. Then
+ * it opens quick fix wizard, selects default value and
+ * press finish button
+ */
private void openBeanXMLValidationProblem() {
SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
@@ -31,10 +36,22 @@
qfWizard.finish();
}
+ /**
+ * Method checks if there is no beans.xml validation error
+ * @return
+ */
public boolean isBeanXMLValidationProblemsEmpty() {
return getProblem(CDIAnnotationsType.INJECT, CDIWizardType.BEANS_XML) == null;
}
+ /**
+ * Method resolves validation error where there is no such Alternative as
+ * configured in beans.xml. It opens quick fix and through finish button
+ * the Bean Wizard dialog is opened where both parameters are used to create
+ * the new alternative bean
+ * @param name
+ * @param pkg
+ */
public void resolveAddNewAlternative(String name, String pkg) {
openBeanXMLValidationProblem();
@@ -47,6 +64,14 @@
}
+ /**
+ * Method resolves validation error where there is no such Stereotype as
+ * configured in beans.xml. It opens quick fix and through finish button
+ * the Stereotype Wizard dialog is opened where both parameters are used to create
+ * the new stereotype annotation
+ * @param name
+ * @param pkg
+ */
public void resolveAddNewStereotype(String name, String pkg) {
openBeanXMLValidationProblem();
@@ -59,6 +84,14 @@
}
+ /**
+ * Method resolves validation error where there is no such decorator as
+ * configured in beans.xml. It opens quick fix and through finish button
+ * the Decorator Wizard dialog is opened where both parameters are used to create
+ * the new decorator. Interface "java.util.List" is automatically used.
+ * @param name
+ * @param pkg
+ */
public void resolveAddNewDecorator(String name, String pkg) {
openBeanXMLValidationProblem();
@@ -72,6 +105,14 @@
}
+ /**
+ * Method resolves validation error where there is no such Interceptor as
+ * configured in beans.xml. It opens quick fix and through finish button
+ * the Interceptor Wizard dialog is opened where both parameters are used to create
+ * the new Interceptor
+ * @param name
+ * @param pkg
+ */
public void resolveAddNewInterceptor(String name, String pkg) {
openBeanXMLValidationProblem();
@@ -84,7 +125,13 @@
}
- public void resolveAddAlternativeToExistingComponent(String name, String pkg) {
+ /**
+ * Method corrects Bean or Stereotype which has no @Alternative annotation in it
+ * by adding these parameter.
+ * @param name
+ * @param pkg
+ */
+ public void resolveAddAlternativeToExistingComponent(String name) {
openBeanXMLValidationProblem();
String content = bot.editorByTitle(name + ".java").toTextEditor().getText();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2011-12-05 16:56:31 UTC (rev 36955)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2011-12-05 17:22:50 UTC (rev 36956)
@@ -72,7 +72,7 @@
beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), bean);
- resolveAddAlternativeToExistingComponent(bean, getPackageName());
+ resolveAddAlternativeToExistingComponent(bean);
assertTrue(isBeanXMLValidationProblemsEmpty());
@@ -87,7 +87,7 @@
beansHelper.createBeansXMLWithStereotype(getProjectName(), getPackageName(), stereotype);
- resolveAddAlternativeToExistingComponent(stereotype, getPackageName());
+ resolveAddAlternativeToExistingComponent(stereotype);
assertTrue(isBeanXMLValidationProblemsEmpty());
14 years
JBoss Tools SVN: r36955 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix/base and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-05 11:56:31 -0500 (Mon, 05 Dec 2011)
New Revision: 36955
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java
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/base/QuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java
Log:
BeansXMLValidationQuickFixTest added
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-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.bot.test.openon.OpenOnTest;
import org.jboss.tools.cdi.bot.test.quickfix.injection.ProblemEligibleInjectionTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.BeanValidationQuickFixTest;
+import org.jboss.tools.cdi.bot.test.quickfix.test.BeansXMLValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.DecoratorValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.IBindingValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.InterceptorValidationQuickFixTest;
@@ -67,6 +68,7 @@
BeansXMLValidationTest.class,
BeansXMLCompletionTest.class,
ProblemEligibleInjectionTest.class,
+ BeansXMLValidationQuickFixTest.class,
StereotypeValidationQuickFixTest.class,
QualifierValidationQuickFixTest.class,
ScopeValidationQuickFixTest.class,
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.quickfix.base;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBase;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
+
+public class BeansXMLQuickFixTestBase extends QuickFixTestBase {
+
+ private void openBeanXMLValidationProblem() {
+
+ SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
+ CDIWizardType.BEANS_XML);
+
+ openQuickFix(validationProblem);
+ QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
+ qfWizard.setFix(qfWizard.getAvailableFixes().get(0));
+ qfWizard.setResource(qfWizard.getResources().get(0));
+ qfWizard.finish();
+ }
+
+ public boolean isBeanXMLValidationProblemsEmpty() {
+ return getProblem(CDIAnnotationsType.INJECT, CDIWizardType.BEANS_XML) == null;
+ }
+
+ public void resolveAddNewAlternative(String name, String pkg) {
+
+ openBeanXMLValidationProblem();
+ CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.BEAN);
+ if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) {
+ cdiWizardBase.setName(name).setPackage(pkg).finish();
+ }else {
+ fail("Dialog can't be finished");
+ }
+
+ }
+
+ public void resolveAddNewStereotype(String name, String pkg) {
+
+ openBeanXMLValidationProblem();
+ CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.STEREOTYPE);
+ if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) {
+ cdiWizardBase.setName(name).setPackage(pkg).finish();
+ }else {
+ fail("Dialog can't be finished");
+ }
+
+ }
+
+ public void resolveAddNewDecorator(String name, String pkg) {
+
+ openBeanXMLValidationProblem();
+ CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.DECORATOR);
+ cdiWizardBase.addInterface("java.util.List");
+ if (cdiWizardBase.canFinish()) {
+ cdiWizardBase.setName(name).setPackage(pkg).finish();
+ } else {
+ fail("Dialog can't be finished");
+ }
+
+ }
+
+ public void resolveAddNewInterceptor(String name, String pkg) {
+
+ openBeanXMLValidationProblem();
+ CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.INTERCEPTOR);
+ if (cdiWizardBase.canFinish()) {
+ cdiWizardBase.setName(name).setPackage(pkg).finish();
+ }else {
+ fail("Dialog can't be finished");
+ }
+
+ }
+
+ public void resolveAddAlternativeToExistingComponent(String name, String pkg) {
+
+ openBeanXMLValidationProblem();
+ String content = bot.editorByTitle(name + ".java").toTextEditor().getText();
+ assertTrue(content.contains("@Alternative"));
+
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.quickfix.base;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard;
+import org.jboss.tools.ui.bot.ext.Timing;
+
+public class EligibleInjectionQuickFixTestBase extends QuickFixTestBase{
+
+ /**
+ * Method resolves multiple bean injection problem. By setting class which
+ * should be more qualified and qualifier name it resolves this problem.
+ * If qualifier doesn't exist, by using qualifier wizard it creates the new
+ * one and uses it to resolve problem
+ * @param classToQualify
+ * @param qualifier
+ */
+ public void resolveMultipleBeans(String classToQualify, String qualifier,
+ QualifierOperation operation) {
+
+ SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
+ CDIWizardType.BEAN);
+
+ openQuickFix(validationProblem);
+ QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard();
+ for (String availableFix : quickFixWizard.getAvailableFixes()) {
+ if (availableFix.contains(classToQualify)) {
+ quickFixWizard.setFix(availableFix).
+ setResource(quickFixWizard.getResources().get(0)).
+ finish();
+ }
+ }
+
+ SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard();
+ if (operation == QualifierOperation.ADD) {
+ for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
+ if (availQualifer.equals(qualifier + " - " + getPackageName())) {
+ spBeanDialogWizard.addQualifier(availQualifer);
+ }
+ }
+ // there was no such qualifer, it has to be created
+ if (!spBeanDialogWizard.canFinish()) {
+ spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()).
+ setName(qualifier).finish();
+ }
+ } else {
+ for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) {
+ if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) {
+ spBeanDialogWizard.removeQualifier(inBeanQualifer);
+ }
+ }
+ }
+
+ spBeanDialogWizard.finish();
+
+ bot.sleep(Timing.time1S());
+ util.waitForNonIgnoredJobs();
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -19,6 +19,7 @@
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider;
+import org.jboss.tools.cdi.bot.test.quickfix.validators.BeansXmlValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider;
@@ -97,6 +98,9 @@
case INTERCEPTOR_BINDING:
validationErrorsProvider = new InterceptorBindingValidationProvider();
break;
+ case BEANS_XML:
+ validationErrorsProvider = new BeansXmlValidationProvider();
+ break;
}
ArrayList<String> validationProblems = null;
SWTBotTreeItem[] problemsInProblemsView = null;
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.cdi.bot.test.quickfix.injection;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
-import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
-import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard;
-import org.jboss.tools.ui.bot.ext.Timing;
-
-public class EligibleInjectionTestBase extends QuickFixTestBase{
-
- /**
- * Method resolves multiple bean injection problem. By setting class which
- * should be more qualified and qualifier name it resolves this problem.
- * If qualifier doesn't exist, by using qualifier wizard it creates the new
- * one and uses it to resolve problem
- * @param classToQualify
- * @param qualifier
- */
- public void resolveMultipleBeans(String classToQualify, String qualifier,
- QualifierOperation operation) {
-
- SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
- CDIWizardType.BEAN);
-
- openQuickFix(validationProblem);
- QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard();
- for (String availableFix : quickFixWizard.getAvailableFixes()) {
- if (availableFix.contains(classToQualify)) {
- quickFixWizard.setFix(availableFix).
- setResource(quickFixWizard.getResources().get(0)).
- finish();
- }
- }
-
- SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard();
- if (operation == QualifierOperation.ADD) {
- for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
- if (availQualifer.equals(qualifier + " - " + getPackageName())) {
- spBeanDialogWizard.addQualifier(availQualifer);
- }
- }
- // there was no such qualifer, it has to be created
- if (!spBeanDialogWizard.canFinish()) {
- spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()).
- setName(qualifier).finish();
- }
- } else {
- for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) {
- if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) {
- spBeanDialogWizard.removeQualifier(inBeanQualifer);
- }
- }
- }
-
- spBeanDialogWizard.finish();
-
- bot.sleep(Timing.time1S());
- util.waitForNonIgnoredJobs();
- }
-
-}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -13,6 +13,7 @@
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.quickfix.base.EligibleInjectionQuickFixTestBase;
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;
@@ -27,7 +28,7 @@
version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
-public class ProblemEligibleInjectionTest extends EligibleInjectionTestBase {
+public class ProblemEligibleInjectionTest extends EligibleInjectionQuickFixTestBase {
private final String ANIMAL = "Animal";
private final String DOG = "Dog";
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.quickfix.test;
+
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.quickfix.base.BeansXMLQuickFixTestBase;
+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.ServerState;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Test operates on quick fixes used for validation errors of beans.xml
+ *
+ * @author Jaroslav Jankovic
+ */
+
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class })
+public class BeansXMLValidationQuickFixTest extends BeansXMLQuickFixTestBase {
+
+ @Override
+ public String getProjectName() {
+ return "CDIQuickFixBeanXMLTest";
+ }
+
+ @Test
+ public void testNoBeanComponent() {
+
+ String bean = "A1";
+ beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), bean);
+
+ resolveAddNewAlternative(bean, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+ }
+
+ @Test
+ public void testNoStereotypeAnnotation() {
+
+ String stereotype = "S1";
+ beansHelper.createBeansXMLWithStereotype(getProjectName(), getPackageName(), stereotype);
+
+ resolveAddNewStereotype(stereotype, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+
+ }
+
+ @Test
+ public void testNoAlternativeBeanComponent() {
+
+ String bean = "B1";
+
+ wizard.createCDIComponent(CDIWizardType.BEAN, bean, getPackageName(), null);
+
+ beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), bean);
+
+ resolveAddAlternativeToExistingComponent(bean, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+
+ }
+
+ @Test
+ public void testNoAlternativeStereotypeAnnotation() {
+
+ String stereotype = "S2";
+
+ wizard.createCDIComponent(CDIWizardType.STEREOTYPE, stereotype, getPackageName(), null);
+
+ beansHelper.createBeansXMLWithStereotype(getProjectName(), getPackageName(), stereotype);
+
+ resolveAddAlternativeToExistingComponent(stereotype, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+
+ }
+
+ @Test
+ public void testNoInterceptor() {
+
+ String interceptor = "I1";
+ beansHelper.createBeansXMLWithInterceptor(getProjectName(),
+ getPackageName(), interceptor);
+
+ resolveAddNewInterceptor(interceptor, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+
+ }
+
+ @Test
+ public void testNoDecorator() {
+
+ String decorator = "D1";
+ beansHelper.createBeansXMLWithDecorator(getProjectName(), getPackageName(), decorator);
+
+ resolveAddNewDecorator(decorator, getPackageName());
+
+ assertTrue(isBeanXMLValidationProblemsEmpty());
+
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -33,16 +33,7 @@
public ArrayList<String> getAllWarningForAnnotationType(
CDIAnnotationsType annotationType) {
- int warningIndex = 0;
- switch(annotationType) {
- case NONBINDING:
- warningIndex = 0;
- warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex));
- warningIndex = 1;
- break;
- }
- warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex));
- return warningsForAnnotationType;
+ return validationErrors.get("Warnings");
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -39,22 +39,7 @@
public ArrayList<String> getAllWarningForAnnotationType(
CDIAnnotationsType annotationType) {
- int warningIndex = 0;
- switch(annotationType) {
- case RETENTION:
- warningIndex = 0;
- break;
- case TARGET:
- warningIndex = 1;
- break;
- case NONBINDING:
- warningIndex = 2;
- warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex));
- warningIndex = 3;
- break;
- }
- warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex));
- return warningsForAnnotationType;
+ return validationErrors.get("Warnings");
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955)
@@ -34,17 +34,7 @@
public ArrayList<String> getAllWarningForAnnotationType(
CDIAnnotationsType annotationType) {
- int warningIndex = 0;
- switch(annotationType) {
- case RETENTION:
- warningIndex = 0;
- break;
- case TARGET:
- warningIndex = 1;
- break;
- }
- warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex));
- return warningsForAnnotationType;
+ return validationErrors.get("Warnings");
}
}
14 years
JBoss Tools SVN: r36954 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-05 11:34:07 -0500 (Mon, 05 Dec 2011)
New Revision: 36954
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/BeansXmlValidationProvider.java
Log:
BeanXMLValidationProvider added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/BeansXmlValidationProvider.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/BeansXmlValidationProvider.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/BeansXmlValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.quickfix.validators;
+
+import java.util.ArrayList;
+
+import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
+
+
+public class BeansXmlValidationProvider extends AbstractValidationProvider {
+
+ public BeansXmlValidationProvider() {
+ super();
+ }
+
+ @Override
+ void init() {
+ validationErrors.get("Errors").add("There is no class with the specified name");
+ validationErrors.get("Errors").add("There is no annotation with the specified name");
+ validationErrors.get("Errors").add("<class> element must specify the name of an " +
+ "alternative bean class");
+ validationErrors.get("Errors").add("<stereotype> element must specify the name of " +
+ "an @Alternative stereotype annotation");
+
+ errorsAnnotation.add(CDIAnnotationsType.INJECT);
+ }
+
+ public ArrayList<String> getAllErrorsForAnnotationType(
+ CDIAnnotationsType annotationType) {
+ return validationErrors.get("Errors");
+ }
+
+}
14 years
JBoss Tools SVN: r36953 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-05 09:12:29 -0500 (Mon, 05 Dec 2011)
New Revision: 36953
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
Fixed JBIDE-10309: Invalid OpenShift Server Runtime label
https://issues.jboss.org/browse/JBIDE-10309
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-12-05 12:50:47 UTC (rev 36952)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-12-05 14:12:29 UTC (rev 36953)
@@ -3,6 +3,7 @@
Bundle-Name: OpenShift UI
Bundle-SymbolicName: org.jboss.tools.openshift.express.ui;singleton:=true
Bundle-Version: 2.3.0.qualifier
+Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator
Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="2.3.0",
org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
14 years
JBoss Tools SVN: r36952 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix/base and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-12-05 07:50:47 -0500 (Mon, 05 Dec 2011)
New Revision: 36952
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java
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/base/QuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
Log:
Creating new EligibleInjectionTestBase
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-12-05 12:47:20 UTC (rev 36951)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 12:50:47 UTC (rev 36952)
@@ -51,7 +51,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 25min
+ * Suite duration: aprox. 27min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 12:47:20 UTC (rev 36951)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 12:50:47 UTC (rev 36952)
@@ -18,7 +18,6 @@
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
-import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation;
import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider;
@@ -28,8 +27,6 @@
import org.jboss.tools.cdi.bot.test.quickfix.validators.StereotypeValidationProvider;
import org.jboss.tools.cdi.bot.test.uiutils.QuickFixHelper;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
-import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard;
-import org.jboss.tools.ui.bot.ext.Timing;
import org.junit.BeforeClass;
/**
@@ -77,7 +74,7 @@
* @param compType
* @return
*/
- private SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) {
+ protected SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) {
switch (compType) {
case STEREOTYPE:
validationErrorsProvider = new StereotypeValidationProvider();
@@ -139,54 +136,4 @@
util.waitForNonIgnoredJobs();
}
- /**
- * Method resolves multiple bean injection problem. By setting class which
- * should be more qualified and qualifier name it resolves this problem.
- * If qualifier doesn't exist, by using qualifier wizard it creates the new
- * one and uses it to resolve problem
- * @param classToQualify
- * @param qualifier
- */
- public void resolveMultipleBeans(String classToQualify, String qualifier,
- QualifierOperation operation) {
-
- SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
- CDIWizardType.BEAN);
-
- openQuickFix(validationProblem);
- QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard();
- for (String availableFix : quickFixWizard.getAvailableFixes()) {
- if (availableFix.contains(classToQualify)) {
- quickFixWizard.setFix(availableFix).
- setResource(quickFixWizard.getResources().get(0)).
- finish();
- }
- }
-
- SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard();
- if (operation == QualifierOperation.ADD) {
- for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
- if (availQualifer.equals(qualifier + " - " + getPackageName())) {
- spBeanDialogWizard.addQualifier(availQualifer);
- }
- }
- // there was no such qualifer, it has to be created
- if (!spBeanDialogWizard.canFinish()) {
- spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()).
- setName(qualifier).finish();
- }
- } else {
- for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) {
- if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) {
- spBeanDialogWizard.removeQualifier(inBeanQualifer);
- }
- }
- }
-
- spBeanDialogWizard.finish();
-
- bot.sleep(Timing.time1S());
- util.waitForNonIgnoredJobs();
- }
-
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 12:50:47 UTC (rev 36952)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.quickfix.injection;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard;
+import org.jboss.tools.ui.bot.ext.Timing;
+
+public class EligibleInjectionTestBase extends QuickFixTestBase{
+
+ /**
+ * Method resolves multiple bean injection problem. By setting class which
+ * should be more qualified and qualifier name it resolves this problem.
+ * If qualifier doesn't exist, by using qualifier wizard it creates the new
+ * one and uses it to resolve problem
+ * @param classToQualify
+ * @param qualifier
+ */
+ public void resolveMultipleBeans(String classToQualify, String qualifier,
+ QualifierOperation operation) {
+
+ SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
+ CDIWizardType.BEAN);
+
+ openQuickFix(validationProblem);
+ QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard();
+ for (String availableFix : quickFixWizard.getAvailableFixes()) {
+ if (availableFix.contains(classToQualify)) {
+ quickFixWizard.setFix(availableFix).
+ setResource(quickFixWizard.getResources().get(0)).
+ finish();
+ }
+ }
+
+ SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard();
+ if (operation == QualifierOperation.ADD) {
+ for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
+ if (availQualifer.equals(qualifier + " - " + getPackageName())) {
+ spBeanDialogWizard.addQualifier(availQualifer);
+ }
+ }
+ // there was no such qualifer, it has to be created
+ if (!spBeanDialogWizard.canFinish()) {
+ spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()).
+ setName(qualifier).finish();
+ }
+ } else {
+ for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) {
+ if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) {
+ spBeanDialogWizard.removeQualifier(inBeanQualifer);
+ }
+ }
+ }
+
+ spBeanDialogWizard.finish();
+
+ bot.sleep(Timing.time1S());
+ util.waitForNonIgnoredJobs();
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 12:47:20 UTC (rev 36951)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 12:50:47 UTC (rev 36952)
@@ -13,7 +13,6 @@
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
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;
@@ -28,7 +27,7 @@
version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
-public class ProblemEligibleInjectionTest extends QuickFixTestBase {
+public class ProblemEligibleInjectionTest extends EligibleInjectionTestBase {
private final String ANIMAL = "Animal";
private final String DOG = "Dog";
14 years
JBoss Tools SVN: r36951 - branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-05 07:47:20 -0500 (Mon, 05 Dec 2011)
New Revision: 36951
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
Log:
JBIDE-10297 to branch as temporary fix regarding missing workspace location during startup
Modified: branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
===================================================================
--- branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-12-05 12:46:06 UTC (rev 36950)
+++ branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-12-05 12:47:20 UTC (rev 36951)
@@ -66,14 +66,22 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- // Start the array of models that need to be started
- UnitedServerListenerManager.getDefault();
- UnitedServerListenerManager.getDefault().addListener(XPathModel.getDefault());
- UnitedServerListenerManager.getDefault().addListener(ServerListener.getDefault());
// It's unsafe to use FacetedProjectFramework in start method in the same thread. If may cause a deadlock. See https://issues.jboss.org/browse/JBIDE-9802
Job job = new Job("Adding JBoss4xEarFacetInstallListener") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
+ while (Platform.getInstanceLocation() == null || !Platform.getInstanceLocation().isSet()) {
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+ // Start the array of models that need to be started
+ UnitedServerListenerManager.getDefault();
+ UnitedServerListenerManager.getDefault().addListener(XPathModel.getDefault());
+ UnitedServerListenerManager.getDefault().addListener(ServerListener.getDefault());
+
FacetedProjectFramework.addListener(JBoss4xEarFacetInstallListener.getDefault(), IFacetedProjectEvent.Type.POST_INSTALL);
return Status.OK_STATUS;
}
14 years