[jbosstools-commits] JBoss Tools SVN: r40073 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: uiutils and 1 other directory.

Author: jjankovi Date: 2012-04-05 09:02:28 -0400 (Thu, 05 Apr 2012) New Revision: 40073 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/AbstractTestSuite.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/SWTEclipseCDIExtUtil.java Log: Small refactoring and fixing Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/AbstractTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/AbstractTestSuite.java 2012-04-05 13:02:11 UTC (rev 40072) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/AbstractTestSuite.java 2012-04-05 13:02:28 UTC (rev 40073) @@ -10,13 +10,20 @@ ******************************************************************************/ package org.jboss.tools.cdi.bot.test; +import junit.framework.TestSuite; + import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil; -import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.types.ViewType; import org.junit.BeforeClass; -public abstract class AbstractTestSuite extends SWTTestExt { - +public abstract class AbstractTestSuite extends TestSuite { + + private static final SWTBotExt bot = new SWTBotExt(); + + private static final SWTEclipseExt eclipse = new SWTEclipseExt(bot); + /* * init method "setup()" shows a project explorer view as default, disable * folding (to easier source code editing) @@ -24,7 +31,7 @@ @BeforeClass public static void setUpSuite() { eclipse.showView(ViewType.PROJECT_EXPLORER); - SWTEclipseCDIExtUtil.disableFolding(bot, util); + SWTEclipseCDIExtUtil.disableFolding(); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/SWTEclipseCDIExtUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/SWTEclipseCDIExtUtil.java 2012-04-05 13:02:11 UTC (rev 40072) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/SWTEclipseCDIExtUtil.java 2012-04-05 13:02:28 UTC (rev 40073) @@ -11,15 +11,21 @@ package org.jboss.tools.cdi.bot.test.uiutils; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.ui.bot.ext.SWTBotExt; -import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; +import org.jboss.tools.ui.bot.ext.types.IDELabel; -public class SWTEclipseCDIExtUtil extends SWTEclipseExt { +public class SWTEclipseCDIExtUtil { + private static final SWTBotExt bot = new SWTBotExt(); + + private static final SWTUtilExt util = new SWTUtilExt(bot); + private SWTEclipseCDIExtUtil() { throw new AssertionError(); } @@ -29,8 +35,8 @@ * @param bot * @param util */ - public static void disableFolding(SWTBotExt bot, SWTUtilExt util) { - editFolding(bot, util, false); + public static void disableFolding() { + editFolding(false); } /** @@ -38,14 +44,14 @@ * @param bot * @param util */ - public static void enableFolding(SWTBotExt bot, SWTUtilExt util) { - editFolding(bot, util, true); + public static void enableFolding() { + editFolding(true); } - private static void editFolding(SWTBotExt bot, SWTUtilExt util, - boolean select) { - bot.menu(CDIConstants.WINDOW).menu(CDIConstants.PREFERENCES).click(); - bot.shell(CDIConstants.PREFERENCES).activate(); + private static void editFolding(boolean select) { + bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); + SWTBotShell preferencesShell = bot.shell(IDELabel.Shell.PREFERENCES); + preferencesShell.activate(); SWTBotTreeItem item = bot.tree(0).expandNode("Java", "Editor"); item.select("Folding"); SWTBotCheckBox foldCheckBox = bot.checkBox("Enable folding"); @@ -54,7 +60,9 @@ } else { foldCheckBox.deselect(); } - bot.button("OK").click(); + bot.button(IDELabel.Button.OK).click(); + bot.waitWhile(new ShellIsActiveCondition(preferencesShell), + TaskDuration.LONG.getTimeout()); bot.sleep(Timing.time2S()); util.waitForNonIgnoredJobs(); }