Author: jjankovi Date: 2011-12-05 11:56:31 -0500 (Mon, 05 Dec 2011) New Revision: 36955 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java Log: BeansXMLValidationQuickFixTest added Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -18,6 +18,7 @@ import org.jboss.tools.cdi.bot.test.openon.OpenOnTest; import org.jboss.tools.cdi.bot.test.quickfix.injection.ProblemEligibleInjectionTest; import org.jboss.tools.cdi.bot.test.quickfix.test.BeanValidationQuickFixTest; +import org.jboss.tools.cdi.bot.test.quickfix.test.BeansXMLValidationQuickFixTest; import org.jboss.tools.cdi.bot.test.quickfix.test.DecoratorValidationQuickFixTest; import org.jboss.tools.cdi.bot.test.quickfix.test.IBindingValidationQuickFixTest; import org.jboss.tools.cdi.bot.test.quickfix.test.InterceptorValidationQuickFixTest; @@ -67,6 +68,7 @@ BeansXMLValidationTest.class, BeansXMLCompletionTest.class, ProblemEligibleInjectionTest.class, + BeansXMLValidationQuickFixTest.class, StereotypeValidationQuickFixTest.class, QualifierValidationQuickFixTest.class, ScopeValidationQuickFixTest.class, Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -0,0 +1,95 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.bot.test.quickfix.base; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBase; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; + +public class BeansXMLQuickFixTestBase extends QuickFixTestBase { + + private void openBeanXMLValidationProblem() { + + SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, + CDIWizardType.BEANS_XML); + + openQuickFix(validationProblem); + QuickFixDialogWizard qfWizard = new QuickFixDialogWizard(); + qfWizard.setFix(qfWizard.getAvailableFixes().get(0)); + qfWizard.setResource(qfWizard.getResources().get(0)); + qfWizard.finish(); + } + + public boolean isBeanXMLValidationProblemsEmpty() { + return getProblem(CDIAnnotationsType.INJECT, CDIWizardType.BEANS_XML) == null; + } + + public void resolveAddNewAlternative(String name, String pkg) { + + openBeanXMLValidationProblem(); + CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.BEAN); + if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) { + cdiWizardBase.setName(name).setPackage(pkg).finish(); + }else { + fail("Dialog can't be finished"); + } + + } + + public void resolveAddNewStereotype(String name, String pkg) { + + openBeanXMLValidationProblem(); + CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.STEREOTYPE); + if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) { + cdiWizardBase.setName(name).setPackage(pkg).finish(); + }else { + fail("Dialog can't be finished"); + } + + } + + public void resolveAddNewDecorator(String name, String pkg) { + + openBeanXMLValidationProblem(); + CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.DECORATOR); + cdiWizardBase.addInterface("java.util.List"); + if (cdiWizardBase.canFinish()) { + cdiWizardBase.setName(name).setPackage(pkg).finish(); + } else { + fail("Dialog can't be finished"); + } + + } + + public void resolveAddNewInterceptor(String name, String pkg) { + + openBeanXMLValidationProblem(); + CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.INTERCEPTOR); + if (cdiWizardBase.canFinish()) { + cdiWizardBase.setName(name).setPackage(pkg).finish(); + }else { + fail("Dialog can't be finished"); + } + + } + + public void resolveAddAlternativeToExistingComponent(String name, String pkg) { + + openBeanXMLValidationProblem(); + String content = bot.editorByTitle(name + ".java").toTextEditor().getText(); + assertTrue(content.contains("@Alternative")); + + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.bot.test.quickfix.base; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard; +import org.jboss.tools.ui.bot.ext.Timing; + +public class EligibleInjectionQuickFixTestBase extends QuickFixTestBase{ + + /** + * Method resolves multiple bean injection problem. By setting class which + * should be more qualified and qualifier name it resolves this problem. + * If qualifier doesn't exist, by using qualifier wizard it creates the new + * one and uses it to resolve problem + * @param classToQualify + * @param qualifier + */ + public void resolveMultipleBeans(String classToQualify, String qualifier, + QualifierOperation operation) { + + SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, + CDIWizardType.BEAN); + + openQuickFix(validationProblem); + QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard(); + for (String availableFix : quickFixWizard.getAvailableFixes()) { + if (availableFix.contains(classToQualify)) { + quickFixWizard.setFix(availableFix). + setResource(quickFixWizard.getResources().get(0)). + finish(); + } + } + + SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard(); + if (operation == QualifierOperation.ADD) { + for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) { + if (availQualifer.equals(qualifier + " - " + getPackageName())) { + spBeanDialogWizard.addQualifier(availQualifer); + } + } + // there was no such qualifer, it has to be created + if (!spBeanDialogWizard.canFinish()) { + spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()). + setName(qualifier).finish(); + } + } else { + for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) { + if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) { + spBeanDialogWizard.removeQualifier(inBeanQualifer); + } + } + } + + spBeanDialogWizard.finish(); + + bot.sleep(Timing.time1S()); + util.waitForNonIgnoredJobs(); + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -19,6 +19,7 @@ import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ProblemsType; import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider; +import org.jboss.tools.cdi.bot.test.quickfix.validators.BeansXmlValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider; @@ -97,6 +98,9 @@ case INTERCEPTOR_BINDING: validationErrorsProvider = new InterceptorBindingValidationProvider(); break; + case BEANS_XML: + validationErrorsProvider = new BeansXmlValidationProvider(); + break; } ArrayList<String> validationProblems = null; SWTBotTreeItem[] problemsInProblemsView = null; Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.cdi.bot.test.quickfix.injection; - -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; -import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; -import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; -import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard; -import org.jboss.tools.ui.bot.ext.Timing; - -public class EligibleInjectionTestBase extends QuickFixTestBase{ - - /** - * Method resolves multiple bean injection problem. By setting class which - * should be more qualified and qualifier name it resolves this problem. - * If qualifier doesn't exist, by using qualifier wizard it creates the new - * one and uses it to resolve problem - * @param classToQualify - * @param qualifier - */ - public void resolveMultipleBeans(String classToQualify, String qualifier, - QualifierOperation operation) { - - SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, - CDIWizardType.BEAN); - - openQuickFix(validationProblem); - QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard(); - for (String availableFix : quickFixWizard.getAvailableFixes()) { - if (availableFix.contains(classToQualify)) { - quickFixWizard.setFix(availableFix). - setResource(quickFixWizard.getResources().get(0)). - finish(); - } - } - - SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard(); - if (operation == QualifierOperation.ADD) { - for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) { - if (availQualifer.equals(qualifier + " - " + getPackageName())) { - spBeanDialogWizard.addQualifier(availQualifer); - } - } - // there was no such qualifer, it has to be created - if (!spBeanDialogWizard.canFinish()) { - spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()). - setName(qualifier).finish(); - } - } else { - for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) { - if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) { - spBeanDialogWizard.removeQualifier(inBeanQualifer); - } - } - } - - spBeanDialogWizard.finish(); - - bot.sleep(Timing.time1S()); - util.waitForNonIgnoredJobs(); - } - -} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -13,6 +13,7 @@ import org.jboss.tools.cdi.bot.test.CDIAllBotTests; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.quickfix.base.EligibleInjectionQuickFixTestBase; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; @@ -27,7 +28,7 @@ version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) -public class ProblemEligibleInjectionTest extends EligibleInjectionTestBase { +public class ProblemEligibleInjectionTest extends EligibleInjectionQuickFixTestBase { private final String ANIMAL = "Animal"; private final String DOG = "Dog"; Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.bot.test.quickfix.test; + +import org.jboss.tools.cdi.bot.test.CDIAllBotTests; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.quickfix.base.BeansXMLQuickFixTestBase; +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +/** + * Test operates on quick fixes used for validation errors of beans.xml + * + * @author Jaroslav Jankovic + */ + +@Require(clearProjects = true, perspective = "Java EE", + server = @Server(state = ServerState.NotRunning, + version = "6.0", operator = ">=")) +(a)RunWith(RequirementAwareSuite.class) +@SuiteClasses({ CDIAllBotTests.class }) +public class BeansXMLValidationQuickFixTest extends BeansXMLQuickFixTestBase { + + @Override + public String getProjectName() { + return "CDIQuickFixBeanXMLTest"; + } + + @Test + public void testNoBeanComponent() { + + String bean = "A1"; + beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), bean); + + resolveAddNewAlternative(bean, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + } + + @Test + public void testNoStereotypeAnnotation() { + + String stereotype = "S1"; + beansHelper.createBeansXMLWithStereotype(getProjectName(), getPackageName(), stereotype); + + resolveAddNewStereotype(stereotype, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + + } + + @Test + public void testNoAlternativeBeanComponent() { + + String bean = "B1"; + + wizard.createCDIComponent(CDIWizardType.BEAN, bean, getPackageName(), null); + + beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), bean); + + resolveAddAlternativeToExistingComponent(bean, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + + } + + @Test + public void testNoAlternativeStereotypeAnnotation() { + + String stereotype = "S2"; + + wizard.createCDIComponent(CDIWizardType.STEREOTYPE, stereotype, getPackageName(), null); + + beansHelper.createBeansXMLWithStereotype(getProjectName(), getPackageName(), stereotype); + + resolveAddAlternativeToExistingComponent(stereotype, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + + } + + @Test + public void testNoInterceptor() { + + String interceptor = "I1"; + beansHelper.createBeansXMLWithInterceptor(getProjectName(), + getPackageName(), interceptor); + + resolveAddNewInterceptor(interceptor, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + + } + + @Test + public void testNoDecorator() { + + String decorator = "D1"; + beansHelper.createBeansXMLWithDecorator(getProjectName(), getPackageName(), decorator); + + resolveAddNewDecorator(decorator, getPackageName()); + + assertTrue(isBeanXMLValidationProblemsEmpty()); + + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/InterceptorBindingValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -33,16 +33,7 @@ public ArrayList<String> getAllWarningForAnnotationType( CDIAnnotationsType annotationType) { - int warningIndex = 0; - switch(annotationType) { - case NONBINDING: - warningIndex = 0; - warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex)); - warningIndex = 1; - break; - } - warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex)); - return warningsForAnnotationType; + return validationErrors.get("Warnings"); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/QualifierValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -39,22 +39,7 @@ public ArrayList<String> getAllWarningForAnnotationType( CDIAnnotationsType annotationType) { - int warningIndex = 0; - switch(annotationType) { - case RETENTION: - warningIndex = 0; - break; - case TARGET: - warningIndex = 1; - break; - case NONBINDING: - warningIndex = 2; - warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex)); - warningIndex = 3; - break; - } - warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex)); - return warningsForAnnotationType; + return validationErrors.get("Warnings"); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java 2011-12-05 16:34:07 UTC (rev 36954) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/validators/ScopeValidationProvider.java 2011-12-05 16:56:31 UTC (rev 36955) @@ -34,17 +34,7 @@ public ArrayList<String> getAllWarningForAnnotationType( CDIAnnotationsType annotationType) { - int warningIndex = 0; - switch(annotationType) { - case RETENTION: - warningIndex = 0; - break; - case TARGET: - warningIndex = 1; - break; - } - warningsForAnnotationType.add(validationErrors.get("Warnings").get(warningIndex)); - return warningsForAnnotationType; + return validationErrors.get("Warnings"); } }