Author: jjankovi Date: 2011-08-17 03:50:11 -0400 (Wed, 17 Aug 2011) New Revision: 33997 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/fix/CDIQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java Log: Timing modifications with ProblemsView 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-08-16 23:31:24 UTC (rev 33996) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -43,7 +43,6 @@ CdiATWizardTest.class, CDIQuickFixTest.class, BeansEditorTest.class - }) public class CDIAllBotTests { } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-16 23:31:24 UTC (rev 33996) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -14,6 +14,7 @@ import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; @@ -21,6 +22,7 @@ import org.jboss.tools.ui.bot.ext.types.ViewType; import org.jboss.tools.ui.bot.ext.view.ProblemsView; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -43,11 +45,11 @@ @Before public void setUp() { eclipse.showView(ViewType.PROJECT_EXPLORER); + createAndCheckCDIProject(); } @Test public void testSerializableQF() { - createAndCheckCDIProject(); CDIUtil.bean(PACKAGE_NAME, "B1", true, false, false, false, null, null, null, null).finish(); util.waitForNonIgnoredJobs(); @@ -61,8 +63,6 @@ CDIUtil.copyResourceToClass(ed, CDIQuickFixTest.class .getResourceAsStream("/resources/cdi/B1.java.cdi"), false); assertContains("@SessionScoped", ed.toTextEditor().getText()); - SWTEclipseExt.showView(bot, ViewType.PROBLEMS); - bot.sleep(3 * TIME_1S); SWTBotTreeItem[] warningTrees = ProblemsView. getFilteredWarningsTreeItems(bot, "Managed bean B1 which", "/" + PROJECT_NAME, "B1.java", "CDI Problem"); @@ -80,6 +80,7 @@ warningTrees.length == 0); } + @Test public void testMultipleBeansQF() { CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null, @@ -125,8 +126,6 @@ assertTrue(code.contains("public class BrokenFarm {")); assertTrue(code.contains("@Inject private Animal animal;")); - SWTEclipseExt.showView(bot, ViewType.PROBLEMS); - bot.sleep(3 * TIME_1S); SWTBotTreeItem[] warningTrees = ProblemsView .getFilteredWarningsTreeItems(bot, "Multiple beans are eligible", "/" + PROJECT_NAME, "BrokenFarm.java", "CDI Problem"); @@ -149,7 +148,7 @@ bot.button("Finish").isEnabled()); bot.clickButton("Finish"); - bot.sleep(2*TIME_1S); + bot.sleep(Timing.time2S()); util.waitForNonIgnoredJobs(); code = ed.toTextEditor().getText(); assertTrue(code.contains("@Inject @Q1 private Animal animal;")); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-16 23:31:24 UTC (rev 33996) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -14,6 +14,7 @@ import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardType; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; public class CDIUtil { @@ -23,14 +24,14 @@ nodeContextMenu(tree, item, "Configure","Add CDI (Context and Dependency Injection) support...").click(); bot.activeShell().bot().button("OK").click(); - bot.sleep(2000); + bot.sleep(Timing.time2S()); util.waitForNonIgnoredJobs(); } public static void resolveQuickFix(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) { nodeContextMenu(bot.tree(), item, "Quick Fix").click(); bot.activeShell().bot().button("Finish").click(); - bot.sleep(2000); + bot.sleep(Timing.time2S()); util.waitForNonIgnoredJobs(); } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-08-16 23:31:24 UTC (rev 33996) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -19,6 +19,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.SWTEclipseExt.StringConditionType; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -101,6 +102,7 @@ public static SWTBotTreeItem getErrorsNode (SWTBotExt bot){ SWTBotTreeItem errorsNode = null; SWTBot problemsBot = SWTEclipseExt.showView(bot,ViewType.PROBLEMS); + bot.sleep(Timing.time3S()); try{ SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null, IDELabel.ProblemsTree.ERRORS,"","","", @@ -121,6 +123,7 @@ public static SWTBotTreeItem getWarningsNode (SWTBotExt bot){ SWTBotTreeItem warningsNode = null; SWTBot problemsBot = SWTEclipseExt.showView(bot,ViewType.PROBLEMS); + bot.sleep(Timing.time3S()); try{ SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null, IDELabel.ProblemsTree.WARNINGS,"","","", Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-08-16 23:31:24 UTC (rev 33996) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -15,6 +15,7 @@ import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTOpenExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt; public class WSWizardTest extends TestCase{ @@ -41,7 +42,7 @@ bot.menu("File").menu("New").menu("Other...").click(); bot.shell("New").activate(); SWTBotTree tree = bot.tree(); - bot.sleep(1000); + bot.sleep(Timing.time1S()); tree.expandNode("Server").select("Server"); bot.button("Next >").click(); SWTBotTree tree2 = bot.tree(); @@ -51,7 +52,7 @@ bot.textWithLabel("Name").setText("AS4.2Runtime"); bot.textWithLabel("Home Directory").setText(JBOSS_AS_42_HOME); bot.button("Finish").click(); - bot.sleep(2000); + bot.sleep(Timing.time2S()); } } @@ -100,7 +101,7 @@ SWTBot dBot = bot.activeShell().bot(); dBot.comboBoxWithLabel("Service project:").setText("B"); dBot.button("OK").click(); - dBot.sleep(1000); + dBot.sleep(Timing.time1S()); } } public void setDefaultWSRuntime(){ @@ -110,6 +111,6 @@ tree.expandNode("Web Services").expandNode("Server and Runtime").select(); bot.comboBoxWithLabel("Web service runtime:").setSelection("JBossWS"); bot.button("OK").click(); - bot.sleep(2000); + bot.sleep(Timing.time2S()); } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-16 23:31:24 UTC (rev 33996) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-17 07:50:11 UTC (rev 33997) @@ -29,6 +29,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction; @@ -208,7 +209,7 @@ SWTBotTree tree = projectExplorer.bot().tree(); SWTBotTreeItem ti = tree.expandNode(project); new TreeItemAction(ti, "Configure","Add JAX-RS 1.1 support...").run(); - bot.sleep(500); + bot.sleep(Timing.time500MS()); util.waitForNonIgnoredJobs(); try { ti.getNode("RESTful Web Services");