[jbosstools-commits] JBoss Tools SVN: r26174 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: uiutils/editor and 1 other directories.
Author: jlukas(a)redhat.com
Date: 2010-11-02 04:11:33 -0400 (Tue, 02 Nov 2010)
New Revision: 26174
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/uiutils/editor/BeansEditor.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
Log:
minor test improvement
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 2010-11-02
05:20:10 UTC (rev 26173)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2010-11-02
08:11:33 UTC (rev 26174)
@@ -131,6 +131,7 @@
try {
be.add(item, name);
Assert.assertTrue(be.isDirty());
+ Assert.assertEquals(name, be.getSelectedItem());
be.activatePage("Source");
String text = be.toTextEditor().getText();
List<Node> nl = getItems(text, item);
@@ -197,14 +198,8 @@
List<Node> list = new ArrayList<Node>();
for (int i = 0; i < nl.getLength(); i++) {
Node n = nl.item(i);
- if (item == Item.STEREOTYPE) {
- if ("stereotype".equals(n.getNodeName())) {
- list.add(n);
- }
- } else {
- if ("class".equals(n.getNodeName())) {
- list.add(n);
- }
+ if (item.getElementName().equals(n.getNodeName())) {
+ list.add(n);
}
}
return list;
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/editor/BeansEditor.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/editor/BeansEditor.java 2010-11-02
05:20:10 UTC (rev 26173)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/editor/BeansEditor.java 2010-11-02
08:11:33 UTC (rev 26174)
@@ -39,6 +39,15 @@
private String getNode() {
return node;
}
+
+ public String getElementName() {
+ switch (this) {
+ case STEREOTYPE:
+ return "stereotype";
+ default:
+ return "class";
+ }
+ }
}
private SWTBotExt bot = new SWTBotExt();
@@ -56,6 +65,10 @@
return modify(item, name, "Remove...", new DeleteDialogHandler());
}
+ public String getSelectedItem() {
+ return bot().tree().selection().get(0, 0);
+ }
+
private BeansEditor modify(Item item, String name, String actionLabel, DialogHandler h)
{
SWTBotTree tree = bot.tree();
tree.expandNode(ROOT_NODE, item.getNode()).select().click();
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2010-11-02
05:20:10 UTC (rev 26173)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2010-11-02
08:11:33 UTC (rev 26174)
@@ -58,6 +58,7 @@
protected void clickButton(String text) {
bot().button(text).click();
+ bot().sleep(500);
}
protected void setText(String label, String text) {