[jbosstools-commits] JBoss Tools SVN: r36952 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix/base and 1 other directories.

Author: jjankovi Date: 2011-12-05 07:50:47 -0500 (Mon, 05 Dec 2011) New Revision: 36952 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java Log: Creating new EligibleInjectionTestBase Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 12:47:20 UTC (rev 36951) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-05 12:50:47 UTC (rev 36952) @@ -51,7 +51,7 @@ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22 * * - * Suite duration: aprox. 25min + * Suite duration: aprox. 27min * * @author Lukas Jungmann * @author Jaroslav Jankovic Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 12:47:20 UTC (rev 36951) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-05 12:50:47 UTC (rev 36952) @@ -18,7 +18,6 @@ import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; import org.jboss.tools.cdi.bot.test.annotations.ProblemsType; -import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation; import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider; import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider; @@ -28,8 +27,6 @@ import org.jboss.tools.cdi.bot.test.quickfix.validators.StereotypeValidationProvider; import org.jboss.tools.cdi.bot.test.uiutils.QuickFixHelper; import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; -import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard; -import org.jboss.tools.ui.bot.ext.Timing; import org.junit.BeforeClass; /** @@ -77,7 +74,7 @@ * @param compType * @return */ - private SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) { + protected SWTBotTreeItem getProblem(CDIAnnotationsType annonType, CDIWizardType compType) { switch (compType) { case STEREOTYPE: validationErrorsProvider = new StereotypeValidationProvider(); @@ -139,54 +136,4 @@ util.waitForNonIgnoredJobs(); } - /** - * Method resolves multiple bean injection problem. By setting class which - * should be more qualified and qualifier name it resolves this problem. - * If qualifier doesn't exist, by using qualifier wizard it creates the new - * one and uses it to resolve problem - * @param classToQualify - * @param qualifier - */ - public void resolveMultipleBeans(String classToQualify, String qualifier, - QualifierOperation operation) { - - SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, - CDIWizardType.BEAN); - - openQuickFix(validationProblem); - QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard(); - for (String availableFix : quickFixWizard.getAvailableFixes()) { - if (availableFix.contains(classToQualify)) { - quickFixWizard.setFix(availableFix). - setResource(quickFixWizard.getResources().get(0)). - finish(); - } - } - - SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard(); - if (operation == QualifierOperation.ADD) { - for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) { - if (availQualifer.equals(qualifier + " - " + getPackageName())) { - spBeanDialogWizard.addQualifier(availQualifer); - } - } - // there was no such qualifer, it has to be created - if (!spBeanDialogWizard.canFinish()) { - spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()). - setName(qualifier).finish(); - } - } else { - for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) { - if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) { - spBeanDialogWizard.removeQualifier(inBeanQualifer); - } - } - } - - spBeanDialogWizard.finish(); - - bot.sleep(Timing.time1S()); - util.waitForNonIgnoredJobs(); - } - } Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/EligibleInjectionTestBase.java 2011-12-05 12:50:47 UTC (rev 36952) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.bot.test.quickfix.injection; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard; +import org.jboss.tools.ui.bot.ext.Timing; + +public class EligibleInjectionTestBase extends QuickFixTestBase{ + + /** + * Method resolves multiple bean injection problem. By setting class which + * should be more qualified and qualifier name it resolves this problem. + * If qualifier doesn't exist, by using qualifier wizard it creates the new + * one and uses it to resolve problem + * @param classToQualify + * @param qualifier + */ + public void resolveMultipleBeans(String classToQualify, String qualifier, + QualifierOperation operation) { + + SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT, + CDIWizardType.BEAN); + + openQuickFix(validationProblem); + QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard(); + for (String availableFix : quickFixWizard.getAvailableFixes()) { + if (availableFix.contains(classToQualify)) { + quickFixWizard.setFix(availableFix). + setResource(quickFixWizard.getResources().get(0)). + finish(); + } + } + + SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard(); + if (operation == QualifierOperation.ADD) { + for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) { + if (availQualifer.equals(qualifier + " - " + getPackageName())) { + spBeanDialogWizard.addQualifier(availQualifer); + } + } + // there was no such qualifer, it has to be created + if (!spBeanDialogWizard.canFinish()) { + spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()). + setName(qualifier).finish(); + } + } else { + for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) { + if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) { + spBeanDialogWizard.removeQualifier(inBeanQualifer); + } + } + } + + spBeanDialogWizard.finish(); + + bot.sleep(Timing.time1S()); + util.waitForNonIgnoredJobs(); + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 12:47:20 UTC (rev 36951) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-05 12:50:47 UTC (rev 36952) @@ -13,7 +13,6 @@ import org.jboss.tools.cdi.bot.test.CDIAllBotTests; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; @@ -28,7 +27,7 @@ version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) -public class ProblemEligibleInjectionTest extends QuickFixTestBase { +public class ProblemEligibleInjectionTest extends EligibleInjectionTestBase { private final String ANIMAL = "Animal"; private final String DOG = "Dog";