[jbosstools-commits] JBoss Tools SVN: r42624 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke.

[jbosstools-commits at lists.jboss.org]

Author: vpakan at redhat.com
Date: 2012-07-17 14:19:12 -0400 (Tue, 17 Jul 2012)
New Revision: 42624

Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
Log:
Fix creating of page via webProject view

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java	2012-07-17 15:28:40 UTC (rev 42623)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java	2012-07-17 18:19:12 UTC (rev 42624)
@@ -49,13 +49,13 @@
     SWTBotTree tree = webProjects.tree();
 
     tree.setFocus();
-
-    bot.sleep(Timing.time5S());
+    // tree of webProject view is not populated properly. Project node has to be reexpanded
+    SWTBotTreeItem projectTreeItem = tree.getTreeItem(JBT_TEST_PROJECT_NAME);
+    projectTreeItem.expand();
+    projectTreeItem.collapse();
+    projectTreeItem.expand();
     
-    SWTBotTreeItem webContentTreeItem = tree
-      .getTreeItem(JBT_TEST_PROJECT_NAME)
-      .expand()
-        .getNode(IDELabel.WebProjectsTree.WEB_CONTENT);
+    SWTBotTreeItem webContentTreeItem = projectTreeItem.expand().getNode(IDELabel.WebProjectsTree.WEB_CONTENT);
     
     webContentTreeItem.select();
     // create new JSP file

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java	2012-07-17 15:28:40 UTC (rev 42623)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java	2012-07-17 18:19:12 UTC (rev 42624)
@@ -50,13 +50,13 @@
 	  SWTBotTree tree = webProjects.tree();
 
     tree.setFocus();
-
-    bot.sleep(Timing.time5S());
+    // tree of webProject view is not populated properly. Project node has to be reexpanded
+    SWTBotTreeItem projectTreeItem = tree.getTreeItem(JBT_TEST_PROJECT_NAME);
+    projectTreeItem.expand();
+    projectTreeItem.collapse();
+    projectTreeItem.expand();
     
-    SWTBotTreeItem webContentTreeItem = tree
-      .getTreeItem(JBT_TEST_PROJECT_NAME)
-      .expand()
-        .getNode(IDELabel.WebProjectsTree.WEB_CONTENT);
+    SWTBotTreeItem webContentTreeItem = projectTreeItem.expand().getNode(IDELabel.WebProjectsTree.WEB_CONTENT);
     
     webContentTreeItem.select();
     // create new JSP file