Author: jpeterka Date: 2010-04-15 04:03:03 -0400 (Thu, 15 Apr 2010) New Revision: 21486 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/.project trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ObjectMultiPageEditorBot.java Log: Updated MANIFEST.MF for lastest Bot (spy package removed) Object multipage editor enabled again BotExt several methods added (clickButton, extended sleep,...) Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/.project 2010-04-15 04:33:23 UTC (rev 21485) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/.project 2010-04-15 08:03:03 UTC (rev 21486) @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -24,5 +29,6 @@ <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-04-15 04:33:23 UTC (rev 21485) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-04-15 08:03:03 UTC (rev 21486) @@ -8,7 +8,6 @@ org.eclipse.core.runtime, org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0", org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0", - org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0", org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", org.eclipse.swtbot.junit4_x;bundle-version="2.0.0", org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", @@ -19,7 +18,8 @@ org.eclipse.datatools.connectivity.db.generic;bundle-version="1.0.1", org.jboss.tools.common.text.ext, org.eclipse.ui.ide;bundle-version="3.5.1", - org.jboss.tools.common.model + org.jboss.tools.common.model, + org.jboss.tools.common.model.ui;bundle-version="3.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j @@ -31,5 +31,3 @@ org.jboss.tools.ui.bot.ext.types, org.jboss.tools.ui.bot.ext.view Bundle-Vendor: JBoss by Red Hat -Import-Package: org.eclipse.ui.texteditor, - org.jboss.tools.common.editor Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-04-15 04:33:23 UTC (rev 21485) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-04-15 08:03:03 UTC (rev 21486) @@ -60,7 +60,7 @@ log.info("Button \"" + text + "\" selected"); return super.button(text); } - + @Override public SWTBotTree tree() { log.info("Tree selected"); @@ -78,6 +78,16 @@ log.info("Table selected"); return super.table(); } + + public void sleep(long ms, String msg) { + log.info("Bot sleeps for " + ms + " ms " + msg); + super.sleep(ms); + } + + @Override + public void sleep(long ms) { + sleep(ms,""); + } public SWTBotEditorExt swtBotEditorExtByTitle(String fileName) { SWTBotEditor editor = super.editorByTitle(fileName); @@ -122,5 +132,10 @@ "Could not find widget of type Browser", ex); } } + + public SWTBotButton clickButton(String text) { + return button(text).click(); + } + } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ObjectMultiPageEditorBot.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ObjectMultiPageEditorBot.java 2010-04-15 04:33:23 UTC (rev 21485) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ObjectMultiPageEditorBot.java 2010-04-15 08:03:03 UTC (rev 21486) @@ -11,7 +11,7 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -// import org.jboss.tools.common.editor.ObjectMultiPageEditor; +import org.jboss.tools.common.editor.ObjectMultiPageEditor; /** * @@ -55,7 +55,7 @@ } public void selectPage(final String pageName) { - /* + //assertTrue(ref.getPart(true) instanceof Hibernate3CompoundEditor); assertTrue(ref.getPart(true) instanceof ObjectMultiPageEditor); @@ -68,8 +68,7 @@ public void run() { editor.selectPageByName(pageName); } - }); - */ + }); } }