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

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed Jun 13 04:17:19 EDT 2012


Author: jjankovi
Date: 2012-06-13 04:17:19 -0400 (Wed, 13 Jun 2012)
New Revision: 41920

Removed:
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java
Modified:
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java
   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
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java
   trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java
Log:
quick fix bot test for cdi refactored

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -67,11 +67,13 @@
 		
 		beansHelper.createBeansXMLWithInterceptor(getProjectName(), nonExistingPackage, className);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_CLASS));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, 
+				getProjectName(), getValidationProvider()));
 		
 		beansHelper.createBeansXMLWithInterceptor(getProjectName(), getPackageName(), someBean);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_INTERCEPTOR));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_INTERCEPTOR, 
+				getProjectName(), getValidationProvider()));
 		
 	}
 	
@@ -93,11 +95,13 @@
 		
 		beansHelper.createBeansXMLWithDecorator(getProjectName(), nonExistingPackage, className);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_CLASS));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, 
+				getProjectName(), getValidationProvider()));
 		
 		beansHelper.createBeansXMLWithDecorator(getProjectName(), getPackageName(), someBean);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_DECORATOR));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_DECORATOR, 
+				getProjectName(), getValidationProvider()));
 	}
 	
 	@Test
@@ -118,11 +122,13 @@
 		
 		beansHelper.createBeansXMLWithAlternative(getProjectName(), nonExistingPackage, className);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_CLASS));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_CLASS, 
+				getProjectName(), getValidationProvider()));
 		
 		beansHelper.createBeansXMLWithAlternative(getProjectName(), getPackageName(), someBean);
 		assertFalse(isBeanXMLValidationErrorEmpty());
-		assertNotNull(getProblem(ValidationType.NO_ALTERNATIVE));
+		assertNotNull(quickFixHelper.getProblem(ValidationType.NO_ALTERNATIVE, 
+				getProjectName(), getValidationProvider()));
 		
 	}
 	

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,6 +12,7 @@
 package org.jboss.tools.cdi.bot.test.quickfix.base;
 
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.BeansXmlValidationProvider;
@@ -20,32 +21,15 @@
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
 import org.jboss.tools.ui.bot.ext.view.ProblemsView;
 
-public class BeansXMLQuickFixTestBase extends QuickFixTestBase {
+public class BeansXMLQuickFixTestBase extends CDITestBase {
 
-	private static IValidationProvider validationProvider = new BeansXmlValidationProvider();
+	private IValidationProvider validationProvider = new BeansXmlValidationProvider();
 	
-	public IValidationProvider validationProvider() {
+	public IValidationProvider getValidationProvider() {
 		return validationProvider;
 	}
 	
 	/**
-	 * Method firstly gets beans.xml validation problem. Then
-	 * it opens quick fix wizard, selects default value and
-	 * press finishWithWait button
-	 */
-	private void openBeanXMLValidationProblem(ValidationType validationProblemType) {
-		
-		SWTBotTreeItem validationProblem = getProblem(validationProblemType);		
-		assertNotNull(validationProblem);
-		
-		quickFixHelper.openQuickFix(validationProblem);	
-		QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
-		qfWizard.setFix(qfWizard.getAvailableFixes().get(0));
-		qfWizard.setResource(qfWizard.getResources().get(0));
-		qfWizard.finishWithWait();
-	}
-	
-	/**
 	 * Method checks if there is no beans.xml validation error
 	 * @return
 	 */
@@ -64,7 +48,7 @@
 	 */
 	public void resolveAddNewAlternative(String name, String pkg) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_CLASS);
+		openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName());
 		CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.BEAN);
 		if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) {
 			cdiWizardBase.setName(name).setPackage(pkg).finishWithWait();
@@ -84,7 +68,7 @@
 	 */
 	public void resolveAddNewStereotype(String name, String pkg) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_ANNOTATION);
+		openBeanXMLValidationProblem(ValidationType.NO_ANNOTATION, getProjectName());
 		CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.STEREOTYPE);
 		if (cdiWizardBase.isAlternative() && cdiWizardBase.canFinish()) {
 			cdiWizardBase.setName(name).setPackage(pkg).finishWithWait();
@@ -104,7 +88,7 @@
 	 */
 	public void resolveAddNewDecorator(String name, String pkg) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_CLASS);
+		openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName());
 		CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.DECORATOR);		
 		cdiWizardBase.addInterface("java.util.List");
 		if (cdiWizardBase.canFinish()) {
@@ -125,7 +109,7 @@
 	 */
 	public void resolveAddNewInterceptor(String name, String pkg) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_CLASS);
