Author: yzhishko Date: 2009-07-28 08:58:28 -0400 (Tue, 28 Jul 2009) New Revision: 16841 Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java Log: delay() method has been changed to waitForJobs(). Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -60,7 +60,9 @@ protected void createJSFProject(String jsfProjectName){ bot.menu("File").menu("New").menu("Other...").click(); - bot.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); bot.button("Next >").click(); bot.textWithLabel("Project Name*").setText(jsfProjectName); bot.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); @@ -78,8 +80,9 @@ } } catch (Exception e) { bot.button(0).click(); - SWTBotTree tree = bot.tree(); - tree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); + SWTBotTree innerTree = bot.tree(); + waitForJobs(); + innerTree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); bot.button("Next >").click(); bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); bot.button("Finish").click(); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -42,28 +42,28 @@ textEditor = editor.getText(); editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment from Source menu editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestUntoggle.xml"); //Test toggle comment with CTRL+SHIFT+C hot keys editor.navigateTo(22,22); pressToggleCommentHotKeys(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment with CTRL+SHIFT hot keys editor.navigateTo(22,22); pressToggleCommentHotKeys(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestUntoggle.xml"); } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -1,6 +1,7 @@ package org.jboss.tools.vpe.ui.bot.test.palette; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; public class CancelTagLibDefenitionTest extends VPEAutoTestCase{ @@ -24,8 +25,9 @@ bot.shell("Edit TLD").activate(); //Test cancel TLD - delay(); - bot.tree().expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); bot.button("Cancel").click(); //Test check fields Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -65,7 +65,9 @@ bot.button("Browse...").click(); bot.shell("Edit TLD").activate(); - bot.tree().expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); bot.button("OK").click(); //Test set group @@ -84,6 +86,7 @@ public void run() { SWTBotTree tree = bot.tree(); + delay(); try { tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); Display display = bot.getDisplay();