Author: jlukas(a)redhat.com
Date: 2011-03-29 04:06:27 -0400 (Tue, 29 Mar 2011)
New Revision: 30086
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDIAllBotTests.launch
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
Log:
test update
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDIAllBotTests.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDIAllBotTests.launch 2011-03-29 01:11:24
UTC (rev 30085)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDIAllBotTests.launch 2011-03-29 08:06:27
UTC (rev 30086)
@@ -9,6 +9,15 @@
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
+<booleanAttribute
key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION"
value="true"/>
+<listAttribute
key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
+<listEntry value="/org.jboss.tools.cdi.core/bin"/>
+<listEntry value="/org.jboss.tools.cdi.solder.core/bin"/>
+<listEntry value="/org.jboss.tools.cdi.text.ext/bin"/>
+<listEntry value="/org.jboss.tools.cdi.xml/bin"/>
+<listEntry value="/org.jboss.tools.cdi.xml.ui/bin"/>
+<listEntry value="/org.jboss.tools.cdi.ui/bin"/>
+</listAttribute>
<stringAttribute key="configLocation"
value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-03-29
01:11:24 UTC (rev 30085)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-03-29
08:06:27 UTC (rev 30086)
@@ -259,7 +259,7 @@
CDIWizard w = decorator("cdi", "",
"java.lang.Comparable", null, true, true, false, false);
w.finish();
util.waitForNonIgnoredJobs();
- SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
+ SWTBotEditor ed = new
SWTWorkbenchBot().editorByTitle("ComparableDecorator.java");
assertTrue(("ComparableDecorator.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
L.fine(code);
@@ -275,7 +275,7 @@
w = decorator("cdi", "", "java.util.Map",
"field", false, false, true, true);
w.finish();
util.waitForNonIgnoredJobs();
- ed = new SWTWorkbenchBot().activeEditor();
+ ed = new SWTWorkbenchBot().editorByTitle("MapDecorator.java");
assertTrue(("MapDecorator.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
L.fine(code);
@@ -295,7 +295,7 @@
CDIWizard w = interceptor("cdi", "I1", "B2", null, null,
false);
w.finish();
util.waitForNonIgnoredJobs();
- SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
+ SWTBotEditor ed = new SWTWorkbenchBot().editorByTitle("I1.java");
assertTrue(("I1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
L.fine(code);
@@ -309,7 +309,7 @@
w = interceptor("cdi", "I2", "B4",
"java.util.Date", "sample", true);
w.finish();
util.waitForNonIgnoredJobs();
- ed = new SWTWorkbenchBot().activeEditor();
+ ed = new SWTWorkbenchBot().editorByTitle("I2.java");
assertTrue(("I2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
L.fine(code);
@@ -326,6 +326,8 @@
public void testBeansXml() {
CDIWizard w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run();
w.setSourceFolder(PROJECT_NAME + "/WebContent/WEB-INF");
+ assertFalse(w.canFinish());
+ w.setSourceFolder(PROJECT_NAME + "/src/cdi");
assertTrue(w.canFinish());
w.finish();
w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run();
@@ -384,20 +386,16 @@
w.finish();
util.waitForNonIgnoredJobs();
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
- //https://issues.jboss.org/browse/JBIDE-8244
-// assertTrue(("AnnL1.java").equals(ed.getTitle()));
- assertTrue(("Q1Literal.java").equals(ed.getTitle()));
+ assertTrue(("AnnL1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
L.info(code);
assertTrue(code.contains("package cdi;"));
- assertTrue(code.contains("public final class Q1Literal extends
AnnotationLiteral<Q1> implements Q1"));
- assertTrue(code.contains("public static final Q1 INSTANCE = new
Q1Literal();"));
+ assertTrue(code.contains("public final class AnnL1 extends
AnnotationLiteral<Q1> implements Q1"));
+ assertTrue(code.contains("public static final Q1 INSTANCE = new AnnL1();"));
assertFalse(code.contains("abstract"));
assertFalse(code.startsWith("/**"));
w = annLiteral("cdi", "AnnL2", false, true, false, true,
"Q2");
- //https://issues.jboss.org/browse/JBIDE-8244
- w.setName("AnnL2");
w.finish();
util.waitForNonIgnoredJobs();
ed = new SWTWorkbenchBot().activeEditor();