+		openBeanXMLValidationProblem(ValidationType.NO_CLASS, getProjectName());
 		CDIWizardBase cdiWizardBase = new CDIWizardBase(CDIWizardType.INTERCEPTOR);
 		if (cdiWizardBase.canFinish()) {
 			cdiWizardBase.setName(name).setPackage(pkg).finishWithWait();
@@ -143,7 +127,7 @@
 	 */
 	public void resolveAddAlternativeToBean(String name) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE);
+		openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE, getProjectName());
 		String content = bot.editorByTitle(name + ".java").toTextEditor().getText();
 		assertTrue(content.contains("@Alternative"));
 		
@@ -157,10 +141,28 @@
 	 */
 	public void resolveAddAlternativeToStereotype(String name) {
 		
-		openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE_STEREOTYPE);
+		openBeanXMLValidationProblem(ValidationType.NO_ALTERNATIVE_STEREOTYPE, getProjectName());
 		String content = bot.editorByTitle(name + ".java").toTextEditor().getText();
 		assertTrue(content.contains("@Alternative"));
 		
 	}
 	
+	/**
+	 * Method firstly gets beans.xml validation problem. Then
+	 * it opens quick fix wizard, selects default value and
+	 * press finishWithWait button
+	 */
+	private void openBeanXMLValidationProblem(ValidationType validationProblemType, String projectName) {
+		
+		SWTBotTreeItem validationProblem = quickFixHelper.getProblem(validationProblemType, 
+				projectName, validationProvider);		
+		assertNotNull(validationProblem);
+		
+		quickFixHelper.openQuickFix(validationProblem);	
+		QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
+		qfWizard.setFix(qfWizard.getAvailableFixes().get(0));
+		qfWizard.setResource(qfWizard.getResources().get(0));
+		qfWizard.finishWithWait();
+	}
+	
 }

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,6 +12,7 @@
 package org.jboss.tools.cdi.bot.test.quickfix.base;
 
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
 import org.jboss.tools.cdi.bot.test.quickfix.injection.QualifierOperation;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider;
@@ -20,7 +21,7 @@
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.SpecifyBeanDialogWizard;
 import org.jboss.tools.ui.bot.ext.Timing;
 
-public class EligibleInjectionQuickFixTestBase extends QuickFixTestBase{
+public class EligibleInjectionQuickFixTestBase extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new BeanValidationProvider();
 	
@@ -39,7 +40,8 @@
 	public void resolveMultipleBeans(ValidationType validationType, String classToQualify, 
 			String qualifier, QualifierOperation operation) {
 		
-		SWTBotTreeItem validationProblem = getProblem(validationType);		
+		SWTBotTreeItem validationProblem = quickFixHelper.getProblem(
+				validationType, getProjectName(), validationProvider());		
 		assertNotNull(validationProblem);
 		
 		quickFixHelper.openQuickFix(validationProblem);

Deleted: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -1,104 +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.base;
-
-
-import java.util.List;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
-import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
-import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
-import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
-import org.junit.BeforeClass;
-
-/**
- * Test base for all QuickFix-like tests
- * 
- * @author Jaroslav Jankovic
- */
-
-public abstract class QuickFixTestBase extends CDITestBase {
-	
-	@BeforeClass
-	public static void setup() {
-		problems.show();		
-	}
-	
-	protected abstract IValidationProvider validationProvider();
-	
-	/**
-	 * 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 validationType
-	 * @param compType
-	 */
-	public void checkQuickFix(ValidationType validationType) {
-		SWTBotTreeItem validationProblem = getProblem(validationType);		
-		assertNotNull(validationProblem);
-		resolveQuickFix(validationProblem);
-		validationProblem = getProblem(validationType);		
-		assertNull(validationProblem);
-	}
-	
-	/**
-	 * Methods gets the particular validation problem located in Problems View by
-	 * using specific ValidationErrorsProvider
-	 * @param validationType
-	 * @param compType
-	 * @return
-	 */
-	protected SWTBotTreeItem getProblem(ValidationType validationType) {		
-		IValidationProvider validationErrorsProvider = validationProvider();
-		List<String> validationProblems = null;
-		SWTBotTreeItem[] problemsInProblemsView = null;
-		if (validationErrorsProvider.getAllWarningsAnnotation().contains(validationType)) {
-			validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(validationType);
-			problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.WARNINGS, getProjectName());
-		} else {
-			validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(validationType);
-			problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.ERRORS, getProjectName());
-		}
-		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) {
-		quickFixHelper.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();
-	}
-
-}

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,9 +12,9 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.BeanValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.junit.Test;
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class BeanValidationQuickFixTest extends QuickFixTestBase {
+public class BeanValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new BeanValidationProvider();
 
@@ -48,7 +48,7 @@
 				getPackageName(), null, "/resources/quickfix/bean/SerializableBean.java.cdi");
 		editResourceUtil.replaceInEditor("BeanComponent", className);		
 		
