Author: jjankovi Date: 2011-12-05 06:10:48 -0500 (Mon, 05 Dec 2011) New Revision: 36943 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/bean/SerializableBean.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/BrokenFarm.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/Dog.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Animal.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/BrokenFarm.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Dog.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/ 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/ 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/QualifierOperation.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/BrokenFarm.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/Dog.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/SerializableBean.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.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/uiutils/EditorResourceHelper.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java Log: ProblemEligibleInjectionTest added + new resource files added for test + refactoring Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/BrokenFarm.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/BrokenFarm.java.cdi 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/BrokenFarm.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,9 +0,0 @@ -package cdi; - -import javax.inject.Inject; - -public class BrokenFarm { - @SuppressWarnings("unused") - @Inject private Animal animal; - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/Dog.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/Dog.java.cdi 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/Dog.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,9 +0,0 @@ -package cdi; - -public class Dog extends Animal { - - public Dog() { - - } - -} \ No newline at end of file Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/SerializableBean.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/SerializableBean.java.cdi 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/SerializableBean.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,14 +0,0 @@ -package cdi; - -import javax.enterprise.context.SessionScoped; - -@SessionScoped -public class BeanComponent { - - private static final long serialVersionUID = 1L; - - public BeanComponent() { - - } - -} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/bean/SerializableBean.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/bean/SerializableBean.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/bean/SerializableBean.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,14 @@ +package cdi; + +import javax.enterprise.context.SessionScoped; + +@SessionScoped +public class BeanComponent { + + private static final long serialVersionUID = 1L; + + public BeanComponent() { + + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/BrokenFarm.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/BrokenFarm.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/BrokenFarm.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,9 @@ +package cdi; + +import javax.inject.Inject; + +public class BrokenFarm { + @SuppressWarnings("unused") + @Inject private Animal animal; + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/Dog.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/Dog.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/addQualifier/Dog.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,9 @@ +package cdi; + +public class Dog extends Animal { + + public Dog() { + + } + +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Animal.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Animal.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Animal.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,7 @@ +package cdi; + +@Q1 +public class Animal { + + +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/BrokenFarm.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/BrokenFarm.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/BrokenFarm.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,9 @@ +package cdi; + +import javax.inject.Inject; + +public class BrokenFarm { + @SuppressWarnings("unused") + @Inject @Q1 private Animal animal; + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Dog.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Dog.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/quickfix/injection/removeQualifier/Dog.java.cdi 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,6 @@ +package cdi; + +@Q1 +public class Dog extends Animal { + +} \ 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-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -16,13 +16,14 @@ import org.jboss.tools.cdi.bot.test.jsf.NamedRefactoringTest; import org.jboss.tools.cdi.bot.test.openon.FindObserverForEventTest; import org.jboss.tools.cdi.bot.test.openon.OpenOnTest; -import org.jboss.tools.cdi.bot.test.quickfix.BeanValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.DecoratorValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.IBindingValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.InterceptorValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.QualifierValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.ScopeValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.StereotypeValidationQuickFixTest; +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.DecoratorValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.IBindingValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.InterceptorValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.QualifierValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.ScopeValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.StereotypeValidationQuickFixTest; import org.jboss.tools.cdi.bot.test.seam3.Seam3Test; import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil; import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest; @@ -65,6 +66,7 @@ NamedRefactoringTest.class, BeansXMLValidationTest.class, BeansXMLCompletionTest.class, + ProblemEligibleInjectionTest.class, StereotypeValidationQuickFixTest.class, QualifierValidationQuickFixTest.class, ScopeValidationQuickFixTest.class, Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,204 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI bean component - * - * @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 BeanValidationQuickFixTest extends QuickFixTestBase { - - - @Override - public String getProjectName() { - return "CDIQuickFixBeanTest"; - } - - // https://issues.jboss.org/browse/JBIDE-8550 - @Test - public void testSerializableManagedBean() { - - String className = "ManagedBean"; - - wizard.createCDIComponent(CDIWizardType.BEAN, className, getPackageName(), null); - editResourceUtil.replaceClassContentByResource( BeanValidationQuickFixTest.class - .getResourceAsStream("/resources/quickfix/SerializableBean.java.cdi"), false); - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.SERIALIZABLE, CDIWizardType.BEAN); - - } - - // https://issues.jboss.org/browse/JBIDE-7635 - @Test - public void testMultipleBeansQF() { - String animalClassName = "Animal"; - String dogClassName = "Dog"; - String brokenFarmClassName = "BrokenFarm"; - - - wizard.createCDIComponent(CDIWizardType.BEAN, brokenFarmClassName, getPackageName(), null); - - wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Q1", getPackageName(), null); - - wizard.createCDIComponent(CDIWizardType.BEAN, animalClassName, getPackageName(), null); - - wizard.createCDIComponent(CDIWizardType.BEAN, dogClassName, getPackageName(), null); - editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class - .getResourceAsStream("/resources/quickfix/Dog.java.cdi"), false); - - bot.editorByTitle(brokenFarmClassName + ".java").show(); - setEd(bot.activeEditor().toTextEditor()); - editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class - .getResourceAsStream("/resources/quickfix/BrokenFarm.java.cdi"), - false); - - bot.sleep(TIME_1S); - util.waitForNonIgnoredJobs(); - - resolveMultipleBeans(); - - checkMultipleBean(); - } - - - // https://issues.jboss.org/browse/JBIDE-7664 - @Test - public void testConstructor() { - - String className = "Bean1"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/ConstructorWithParam.java.cdi"); - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false); - - editResourceUtil.replaceInEditor("@Disposes", "@Observes"); - editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", - "import javax.enterprise.event.Observes;"); - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); - } - - // https://issues.jboss.org/browse/JBIDE-7665 - @Test - public void testProducer() { - - String className = "Bean2"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/ProducerWithParam.java.cdi"); - - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); - - editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class - .getResourceAsStream("/resources/quickfix/bean/ProducerWithParam.java.cdi"), false); - editResourceUtil.replaceInEditor("BeanComponent", className); - - editResourceUtil.replaceInEditor("@Disposes", "@Observes"); - editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", - "import javax.enterprise.event.Observes;"); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); - - } - - // https://issues.jboss.org/browse/JBIDE-7667 - @Test - public void testInjectDisposer() { - - String className = "Bean3"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); - - } - - // https://issues.jboss.org/browse/JBIDE-7667 - @Test - public void testInjectObserver() { - - String className = "Bean4"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", - "import javax.enterprise.event.Observes;"); - editResourceUtil.replaceInEditor("@Disposes", "@Observes"); - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); - - } - - // https://issues.jboss.org/browse/JBIDE-7667 - @Test - public void testInjectProducer() { - - String className = "Bean5"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/BeanInjectProducer.java.cdi"); - - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.BEAN); - - } - - // https://issues.jboss.org/browse/JBIDE-7668 - @Test - public void testObserverWithDisposer() { - - String className = "Bean6"; - - wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, - getPackageName(), null, "/resources/quickfix/bean/ObserverWithDisposer.java.cdi"); - - editResourceUtil.replaceInEditor("BeanComponent", className); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); - - } - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,144 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Decorator component - * - * @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 DecoratorValidationQuickFixTest extends QuickFixTestBase { - - - @Override - public String getProjectName() { - return "CDIQuickFixDecoratorTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7680 - @Test - public void testSessionAnnotation() { - - String className = "Decorator1"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithStateless.java.cdi"); - - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.DECORATOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7636 - @Test - public void testNamedAnnotation() { - - String className = "Decorator2"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithNamed.java.cdi"); - - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.DECORATOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7683 - @Test - public void testProducer() { - - String className = "Decorator3"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithProducer.java.cdi"); - - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.DECORATOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7684 - @Test - public void testDisposesAnnotation() { - - String className = "Decorator4"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.DECORATOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7685 - @Test - public void testObservesAnnotation() { - - String className = "Decorator5"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", - "import javax.enterprise.event.Observes;"); - editResourceUtil.replaceInEditor("@Disposes", "@Observes"); - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.DECORATOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7686 - @Test - public void testSpecializesAnnotation() { - - String className = "Decorator6"; - - wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, - getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + - "DecoratorWithSpecializes.java.cdi"); - - editResourceUtil.replaceInEditor("DecoratorComponent", className); - - checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.DECORATOR); - - } - -} \ No newline at end of file Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,65 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Interceptor Binding component - * - * @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 IBindingValidationQuickFixTest extends QuickFixTestBase { - - - @Override - public String getProjectName() { - return "CDIQuickFixIBindingTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7641 - @Test - public void testNonbindingAnnotation() { - - String className = "IBinding1"; - - wizard.createAnnotation("AAnnotation", getPackageName()); - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR_BINDING, - className, getPackageName(), null, "/resources/quickfix/interceptorBinding/" + - "IBindingWithAnnotation.java.cdi"); - - editResourceUtil.replaceInEditor("IBindingComponent", className); - - checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.INTERCEPTOR_BINDING); - - editResourceUtil.replaceInEditor("@Nonbinding AAnnotation", "String[]"); - - checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.INTERCEPTOR_BINDING); - } - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,144 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Interceptor component - * - * @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 InterceptorValidationQuickFixTest extends QuickFixTestBase { - - - @Override - public String getProjectName() { - return "CDIQuickFixInterceptorTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7680 - @Test - public void testSessionAnnotation() { - - String className = "Interceptor1"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithStateless.java.cdi"); - - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.INTERCEPTOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7636 - @Test - public void testNamedAnnotation() { - - String className = "Interceptor2"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithNamed.java.cdi"); - - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.INTERCEPTOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7683 - @Test - public void testProducer() { - - String className = "Interceptor3"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithProducer.java.cdi"); - - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.INTERCEPTOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7684 - @Test - public void testDisposesAnnotation() { - - String className = "Interceptor4"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.INTERCEPTOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7685 - @Test - public void testObservesAnnotation() { - - String className = "Interceptor5"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithDisposes.java.cdi"); - - editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", - "import javax.enterprise.event.Observes;"); - editResourceUtil.replaceInEditor("@Disposes", "@Observes"); - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.INTERCEPTOR); - - } - - // https://issues.jboss.org/browse/JBIDE-7686 - @Test - public void testSpecializesAnnotation() { - - String className = "Interceptor6"; - - wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, - getPackageName(), null, "/resources/quickfix/interceptor/" + - "InterceptorWithSpecializes.java.cdi"); - - editResourceUtil.replaceInEditor("InterceptorComponent", className); - - checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.INTERCEPTOR); - - } - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,99 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Qualifier component - * - * @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 QualifierValidationQuickFixTest extends QuickFixTestBase { - - @Override - public String getProjectName() { - return "CDIQuickFixQualifierTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7630 - @Test - public void testTargetAnnotation() { - - String className = "Qualifier1"; - - wizard.createCDIComponent(CDIWizardType.QUALIFIER, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, PARAMETER, FIELD })", - "@Target({ TYPE, FIELD })"); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.QUALIFIER); - - editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD, PARAMETER})", ""); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.QUALIFIER); - } - - // https://issues.jboss.org/browse/JBIDE-7631 - @Test - public void testRetentionAnnotation() { - - String className = "Qualifier2"; - - wizard.createCDIComponent(CDIWizardType.QUALIFIER, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.QUALIFIER); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.QUALIFIER); - - } - - // https://issues.jboss.org/browse/JBIDE-7641 - @Test - public void testNonbindingAnnotation() { - - String className = "Qualifier3"; - - wizard.createAnnotation("AAnnotation", getPackageName()); - wizard.createCDIComponentWithContent(CDIWizardType.QUALIFIER, className, - getPackageName(), null, "/resources/quickfix/" + - "qualifier/QualifierWithAnnotation.java.cdi"); - - editResourceUtil.replaceInEditor("QualifierComponent", className); - - checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.QUALIFIER); - - editResourceUtil.replaceInEditor("@Nonbinding AAnnotation", "String[]"); - - checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.QUALIFIER); - } -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,183 +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; - - -import java.util.ArrayList; - -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem; -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.annotations.ProblemsType; -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; -import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider; -import org.jboss.tools.cdi.bot.test.quickfix.validators.QualifierValidationProvider; -import org.jboss.tools.cdi.bot.test.quickfix.validators.ScopeValidationProvider; -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.ui.bot.ext.Timing; -import org.junit.BeforeClass; - -/** - * Test base for all QuickFix-like tests - * - * @author Jaroslav Jankovic - */ - -public class QuickFixTestBase extends QuickFixHelper { - - @Override - public void checkAndCreateProject() { - if (!projectHelper.projectExists(getProjectName())) { - projectHelper.createCDIProject(getProjectName()); - } - } - - @BeforeClass - public static void setup() { - problems.show(); - } - - - /** - * checkQuickFix is the most important method in this class. It - * gets validation error prior to component type and annotation type, - * then it resolve validation error through quick fix - * wizard and finally check if validation errors was fixed through - * this wizard - * @param annonType - * @param compType - */ - public void checkQuickFix(CDIAnnotationsType annonType, CDIWizardType compType) { - SWTBotTreeItem validationProblem = getProblem(annonType, compType); - assertNotNull(validationProblem); - resolveQuickFix(validationProblem); - validationProblem = getProblem(annonType, compType); - assertNull(validationProblem); - } - - /** - * Methods gets the particular validation problem located in Problems View by - * using specific ValidationErrorsProvider - * @param annonType - * @param compType - * @return - */ - private SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) { - switch (compType) { - case STEREOTYPE: - validationErrorsProvider = new StereotypeValidationProvider(); - break; - case QUALIFIER: - validationErrorsProvider = new QualifierValidationProvider(); - break; - case SCOPE: - validationErrorsProvider = new ScopeValidationProvider(); - break; - case BEAN: - validationErrorsProvider = new BeanValidationProvider(); - break; - case INTERCEPTOR: - validationErrorsProvider = new InterceptorValidationProvider(); - break; - case DECORATOR: - validationErrorsProvider = new DecoratorValidationProvider(); - break; - case INTERCEPTOR_BINDING: - validationErrorsProvider = new InterceptorBindingValidationProvider(); - break; - } - ArrayList<String> validationProblems = null; - SWTBotTreeItem[] problemsInProblemsView = null; - if (validationErrorsProvider.getAllWarningsAnnotation().contains(annonType)) { - validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(annonType); - problemsInProblemsView = getProblems(ProblemsType.WARNINGS); - } else { - validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(annonType); - problemsInProblemsView = getProblems(ProblemsType.ERRORS); - } - for (SWTBotTreeItem ti: problemsInProblemsView) { - for (String validationProblem: validationProblems) { - if (ti.getText().contains(validationProblem)) { - return ti; - } - } - } - return null; - } - - /** - * Method resolves particular validation problem (parameter ti). - * It simply open context menu for param "ti", open menu "Quick Fix" and - * chooses first option and confirms it (resolve it) - * - * @param ti - */ - private void resolveQuickFix(SWTBotTreeItem ti) { - openQuickFix(ti); - - QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); - - SWTBotTableItem firstFix = qfWizard.getFixes()[0]; - SWTBotTableItem firstResource = qfWizard.getResources()[0]; - - qfWizard.setFix(firstFix).setResource(firstResource).finish(); - - util.waitForNonIgnoredJobs(); - } - - /** - * Method resolves one validation problem in one test case in - * BeanValidationQuickFixTest - it is too specific method, not usable - * in general, only in this case - */ - public void resolveMultipleBeans() { - - SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, - CDIWizardType.BEAN); - - openQuickFix(validationProblem); - int indexOfAnimalBean = 0; - if (!bot.table(0).cell(0, 0).contains("Animal")) { - indexOfAnimalBean++; - } - - bot.table(0).click(indexOfAnimalBean, 0); - bot.table(1).getTableItem(0).check(); - bot.activeShell().bot().button("Finish").click(); - bot.sleep(Timing.time1S()); - util.waitForNonIgnoredJobs(); - - bot.table(0).click(bot.table(0).indexOf("Q1 - " + getPackageName()), 0); - bot.clickButton("Add >"); - bot.clickButton("Finish"); - bot.sleep(Timing.time1S()); - util.waitForNonIgnoredJobs(); - } - - /** - * Method checks if specific validation problem was resolved by - * quick fix - not usable in general, only in this case - */ - public void checkMultipleBean() { - String code = getEd().toTextEditor().getText(); - assertTrue(code.contains("@Inject @Q1 private Animal animal;")); - code = bot.editorByTitle("Animal.java").toTextEditor().getText(); - assertTrue(code.contains("@Q1")); - } - - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,80 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Scope component - * - * @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 ScopeValidationQuickFixTest extends QuickFixTestBase { - - @Override - public String getProjectName() { - return "CDIQuickFixScopeTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7633 - @Test - public void testTargetAnnotation() { - - String className = "Scope1"; - - wizard.createCDIComponent(CDIWizardType.SCOPE, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", - "@Target({ TYPE, FIELD })"); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.SCOPE); - - editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.SCOPE); - } - - // https://issues.jboss.org/browse/JBIDE-7631 - @Test - public void testRetentionAnnotation() { - - String className = "Scope2"; - - wizard.createCDIComponent(CDIWizardType.SCOPE, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.SCOPE); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.SCOPE); - - } - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,110 +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; - - -import org.jboss.tools.cdi.bot.test.CDIAllBotTests; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -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 CDI Stereotype component - * - * @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 StereotypeValidationQuickFixTest extends QuickFixTestBase { - - @Override - public String getProjectName() { - return "CDIQuickFixStereotypeTest"; - } - - // https://issues.jboss.org/browse/JBIDE-7630 - @Test - public void testTargetAnnotation() { - - String className = "Stereotype1"; - - wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", - "@Target({ TYPE, FIELD })"); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.STEREOTYPE); - - editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); - - checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.STEREOTYPE); - } - - // https://issues.jboss.org/browse/JBIDE-7631 - @Test - public void testRetentionAnnotation() { - - String className = "Stereotype2"; - - wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.STEREOTYPE); - - editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); - - checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.STEREOTYPE); - - } - - // https://issues.jboss.org/browse/JBIDE-7634 - @Test - public void testNamedAnnotation() { - - String className = "Stereotype3"; - - wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, - getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithNamed.java.cdi"); - - editResourceUtil.replaceInEditor("StereotypeComponent", className); - - checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.STEREOTYPE); - - } - - // https://issues.jboss.org/browse/JBIDE-7640 - @Test - public void testTypedAnnotation() { - - String className = "Stereotype4"; - - wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, - getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithTyped.java.cdi"); - - editResourceUtil.replaceInEditor("StereotypeComponent", className); - - checkQuickFix(CDIAnnotationsType.TYPED, CDIWizardType.STEREOTYPE); - - } - -} Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,192 @@ +/******************************************************************************* + * 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 java.util.ArrayList; + +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.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; +import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider; +import org.jboss.tools.cdi.bot.test.quickfix.validators.QualifierValidationProvider; +import org.jboss.tools.cdi.bot.test.quickfix.validators.ScopeValidationProvider; +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; + +/** + * Test base for all QuickFix-like tests + * + * @author Jaroslav Jankovic + */ + +public class QuickFixTestBase extends QuickFixHelper { + + @Override + public void checkAndCreateProject() { + if (!projectHelper.projectExists(getProjectName())) { + projectHelper.createCDIProject(getProjectName()); + } + } + + @BeforeClass + public static void setup() { + problems.show(); + } + + + /** + * checkQuickFix is the most important method in this class. It + * gets validation error prior to component type and annotation type, + * then it resolve validation error through quick fix + * wizard and finally check if validation errors was fixed through + * this wizard + * @param annonType + * @param compType + */ + public void checkQuickFix(CDIAnnotationsType annonType, CDIWizardType compType) { + SWTBotTreeItem validationProblem = getProblem(annonType, compType); + assertNotNull(validationProblem); + resolveQuickFix(validationProblem); + validationProblem = getProblem(annonType, compType); + assertNull(validationProblem); + } + + /** + * Methods gets the particular validation problem located in Problems View by + * using specific ValidationErrorsProvider + * @param annonType + * @param compType + * @return + */ + private SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) { + switch (compType) { + case STEREOTYPE: + validationErrorsProvider = new StereotypeValidationProvider(); + break; + case QUALIFIER: + validationErrorsProvider = new QualifierValidationProvider(); + break; + case SCOPE: + validationErrorsProvider = new ScopeValidationProvider(); + break; + case BEAN: + validationErrorsProvider = new BeanValidationProvider(); + break; + case INTERCEPTOR: + validationErrorsProvider = new InterceptorValidationProvider(); + break; + case DECORATOR: + validationErrorsProvider = new DecoratorValidationProvider(); + break; + case INTERCEPTOR_BINDING: + validationErrorsProvider = new InterceptorBindingValidationProvider(); + break; + } + ArrayList<String> validationProblems = null; + SWTBotTreeItem[] problemsInProblemsView = null; + if (validationErrorsProvider.getAllWarningsAnnotation().contains(annonType)) { + validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(annonType); + problemsInProblemsView = getProblems(ProblemsType.WARNINGS); + } else { + validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(annonType); + problemsInProblemsView = getProblems(ProblemsType.ERRORS); + } + for (SWTBotTreeItem ti: problemsInProblemsView) { + for (String validationProblem: validationProblems) { + if (ti.getText().contains(validationProblem)) { + return ti; + } + } + } + return null; + } + + /** + * Method resolves particular validation problem (parameter ti). + * It simply open context menu for param "ti", open menu "Quick Fix" and + * chooses first option and confirms it (resolve it) + * @param ti + */ + private void resolveQuickFix(SWTBotTreeItem ti) { + openQuickFix(ti); + + QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); + + String firstFix = qfWizard.getAvailableFixes().get(0); + String firstResource = qfWizard.getResources().get(0); + + qfWizard.setFix(firstFix).setResource(firstResource).finish(); + + 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/ProblemEligibleInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,135 @@ +/******************************************************************************* + * 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.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; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +@Require(clearProjects = true, perspective = "Java EE", + server = @Server(state = ServerState.NotRunning, + version = "6.0", operator = ">=")) +(a)RunWith(RequirementAwareSuite.class) +@SuiteClasses({ CDIAllBotTests.class }) +public class ProblemEligibleInjectionTest extends QuickFixTestBase { + + @Override + public String getProjectName() { + return "CDIMultipleInjections"; + } + + @After + public void waitForJobs() { + editResourceUtil.deletePackage(getProjectName(), getPackageName()); + util.waitForNonIgnoredJobs(); + } + + @Test + public void testMultipleBeansAddingExistingQualifier() { + String animalClassName = "Animal"; + String dogClassName = "Dog"; + String brokenFarmClassName = "BrokenFarm"; + String qualifierClassName = "Q1"; + + wizard.createCDIComponent(CDIWizardType.QUALIFIER, qualifierClassName, + getPackageName(), null); + + wizard.createCDIComponent(CDIWizardType.BEAN, animalClassName, + getPackageName(), null); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, dogClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/addQualifier/Dog.java.cdi"); + + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, brokenFarmClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/addQualifier/BrokenFarm.java.cdi"); + + resolveMultipleBeans(dogClassName, qualifierClassName, QualifierOperation.ADD); + + String code = bot.editorByTitle(brokenFarmClassName + ".java"). + toTextEditor().getText(); + assertTrue(code.contains("@Inject @" + qualifierClassName)); + code = bot.editorByTitle(dogClassName + ".java").toTextEditor().getText(); + assertTrue(code.contains("@" + qualifierClassName)); + } + + @Test + public void testMultipleBeansRemovingExistingQualifier() { + String animalClassName = "Animal"; + String dogClassName = "Dog"; + String brokenFarmClassName = "BrokenFarm"; + String qualifierClassName = "Q1"; + + wizard.createCDIComponent(CDIWizardType.QUALIFIER, qualifierClassName, + getPackageName(), null); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, animalClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/removeQualifier/Animal.java.cdi"); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, dogClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/removeQualifier/Dog.java.cdi"); + + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, brokenFarmClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/removeQualifier/BrokenFarm.java.cdi"); + + resolveMultipleBeans(dogClassName, qualifierClassName, QualifierOperation.REMOVE); + + String code = bot.editorByTitle(brokenFarmClassName + ".java"). + toTextEditor().getText(); + assertTrue(code.contains("@Inject private")); + code = bot.editorByTitle(dogClassName + ".java").toTextEditor().getText(); + assertTrue(!code.contains("@" + qualifierClassName)); + } + + @Test + public void testMultipleBeansAddingNonExistingQualifier() { + String animalClassName = "Animal"; + String dogClassName = "Dog"; + String brokenFarmClassName = "BrokenFarm"; + String qualifierClassName = "Q1"; + + wizard.createCDIComponent(CDIWizardType.BEAN, animalClassName, + getPackageName(), null); + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, dogClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/addQualifier/Dog.java.cdi"); + + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, brokenFarmClassName, + getPackageName(), null, "/resources/quickfix/" + + "injection/addQualifier/BrokenFarm.java.cdi"); + + resolveMultipleBeans(dogClassName, qualifierClassName, QualifierOperation.ADD); + + String code = bot.editorByTitle(brokenFarmClassName + ".java"). + toTextEditor().getText(); + assertTrue(code.contains("@Inject @" + qualifierClassName)); + code = bot.editorByTitle(dogClassName + ".java").toTextEditor().getText(); + assertTrue(code.contains("@" + qualifierClassName)); + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/QualifierOperation.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/QualifierOperation.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/QualifierOperation.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,7 @@ +package org.jboss.tools.cdi.bot.test.quickfix.injection; + +public enum QualifierOperation { + + ADD, REMOVE + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,172 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI bean component + * + * @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 BeanValidationQuickFixTest extends QuickFixTestBase { + + + @Override + public String getProjectName() { + return "CDIQuickFixBeanTest"; + } + + // https://issues.jboss.org/browse/JBIDE-8550 + @Test + public void testSerializableManagedBean() { + + String className = "ManagedBean"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/SerializableBean.java.cdi"); + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.SERIALIZABLE, CDIWizardType.BEAN); + + } + + + // https://issues.jboss.org/browse/JBIDE-7664 + @Test + public void testConstructor() { + + String className = "Bean1"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ConstructorWithParam.java.cdi"); + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); + + editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + .getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false); + + editResourceUtil.replaceInEditor("@Disposes", "@Observes"); + editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", + "import javax.enterprise.event.Observes;"); + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); + } + + // https://issues.jboss.org/browse/JBIDE-7665 + @Test + public void testProducer() { + + String className = "Bean2"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ProducerWithParam.java.cdi"); + + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); + + editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class + .getResourceAsStream("/resources/quickfix/bean/ProducerWithParam.java.cdi"), false); + editResourceUtil.replaceInEditor("BeanComponent", className); + + editResourceUtil.replaceInEditor("@Disposes", "@Observes"); + editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", + "import javax.enterprise.event.Observes;"); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); + + } + + // https://issues.jboss.org/browse/JBIDE-7667 + @Test + public void testInjectDisposer() { + + String className = "Bean3"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.BEAN); + + } + + // https://issues.jboss.org/browse/JBIDE-7667 + @Test + public void testInjectObserver() { + + String className = "Bean4"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", + "import javax.enterprise.event.Observes;"); + editResourceUtil.replaceInEditor("@Disposes", "@Observes"); + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); + + } + + // https://issues.jboss.org/browse/JBIDE-7667 + @Test + public void testInjectProducer() { + + String className = "Bean5"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/BeanInjectProducer.java.cdi"); + + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.BEAN); + + } + + // https://issues.jboss.org/browse/JBIDE-7668 + @Test + public void testObserverWithDisposer() { + + String className = "Bean6"; + + wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className, + getPackageName(), null, "/resources/quickfix/bean/ObserverWithDisposer.java.cdi"); + + editResourceUtil.replaceInEditor("BeanComponent", className); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.BEAN); + + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,145 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Decorator component + * + * @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 DecoratorValidationQuickFixTest extends QuickFixTestBase { + + + @Override + public String getProjectName() { + return "CDIQuickFixDecoratorTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7680 + @Test + public void testSessionAnnotation() { + + String className = "Decorator1"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithStateless.java.cdi"); + + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.DECORATOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7636 + @Test + public void testNamedAnnotation() { + + String className = "Decorator2"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithNamed.java.cdi"); + + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.DECORATOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7683 + @Test + public void testProducer() { + + String className = "Decorator3"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithProducer.java.cdi"); + + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.DECORATOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7684 + @Test + public void testDisposesAnnotation() { + + String className = "Decorator4"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.DECORATOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7685 + @Test + public void testObservesAnnotation() { + + String className = "Decorator5"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", + "import javax.enterprise.event.Observes;"); + editResourceUtil.replaceInEditor("@Disposes", "@Observes"); + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.DECORATOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7686 + @Test + public void testSpecializesAnnotation() { + + String className = "Decorator6"; + + wizard.createCDIComponentWithContent(CDIWizardType.DECORATOR, className, + getPackageName(), "java.util.set", "/resources/quickfix/decorator/" + + "DecoratorWithSpecializes.java.cdi"); + + editResourceUtil.replaceInEditor("DecoratorComponent", className); + + checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.DECORATOR); + + } + +} \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,66 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Interceptor Binding component + * + * @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 IBindingValidationQuickFixTest extends QuickFixTestBase { + + + @Override + public String getProjectName() { + return "CDIQuickFixIBindingTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7641 + @Test + public void testNonbindingAnnotation() { + + String className = "IBinding1"; + + wizard.createAnnotation("AAnnotation", getPackageName()); + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR_BINDING, + className, getPackageName(), null, "/resources/quickfix/interceptorBinding/" + + "IBindingWithAnnotation.java.cdi"); + + editResourceUtil.replaceInEditor("IBindingComponent", className); + + checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.INTERCEPTOR_BINDING); + + editResourceUtil.replaceInEditor("@Nonbinding AAnnotation", "String[]"); + + checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.INTERCEPTOR_BINDING); + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,145 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Interceptor component + * + * @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 InterceptorValidationQuickFixTest extends QuickFixTestBase { + + + @Override + public String getProjectName() { + return "CDIQuickFixInterceptorTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7680 + @Test + public void testSessionAnnotation() { + + String className = "Interceptor1"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithStateless.java.cdi"); + + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.STATELESS, CDIWizardType.INTERCEPTOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7636 + @Test + public void testNamedAnnotation() { + + String className = "Interceptor2"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithNamed.java.cdi"); + + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.INTERCEPTOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7683 + @Test + public void testProducer() { + + String className = "Interceptor3"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithProducer.java.cdi"); + + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.PRODUCES, CDIWizardType.INTERCEPTOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7684 + @Test + public void testDisposesAnnotation() { + + String className = "Interceptor4"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.DISPOSES, CDIWizardType.INTERCEPTOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7685 + @Test + public void testObservesAnnotation() { + + String className = "Interceptor5"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithDisposes.java.cdi"); + + editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", + "import javax.enterprise.event.Observes;"); + editResourceUtil.replaceInEditor("@Disposes", "@Observes"); + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.OBSERVES, CDIWizardType.INTERCEPTOR); + + } + + // https://issues.jboss.org/browse/JBIDE-7686 + @Test + public void testSpecializesAnnotation() { + + String className = "Interceptor6"; + + wizard.createCDIComponentWithContent(CDIWizardType.INTERCEPTOR, className, + getPackageName(), null, "/resources/quickfix/interceptor/" + + "InterceptorWithSpecializes.java.cdi"); + + editResourceUtil.replaceInEditor("InterceptorComponent", className); + + checkQuickFix(CDIAnnotationsType.SPECIALIZES, CDIWizardType.INTERCEPTOR); + + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,100 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Qualifier component + * + * @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 QualifierValidationQuickFixTest extends QuickFixTestBase { + + @Override + public String getProjectName() { + return "CDIQuickFixQualifierTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7630 + @Test + public void testTargetAnnotation() { + + String className = "Qualifier1"; + + wizard.createCDIComponent(CDIWizardType.QUALIFIER, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, PARAMETER, FIELD })", + "@Target({ TYPE, FIELD })"); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.QUALIFIER); + + editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD, PARAMETER})", ""); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.QUALIFIER); + } + + // https://issues.jboss.org/browse/JBIDE-7631 + @Test + public void testRetentionAnnotation() { + + String className = "Qualifier2"; + + wizard.createCDIComponent(CDIWizardType.QUALIFIER, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.QUALIFIER); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.QUALIFIER); + + } + + // https://issues.jboss.org/browse/JBIDE-7641 + @Test + public void testNonbindingAnnotation() { + + String className = "Qualifier3"; + + wizard.createAnnotation("AAnnotation", getPackageName()); + wizard.createCDIComponentWithContent(CDIWizardType.QUALIFIER, className, + getPackageName(), null, "/resources/quickfix/" + + "qualifier/QualifierWithAnnotation.java.cdi"); + + editResourceUtil.replaceInEditor("QualifierComponent", className); + + checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.QUALIFIER); + + editResourceUtil.replaceInEditor("@Nonbinding AAnnotation", "String[]"); + + checkQuickFix(CDIAnnotationsType.NONBINDING, CDIWizardType.QUALIFIER); + } +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,81 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Scope component + * + * @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 ScopeValidationQuickFixTest extends QuickFixTestBase { + + @Override + public String getProjectName() { + return "CDIQuickFixScopeTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7633 + @Test + public void testTargetAnnotation() { + + String className = "Scope1"; + + wizard.createCDIComponent(CDIWizardType.SCOPE, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", + "@Target({ TYPE, FIELD })"); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.SCOPE); + + editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.SCOPE); + } + + // https://issues.jboss.org/browse/JBIDE-7631 + @Test + public void testRetentionAnnotation() { + + String className = "Scope2"; + + wizard.createCDIComponent(CDIWizardType.SCOPE, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.SCOPE); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.SCOPE); + + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -0,0 +1,111 @@ +/******************************************************************************* + * 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.CDIAnnotationsType; +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; +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 CDI Stereotype component + * + * @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 StereotypeValidationQuickFixTest extends QuickFixTestBase { + + @Override + public String getProjectName() { + return "CDIQuickFixStereotypeTest"; + } + + // https://issues.jboss.org/browse/JBIDE-7630 + @Test + public void testTargetAnnotation() { + + String className = "Stereotype1"; + + wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", + "@Target({ TYPE, FIELD })"); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.STEREOTYPE); + + editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", ""); + + checkQuickFix(CDIAnnotationsType.TARGET, CDIWizardType.STEREOTYPE); + } + + // https://issues.jboss.org/browse/JBIDE-7631 + @Test + public void testRetentionAnnotation() { + + String className = "Stereotype2"; + + wizard.createCDIComponent(CDIWizardType.STEREOTYPE, className, getPackageName(), null); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)"); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.STEREOTYPE); + + editResourceUtil.replaceInEditor("@Retention(RUNTIME)", ""); + + checkQuickFix(CDIAnnotationsType.RETENTION, CDIWizardType.STEREOTYPE); + + } + + // https://issues.jboss.org/browse/JBIDE-7634 + @Test + public void testNamedAnnotation() { + + String className = "Stereotype3"; + + wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, + getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithNamed.java.cdi"); + + editResourceUtil.replaceInEditor("StereotypeComponent", className); + + checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.STEREOTYPE); + + } + + // https://issues.jboss.org/browse/JBIDE-7640 + @Test + public void testTypedAnnotation() { + + String className = "Stereotype4"; + + wizard.createCDIComponentWithContent(CDIWizardType.STEREOTYPE, className, + getPackageName(), null, "/resources/quickfix/stereotype/StereotypeWithTyped.java.cdi"); + + editResourceUtil.replaceInEditor("StereotypeComponent", className); + + checkQuickFix(CDIAnnotationsType.TYPED, CDIWizardType.STEREOTYPE); + + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -135,10 +135,13 @@ * @param packageName */ public void deletePackage(String projectName, String packageName) { - - String[] path = {projectName, "Java Resources", "JavaSource"}; - deleteFolderInProjectExplorer(packageName, path); - + if (projectExplorer.isFilePresent(projectName, "Java Resources", "JavaSource")) { + String[] path = {projectName, "Java Resources", "JavaSource", "src"}; + deleteFolderInProjectExplorer(packageName, path); + }else { + String[] path = {projectName, "Java Resources", "src"}; + deleteFolderInProjectExplorer(packageName, path); + } } /** Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -43,7 +43,7 @@ } public QuickFixDialogWizard setResource(String resource) { - bot().table(1).select(resource); + bot().table(1).getTableItem(resource).check(); return this; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -1,3 +1,14 @@ +/******************************************************************************* + * 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.uiutils.wizards; import java.util.ArrayList; Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-12-05 11:01:09 UTC (rev 36942) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-12-05 11:10:48 UTC (rev 36943) @@ -20,10 +20,10 @@ public class Wizard extends SWTBotShell { - private static final String NEXT = "Next >"; - private static final String BACK = "< Back"; - private static final String CANCEL = "Cancel"; - private static final String FINISH = "Finish"; + protected static final String NEXT = "Next >"; + protected static final String BACK = "< Back"; + protected static final String CANCEL = "Cancel"; + protected static final String FINISH = "Finish"; public Wizard(Shell shell) { super(shell);