Author: jjankovi
Date: 2012-01-16 03:12:43 -0500 (Mon, 16 Jan 2012)
New Revision: 37848
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.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/base/QuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.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/wizard/CDISupportTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
Log:
Moving all helper class to CDIBase instead of CDITestBase + refactoring QuickFixTestBase
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIBase.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -12,12 +12,27 @@
package org.jboss.tools.cdi.bot.test;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.jboss.tools.cdi.bot.test.uiutils.BeansXMLValidationHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.CDIProjectHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.CDIWizardHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.EditorResourceHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.LibraryHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.OpenOnHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.QuickFixHelper;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
-public class CDIBase extends SWTTestExt{
+public class CDIBase extends SWTTestExt {
private static SWTBotEclipseEditor ed;
-
+ protected static CDIProjectHelper projectHelper = new CDIProjectHelper();
+ protected static BeansXMLValidationHelper beansHelper = new BeansXMLValidationHelper();
+ protected static CDIWizardHelper wizard = new CDIWizardHelper();
+ protected static OpenOnHelper openOnUtil = new OpenOnHelper();
+ protected static LibraryHelper libraryUtil = new LibraryHelper();
+ protected static EditorResourceHelper editResourceUtil = new EditorResourceHelper();
+ protected static QuickFixHelper quickFixHelper = new QuickFixHelper();
+
+
public SWTBotEclipseEditor getEd() {
return ed;
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -13,12 +13,6 @@
import java.util.logging.Logger;
-import org.jboss.tools.cdi.bot.test.uiutils.BeansXMLValidationHelper;
-import org.jboss.tools.cdi.bot.test.uiutils.CDIProjectHelper;
-import org.jboss.tools.cdi.bot.test.uiutils.CDIWizardHelper;
-import org.jboss.tools.cdi.bot.test.uiutils.EditorResourceHelper;
-import org.jboss.tools.cdi.bot.test.uiutils.LibraryHelper;
-import org.jboss.tools.cdi.bot.test.uiutils.OpenOnHelper;
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;
@@ -40,15 +34,8 @@
protected final String LINE_SEPARATOR = System.getProperty("line.separator");
protected static final Logger LOGGER = Logger.getLogger(CDITestBase.class.getName());
- protected static CDIProjectHelper projectHelper = new CDIProjectHelper();
- protected static BeansXMLValidationHelper beansHelper = new BeansXMLValidationHelper();
- protected static CDIWizardHelper wizard = new CDIWizardHelper();
- protected static OpenOnHelper openOnUtil = new OpenOnHelper();
- protected static LibraryHelper libraryUtil = new LibraryHelper();
- protected static EditorResourceHelper editResourceUtil = new EditorResourceHelper();
-
@Before
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
projectHelper.createCDIProjectWithCDIWizard(getProjectName());
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -66,7 +66,7 @@
}
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
new ProjectExplorer().openFile(getProjectName(),
descPath.split("/"));
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -61,7 +61,7 @@
assertTrue(bot.activeEditor().toTextEditor().getSelection().equals(beanName));
}
- /*
+
@Test
public void testSearchNamedParameterBean() {
@@ -224,8 +224,8 @@
assertTrue(bot.activeEditor().getTitle().equals(beanName + ".java"));
assertTrue(bot.activeEditor().toTextEditor().getSelection().equals(beanName));
}
- */
+
private SearchNamedDialogWizard openSearchNamedDialog() {
bot.menu("Navigate").menu("Open CDI Named Bean").click();
bot.sleep(Timing.time500MS());
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-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -29,7 +29,7 @@
SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
CDIWizardType.BEANS_XML);
- openQuickFix(validationProblem);
+ quickFixHelper.openQuickFix(validationProblem);
QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
qfWizard.setFix(qfWizard.getAvailableFixes().get(0));
qfWizard.setResource(qfWizard.getResources().get(0));
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-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -35,7 +35,7 @@
SWTBotTreeItem validationProblem = getProblem(CDIAnnotationsType.INJECT,
CDIWizardType.BEAN);
- openQuickFix(validationProblem);
+ quickFixHelper.openQuickFix(validationProblem);
QuickFixDialogWizard quickFixWizard = new QuickFixDialogWizard();
for (String availableFix : quickFixWizard.getAvailableFixes()) {
if (availableFix.contains(classToQualify)) {
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 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -15,9 +15,11 @@
import java.util.ArrayList;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.CDITestBase;
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.AbstractValidationProvider;
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;
@@ -26,7 +28,6 @@
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.junit.BeforeClass;
@@ -36,8 +37,10 @@
* @author Jaroslav Jankovic
*/
-public class QuickFixTestBase extends QuickFixHelper {
+public class QuickFixTestBase extends CDITestBase {
+ protected AbstractValidationProvider validationErrorsProvider;
+
@BeforeClass
public static void setup() {
problems.show();
@@ -99,10 +102,10 @@
SWTBotTreeItem[] problemsInProblemsView = null;
if (validationErrorsProvider.getAllWarningsAnnotation().contains(annonType)) {
validationProblems =
validationErrorsProvider.getAllWarningForAnnotationType(annonType);
- problemsInProblemsView = getProblems(ProblemsType.WARNINGS);
+ problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.WARNINGS,
getProjectName());
} else {
validationProblems =
validationErrorsProvider.getAllErrorsForAnnotationType(annonType);
- problemsInProblemsView = getProblems(ProblemsType.ERRORS);
+ problemsInProblemsView = quickFixHelper.getProblems(ProblemsType.ERRORS,
getProjectName());
}
for (SWTBotTreeItem ti: problemsInProblemsView) {
for (String validationProblem: validationProblems) {
@@ -121,7 +124,7 @@
* @param ti
*/
private void resolveQuickFix(SWTBotTreeItem ti) {
- openQuickFix(ti);
+ quickFixHelper.openQuickFix(ti);
QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -43,7 +43,7 @@
}
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
addSeamSolderLibrary();
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -12,7 +12,7 @@
package org.jboss.tools.cdi.bot.test.uiutils;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.jboss.tools.cdi.bot.test.CDIBase;
import org.jboss.tools.cdi.bot.test.annotations.BeansXMLValidationErrors;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.openon.OpenOnTest;
@@ -26,7 +26,7 @@
*
*/
-public class BeansXMLValidationHelper extends CDITestBase {
+public class BeansXMLValidationHelper extends CDIBase {
private static final String CLEAR_BEANS_XML =
"/resources/beansXML/beans.xml.cdi";
private static final String CLEAR_BEANS_XML_WITH_TAG = "/resources/beansXML/"
+
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -13,11 +13,11 @@
import java.util.List;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.jboss.tools.cdi.bot.test.CDIBase;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBaseExt;
-public class CDIWizardHelper extends CDITestBase{
+public class CDIWizardHelper extends CDIBase{
private CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
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-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -1,15 +1,12 @@
package org.jboss.tools.cdi.bot.test.uiutils;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.jboss.tools.cdi.bot.test.CDIBase;
import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
-import org.jboss.tools.cdi.bot.test.quickfix.validators.AbstractValidationProvider;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
-public class QuickFixHelper extends CDITestBase{
+public class QuickFixHelper extends CDIBase {
- protected AbstractValidationProvider validationErrorsProvider;
-
/**
* Method open context menu for given tree item and opens Quick Fix option
* @param item
@@ -23,14 +20,14 @@
* @param problemType
* @return array of problems of given type
*/
- public SWTBotTreeItem[] getProblems(ProblemsType problemType) {
+ public SWTBotTreeItem[] getProblems(ProblemsType problemType, String projectName) {
SWTBotTreeItem[] problemsTree = null;
if (problemType == ProblemsType.WARNINGS) {
problemsTree = ProblemsView.getFilteredWarningsTreeItems(bot, null, "/"
- + getProjectName(), null, null);
+ + projectName, null, null);
}else if (problemType == ProblemsType.ERRORS) {
problemsTree = ProblemsView.getFilteredErrorsTreeItems(bot, null, "/"
- + getProjectName(), null, null);
+ + projectName, null, null);
}
return problemsTree;
}
@@ -39,11 +36,11 @@
* Method gets allProblems in problemsView as array of SWTBotTreeItem
* @return
*/
- public SWTBotTreeItem[] getAllProblems() {
+ public SWTBotTreeItem[] getAllProblems(String projectName) {
- SWTBotTreeItem[] warningProblemsTree = getProblems(ProblemsType.WARNINGS);
+ SWTBotTreeItem[] warningProblemsTree = getProblems(ProblemsType.WARNINGS,
projectName);
- SWTBotTreeItem[] errorProblemsTree = getProblems(ProblemsType.ERRORS);
+ SWTBotTreeItem[] errorProblemsTree = getProblems(ProblemsType.ERRORS, projectName);
return joinTwoArrays(warningProblemsTree, errorProblemsTree);
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -21,7 +21,7 @@
public class CDISupportTest extends CDITestBase {
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -28,7 +28,7 @@
public class ConfigurationPresetTest extends CDITestBase {
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
projectHelper.createDynamicWebProjectWithCDIPreset(getProjectName());
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -25,11 +25,11 @@
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class FacetTest extends CDITestBase {
-
+
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createDynamicWebProjectWithCDIFacets(getProjectName());
+ projectHelper.createDynamicWebProjectWithCDIFacets(getProjectName());
}
}
@@ -41,13 +41,13 @@
@Test
public void testCDIFacet() {
if (projectHelper.projectExists(getProjectName())) {
- LOGGER.info("Dynamic Web Project with CDI Facet created");
+ LOGGER.info("Dynamic Web Project with CDI Facet created");
assertTrue("Error: beans.xml should be created when selecting CDI Facet",
projectExplorer.isFilePresent(getProjectName(),
"WebContent/WEB-INF/beans.xml".split("/")));
} else {
fail("CDI project was not succesfully created with Dynamic Web Project wizard
with CDI facet");
}
- ;
+
}
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2012-01-16
08:09:23 UTC (rev 37847)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2012-01-16
08:12:43 UTC (rev 37848)
@@ -35,7 +35,7 @@
public class PerspectiveTest extends CDITestBase {
@Override
- public void checkAndCreateProject() {
+ public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
projectHelper.createCDIProjectWithCDIWizard(getProjectName());
eclipse.openPerspective(PerspectiveType.CDI);