-		checkQuickFix(ValidationType.SERIALIZABLE);
+		quickFixHelper.checkQuickFix(ValidationType.SERIALIZABLE, getProjectName(), validationProvider());
 		
 	}
 	
@@ -62,9 +62,9 @@
 				getPackageName(), null, "/resources/quickfix/bean/ConstructorWithParam.java.cdi");		
 		editResourceUtil.replaceInEditor("BeanComponent", className);		
 		
-		checkQuickFix(ValidationType.DISPOSES);
+		quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider());
 		
-		editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class
+		editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class
 				.getResourceAsStream("/resources/quickfix/bean/ConstructorWithParam.java.cdi"), false);
 		
 		editResourceUtil.replaceInEditor("@Disposes", "@Observes");
@@ -72,7 +72,7 @@
 				"import javax.enterprise.event.Observes;");
 		editResourceUtil.replaceInEditor("BeanComponent", className);		
 		
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 	}
 	
 	// https://issues.jboss.org/browse/JBIDE-7665
@@ -86,9 +86,9 @@
 		
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 		
-		checkQuickFix(ValidationType.DISPOSES);
+		quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider());
 		
-		editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class
+		editResourceUtil.replaceClassContentByResource(BeanValidationQuickFixTest.class
 				.getResourceAsStream("/resources/quickfix/bean/ProducerWithParam.java.cdi"), false);
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 		
@@ -96,7 +96,7 @@
 		editResourceUtil.replaceInEditor("import javax.enterprise.inject.Disposes;", 
 				"import javax.enterprise.event.Observes;");
 		
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -111,7 +111,7 @@
 		
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 		
-		checkQuickFix(ValidationType.DISPOSES);
+		quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider());
 				
 	}
 	
@@ -129,7 +129,7 @@
 		editResourceUtil.replaceInEditor("@Disposes", "@Observes");
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 		
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -144,7 +144,7 @@
 		
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 			
-		checkQuickFix(ValidationType.PRODUCES);
+		quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider());
 			
 	}
 	
@@ -159,7 +159,7 @@
 		
 		editResourceUtil.replaceInEditor("BeanComponent", className);
 			
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 			
 	}
 	

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,9 +12,9 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.DecoratorValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.junit.Test;
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class DecoratorValidationQuickFixTest extends QuickFixTestBase {
+public class DecoratorValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new DecoratorValidationProvider();
 
@@ -51,7 +51,7 @@
 		
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.STATELESS);
+		quickFixHelper.checkQuickFix(ValidationType.STATELESS, getProjectName(), validationProvider());
 			
 	}
 	
@@ -67,7 +67,7 @@
 	
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.NAMED);
+		quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider());
 		
 	}
 	
@@ -83,7 +83,7 @@
 		
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.PRODUCES);
+		quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -99,7 +99,7 @@
 		
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.DISPOSES);
+		quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -118,7 +118,7 @@
 		editResourceUtil.replaceInEditor("@Disposes", "@Observes");
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 			
 	}
 	
@@ -134,7 +134,7 @@
 		
 		editResourceUtil.replaceInEditor("DecoratorComponent", className);
 		
-		checkQuickFix(ValidationType.SPECIALIZES);
+		quickFixHelper.checkQuickFix(ValidationType.SPECIALIZES, getProjectName(), validationProvider());
 			
 	}
 	

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,9 +12,9 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorBindingValidationProvider;
 import org.junit.Test;
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class IBindingValidationQuickFixTest extends QuickFixTestBase {
+public class IBindingValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new InterceptorBindingValidationProvider();
 
@@ -51,14 +51,14 @@
 
 		editResourceUtil.replaceInEditor("IBindingComponent", className);
 		
-		checkQuickFix(ValidationType.NONBINDING);
+		quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider());
 				
-		editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class
+		editResourceUtil.replaceClassContentByResource(IBindingValidationQuickFixTest.class
 				.getResourceAsStream("/resources/quickfix/interceptorBinding/IBindingWithStringArray.java.cdi"), 
 				false);
 		editResourceUtil.replaceInEditor("IBindingComponent", className);
 			
