12:02 p.m.
Author: jjankovi
Date: 2011-12-13 13:02:25 -0500 (Tue, 13 Dec 2011)
New Revision: 37284
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIProjectWithDynamicWizardTest.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/CDISmokeBotTests.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/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/quickfix/injection/ProblemEligibleInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.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/CDIProjectHelper.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:
CDIProjectWithDynamicWizardTest added + template of Seam3ConfigValidationTest added + all
cdi tests will use new CDI project wizard to create CDI project
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-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -26,9 +26,11 @@
import org.jboss.tools.cdi.bot.test.quickfix.test.QualifierValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.ScopeValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.StereotypeValidationQuickFixTest;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3ConfigValidationTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3GenericOpenOnTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3ResourceOpenOnTest;
import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil;
+import org.jboss.tools.cdi.bot.test.wizard.CDIProjectWithDynamicWizardTest;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.FacetTest;
import org.jboss.tools.cdi.bot.test.wizard.WizardTest;
@@ -37,6 +39,7 @@
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
+import org.test.DummyTest;
/**
* This test suite requires JBoss AS 6 or newer
@@ -54,7 +57,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 29min
+ * Suite duration: aprox. 30min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
@@ -64,6 +67,7 @@
// PerspectiveTest.class,
ConfigurationPresetTest.class,
FacetTest.class,
+ CDIProjectWithDynamicWizardTest.class,
WizardTest.class,
BeansEditorTest.class,
NamedRefactoringTest.class,
@@ -83,6 +87,7 @@
FindObserverForEventTest.class,
Seam3ResourceOpenOnTest.class,
Seam3GenericOpenOnTest.class,
+ Seam3ConfigValidationTest.class,
})
public class CDIAllBotTests extends CDITestBase {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -12,6 +12,7 @@
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil;
+import org.jboss.tools.cdi.bot.test.wizard.CDIProjectWithDynamicWizardTest;
import org.jboss.tools.cdi.bot.test.wizard.WizardTest;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.FacetTest;
@@ -46,6 +47,7 @@
//PerspectiveTest.class,
ConfigurationPresetTest.class,
FacetTest.class,
+ CDIProjectWithDynamicWizardTest.class,
WizardTest.class,
BeansEditorTest.class,
})
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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -50,7 +50,7 @@
@Before
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProject(getProjectName());
+ projectHelper.createCDIProjectWithCDIWizard(getProjectName());
}
}
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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/EligibleInjectionQuickFixTestBase.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -47,16 +47,26 @@
SpecifyBeanDialogWizard spBeanDialogWizard = new SpecifyBeanDialogWizard();
if (operation == QualifierOperation.ADD) {
+ boolean qualifFound = false;
for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
if (availQualifer.equals(qualifier + " - " + getPackageName())) {
+ qualifFound = true;
spBeanDialogWizard.addQualifier(availQualifer);
}
}
- // there was no such qualifer, it has to be created
- if (!spBeanDialogWizard.canFinish()) {
+ // there was no such qualifer, it has to be created, after creation it
+ // has to be added to in Bean qualifiers
+ if (!qualifFound) {
spBeanDialogWizard.createNewQualifier(qualifier, getPackageName()).
setName(qualifier).finish();
+ bot.sleep(Timing.time2S());
+ for (String availQualifer : spBeanDialogWizard.getAvailableQualifiers()) {
+ if (availQualifer.equals(qualifier + " - " + getPackageName())) {
+ spBeanDialogWizard.addQualifier(availQualifer);
+ }
+ }
}
+
} else {
for (String inBeanQualifer : spBeanDialogWizard.getInBeanQualifiers()) {
if (inBeanQualifer.equals(qualifier + " - " + getPackageName())) {
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-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/QuickFixTestBase.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -38,13 +38,6 @@
public class QuickFixTestBase extends QuickFixHelper {
- @Override
- public void checkAndCreateProject() {
- if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProject(getProjectName());
- }
- }
-
@BeforeClass
public static void setup() {
problems.show();
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-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.EligibleInjectionQuickFixTestBase;
import org.junit.After;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -61,8 +62,9 @@
resolveMultipleBeans(DOG, QUALIFIER, QualifierOperation.ADD);
- String code = bot.editorByTitle(BROKEN_FARM + ".java").
- toTextEditor().getText();
+ bot.editorByTitle(BROKEN_FARM + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ String code = getEd().getText();
assertTrue(code.contains("@Inject @" + QUALIFIER));
code = bot.editorByTitle(DOG + ".java").toTextEditor().getText();
assertTrue(code.contains("@" + QUALIFIER));
@@ -82,16 +84,16 @@
getPackageName(), null, "/resources/quickfix/" +
"injection/removeQualifier/Dog.java.cdi");
-
wizard.createCDIComponentWithContent(CDIWizardType.BEAN, BROKEN_FARM,
getPackageName(), null, "/resources/quickfix/" +
"injection/removeQualifier/BrokenFarm.java.cdi");
resolveMultipleBeans(DOG, QUALIFIER, QualifierOperation.REMOVE);
- String code = bot.editorByTitle(BROKEN_FARM + ".java").
- toTextEditor().getText();
- assertTrue(code.contains("@Inject private"));
+ bot.editorByTitle(BROKEN_FARM + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ String code = getEd().getText();
+ assertTrue(code.contains("@Inject private") || code.contains("@Inject
private"));
code = bot.editorByTitle(DOG + ".java").toTextEditor().getText();
assertTrue(!code.contains("@" + QUALIFIER));
}
@@ -113,8 +115,9 @@
resolveMultipleBeans(DOG, QUALIFIER, QualifierOperation.ADD);
- String code = bot.editorByTitle(BROKEN_FARM + ".java").
- toTextEditor().getText();
+ bot.editorByTitle(BROKEN_FARM + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ String code = getEd().getText();
assertTrue(code.contains("@Inject @" + QUALIFIER));
code = bot.editorByTitle(DOG + ".java").toTextEditor().getText();
assertTrue(code.contains("@" + QUALIFIER));
@@ -140,8 +143,9 @@
resolveMultipleBeans(DOG, QUALIFIER, QualifierOperation.ADD);
- String code = bot.editorByTitle(BROKEN_FARM + ".java").
- toTextEditor().getText();
+ bot.editorByTitle(BROKEN_FARM + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ String code = getEd().getText();
assertTrue(code.contains("@Inject @" + QUALIFIER));
code = bot.editorByTitle(DOG + ".java").toTextEditor().getText();
assertTrue(code.contains("@" + QUALIFIER));
@@ -165,8 +169,9 @@
resolveMultipleBeans(DOG, QUALIFIER, QualifierOperation.ADD);
- String code = bot.editorByTitle(BROKEN_FARM + ".java").
- toTextEditor().getText();
+ bot.editorByTitle(BROKEN_FARM + ".java").show();
+ setEd(bot.activeEditor().toTextEditor());
+ String code = getEd().getText();
assertTrue(code.contains("@Inject @" + QUALIFIER));
code = bot.editorByTitle(DOG + ".java").toTextEditor().getText();
assertTrue(code.contains("@" + QUALIFIER));
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ConfigValidationTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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.seam3;
+
+
+public class Seam3ConfigValidationTest extends Seam3TestBase {
+
+ @Override
+ public String getProjectName() {
+ return "Seam3ConfigValidation";
+ }
+
+}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -31,7 +31,7 @@
@Override
public String getProjectName() {
- return "Seam3GenericOpenOnTest";
+ return "Seam3GenericOpenOn";
}
/**
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -25,7 +25,7 @@
@Override
public String getProjectName() {
- return "Seam3ResourceOpenOnTest";
+ return "Seam3ResourceOpenOn";
}
/**
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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -45,7 +45,7 @@
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProject(getProjectName());
+ projectHelper.createCDIProjectWithCDIWizard(getProjectName());
addSeamSolderLibrary();
}
}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -24,10 +24,23 @@
public class CDIProjectHelper extends CDIBase{
/**
- * Method creates new CDI Project - Dynamic Web Project + CDI Support
+ * Method creates new CDI Project with CDI Web Project wizard
* @param projectName
*/
- public void createCDIProject(String projectName) {
+ public void createCDIProjectWithCDIWizard(String projectName) {
+
+ new NewFileWizardAction().run()
+ .selectTemplate("CDI (Context and Dependency Injection)", "CDI Web
Project").next();
+ new DynamicWebProjectWizard().setProjectName(projectName).finish();
+ util.waitForNonIgnoredJobs();
+ }
+
+ /**
+ * Method creates new CDI Project with Dynamic Web Project, after that it
+ * adds CDI Support
+ * @param projectName
+ */
+ public void createCDIProjectWithDynamicWizard(String projectName) {
createDynamicWebProject(projectName);
addCDISupport(projectName);
}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIProjectWithDynamicWizardTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIProjectWithDynamicWizardTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDIProjectWithDynamicWizardTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.wizard;
+
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.CDISmokeBotTests;
+import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.junit.Test;
+import org.junit.runners.Suite.SuiteClasses;
+
+@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
+public class CDIProjectWithDynamicWizardTest extends CDITestBase {
+
+ @Override
+ public void checkAndCreateProject() {
+ if (!projectHelper.projectExists(getProjectName())) {
+ projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
+ }
+ }
+
+ @Override
+ public String getProjectName() {
+ return "CDIDynamicWizardProject";
+ }
+
+ @Test
+ public void testCDIFacet() {
+ if (projectHelper.projectExists(getProjectName())) {
+ LOGGER.info("CDI project was sucessfully created by Dynamic Web Project
wizard");
+ assertTrue(projectHelper.checkCDISupport(getProjectName()));
+ LOGGER.info("Project has correctly set CDI support");
+ } else {
+ fail("CDI project was not succesfully created with Dynamic Web Project
wizard");
+ }
+
+ }
+
+}
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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -41,8 +41,14 @@
@Test
public void testCDIPreset() {
- LOGGER.info("Dynamic Web Project with CDI Configuration Preset created");
- assertTrue(projectHelper.checkCDISupport(getProjectName()));
+ if (projectHelper.projectExists(getProjectName())) {
+ LOGGER.info("Dynamic Web Project with CDI Configuration Preset created");
+ assertTrue(projectHelper.checkCDISupport(getProjectName()));
+ LOGGER.info("Project has correctly set CDI support");
+ } else {
+ fail("CDI project was not succesfully created with Dynamic Web Project wizard
with CDI preset");
+ }
+
}
}
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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -40,9 +40,14 @@
@Test
public void testCDIFacet() {
- 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("/")));
+ if (projectHelper.projectExists(getProjectName())) {
+ 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 2011-12-13
17:52:54 UTC (rev 37283)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-12-13
18:02:25 UTC (rev 37284)
@@ -37,7 +37,7 @@
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProject(getProjectName());
+ projectHelper.createCDIProjectWithCDIWizard(getProjectName());
eclipse.openPerspective(PerspectiveType.CDI);
LOGGER.info("CDI perspective selected");
bot.sleep(Timing.time2S());