-		checkQuickFix(ValidationType.NONBINDING);
+		quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider());
 	}
 	
 }

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,9 +12,9 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.InterceptorValidationProvider;
 import org.junit.Test;
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class InterceptorValidationQuickFixTest extends QuickFixTestBase {
+public class InterceptorValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new InterceptorValidationProvider();
 	
@@ -50,7 +50,7 @@
 
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.STATELESS);
+		quickFixHelper.checkQuickFix(ValidationType.STATELESS, getProjectName(), validationProvider());
 			
 	}
 	
@@ -66,7 +66,7 @@
 
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.NAMED);
+		quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider());
 		
 	}
 	
@@ -82,7 +82,7 @@
 
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.PRODUCES);
+		quickFixHelper.checkQuickFix(ValidationType.PRODUCES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -98,7 +98,7 @@
 
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.DISPOSES);
+		quickFixHelper.checkQuickFix(ValidationType.DISPOSES, getProjectName(), validationProvider());
 		
 	}
 	
@@ -117,7 +117,7 @@
 		editResourceUtil.replaceInEditor("@Disposes", "@Observes");
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.OBSERVES);
+		quickFixHelper.checkQuickFix(ValidationType.OBSERVES, getProjectName(), validationProvider());
 			
 	}
 	
@@ -133,7 +133,7 @@
 
 		editResourceUtil.replaceInEditor("InterceptorComponent", className);
 		
-		checkQuickFix(ValidationType.SPECIALIZES);
+		quickFixHelper.checkQuickFix(ValidationType.SPECIALIZES, getProjectName(), validationProvider());
 			
 	}
 	

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,11 +12,11 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
+import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.QualifierValidationProvider;
-import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.junit.Test;
 
 /**
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class QualifierValidationQuickFixTest extends QuickFixTestBase {
+public class QualifierValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new QualifierValidationProvider();
 	
@@ -49,11 +49,11 @@
 		editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, PARAMETER, FIELD })", 
 				"@Target({ TYPE, FIELD })");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 		
 		editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD, PARAMETER})", "");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 	}
 	
 	// https://issues.jboss.org/browse/JBIDE-7631
@@ -66,11 +66,11 @@
 				
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 		
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 		
 	}
 	
@@ -87,12 +87,12 @@
 	
 		editResourceUtil.replaceInEditor("QualifierComponent", className);
 	
-		checkQuickFix(ValidationType.NONBINDING);
+		quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider());
 				
-		editResourceUtil.replaceClassContentByResource(QuickFixTestBase.class
+		editResourceUtil.replaceClassContentByResource(QualifierValidationQuickFixTest.class
 				.getResourceAsStream("/resources/quickfix/qualifier/QualifierWithStringArray.java.cdi"), false);
 		editResourceUtil.replaceInEditor("QualifierComponent", className);
 		
-		checkQuickFix(ValidationType.NONBINDING);
+		quickFixHelper.checkQuickFix(ValidationType.NONBINDING, getProjectName(), validationProvider());
 	}
 }

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,11 +12,11 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
+import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.ScopeValidationProvider;
-import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.junit.Test;
 
 /**
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class ScopeValidationQuickFixTest extends QuickFixTestBase {
+public class ScopeValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new ScopeValidationProvider();
 	
@@ -49,11 +49,11 @@
 		editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", 
 				"@Target({ TYPE, FIELD })");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 		
 		editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", "");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 	}
 	
 	// https://issues.jboss.org/browse/JBIDE-7631
@@ -66,11 +66,11 @@
 				
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 		
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 		
 	}
 	

Modified: 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	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -12,11 +12,11 @@
 package org.jboss.tools.cdi.bot.test.quickfix.test;
 
 
+import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
 import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
-import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
+import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.quickfix.validators.StereotypeValidationProvider;
-import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.junit.Test;
 
 /**
@@ -25,7 +25,7 @@
  * @author Jaroslav Jankovic
  */
 
-public class StereotypeValidationQuickFixTest extends QuickFixTestBase {
+public class StereotypeValidationQuickFixTest extends CDITestBase {
 	
 	private static IValidationProvider validationProvider = new StereotypeValidationProvider();
 	
@@ -49,11 +49,11 @@
 		editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })", 
 				"@Target({ TYPE, FIELD })");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 
 		editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", "");
 		
-		checkQuickFix(ValidationType.TARGET);
+		quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
 	}
 	
 	// https://issues.jboss.org/browse/JBIDE-7631
@@ -66,11 +66,11 @@
 		
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "@Retention(CLASS)");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 				
 		editResourceUtil.replaceInEditor("@Retention(RUNTIME)", "");
 		
-		checkQuickFix(ValidationType.RETENTION);
+		quickFixHelper.checkQuickFix(ValidationType.RETENTION, getProjectName(), validationProvider());
 		
 	}
 	
@@ -85,7 +85,7 @@
 	
 		editResourceUtil.replaceInEditor("StereotypeComponent", className);
 		
-		checkQuickFix(ValidationType.NAMED);
+		quickFixHelper.checkQuickFix(ValidationType.NAMED, getProjectName(), validationProvider());
 		
 	}
 	
@@ -100,7 +100,7 @@
 		
 		editResourceUtil.replaceInEditor("StereotypeComponent", className);
 		
-		checkQuickFix(ValidationType.TYPED);
+		quickFixHelper.checkQuickFix(ValidationType.TYPED, getProjectName(), validationProvider());
 		
 	}	
 

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -10,24 +10,105 @@
  ******************************************************************************/
 package org.jboss.tools.cdi.bot.test.uiutils;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
 import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
+import org.jboss.tools.cdi.bot.test.annotations.ValidationType;
+import org.jboss.tools.cdi.bot.test.quickfix.validators.IValidationProvider;
 import org.jboss.tools.cdi.bot.test.uiutils.wizards.OpenOnOptionsDialog;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
 import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
 import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
 import org.jboss.tools.ui.bot.ext.Timing;
 import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
 import org.jboss.tools.ui.bot.ext.types.IDELabel;
 import org.jboss.tools.ui.bot.ext.types.ViewType;
 import org.jboss.tools.ui.bot.ext.view.ProblemsView;
 
-public class QuickFixHelper extends CDITestBase {
+public class QuickFixHelper {
 	
+	private SWTUtilExt util = SWTBotFactory.getUtil();
+	private SWTBotExt bot = SWTBotFactory.getBot();
+	
 	/**
+	 * 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 validationType
+	 * @param compType
+	 */
+	public void checkQuickFix(ValidationType validationType, String projectName,
+			IValidationProvider validationProvider) {
+		SWTBotTreeItem validationProblem = getProblem(
+				validationType, projectName, validationProvider);		
+		assertNotNull(validationProblem);
+		resolveQuickFix(validationProblem);
+		validationProblem = getProblem(
+				validationType, projectName, validationProvider);		
+		assertNull(validationProblem);
+	}
+	
+	/**
+	 * Methods gets the particular validation problem located in Problems View by
+	 * using specific ValidationErrorsProvider
+	 * @param validationType
+	 * @param compType
+	 * @return
+	 */
+	public SWTBotTreeItem getProblem(ValidationType validationType, String projectName,
+			IValidationProvider validationProvider) {		
+		IValidationProvider validationErrorsProvider = validationProvider;
+		List<String> validationProblems = null;
+		SWTBotTreeItem[] problemsInProblemsView = null;
+		if (validationErrorsProvider.getAllWarningsAnnotation().contains(validationType)) {
+			validationProblems = validationErrorsProvider.getAllWarningForAnnotationType(validationType);
+			problemsInProblemsView = getProblems(ProblemsType.WARNINGS, projectName);
+		} else {
+			validationProblems = validationErrorsProvider.getAllErrorsForAnnotationType(validationType);
+			problemsInProblemsView = getProblems(ProblemsType.ERRORS, projectName);
+		}
+		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 select openOnString and then open proposal dialog which
 	 * is returned as object
 	 * @param openOnString
@@ -35,8 +116,8 @@
 	 * @return
 	 */
 	public OpenOnOptionsDialog openOnDialog(String openOnString, String titleName) {
-		setEd(SWTJBTExt.selectTextInSourcePane(bot, titleName,
-				openOnString, 0, openOnString.length()));
+		SWTJBTExt.selectTextInSourcePane(bot, titleName,
+				openOnString, 0, openOnString.length());
 		bot.menu(IDELabel.Menu.EDIT).menu(IDELabel.Menu.QUICK_FIX).click();	
 		bot.sleep(Timing.time1S());
 		

Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java	2012-06-13 06:45:57 UTC (rev 41919)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/OpenOnOptionsDialog.java	2012-06-13 08:17:19 UTC (rev 41920)
@@ -46,13 +46,14 @@
 	}
 	
 	public String setProposalOption(SWTBotTableItem ti) {
-		String styledText = getProposalText(ti).getText();
+		ti.select();
+		String styledText = getProposalText().getText();
+		ti.setFocus();
 		ti.pressShortcut(Keystrokes.LF);
 		return styledText;
 	}
 	
-	public SWTBotStyledText getProposalText(SWTBotTableItem proposalItem) {
-		proposalItem.select();
+	public SWTBotStyledText getProposalText() {
 		return getShellWithOnlyStyledText().bot().styledText();
 	}
 	



More information about the jbosstools-commits mailing list