[jbosstools-commits] JBoss Tools SVN: r39767 - in trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test: src/org/jboss/tools/freemarker/ui/bot/test and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Mar 22 09:58:09 EDT 2012
Author: jpeterka
Date: 2012-03-22 09:58:07 -0400 (Thu, 22 Mar 2012)
New Revision: 39767
Added:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/RunAs.java
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
Log:
Freemarker update to run on maven (pom updated, RunAs bot ext added, etc.)
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-03-22 13:30:00 UTC (rev 39766)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-03-22 13:58:07 UTC (rev 39767)
@@ -19,16 +19,33 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <testSuite>org.jboss.tools.freemarker.ui.bot.test</testSuite>
+ <testClass>org.jboss.tools.freemarker.ui.bot.test.FreeMarkerSuite</testClass>
<skip>${swtbot.test.skip}</skip>
- <dependencies>
+ <dependencies combine.children="append">
<dependency>
<type>p2-installable-unit</type>
+ <artifactId>org.eclipse.ui.views.log</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.pde</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jdt</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
<artifactId>org.eclipse.platform</artifactId>
<version>0.0.0</version>
- </dependency>
+ </dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.jboss.ide.eclipse.freemarker.feature</artifactId>
+ <artifactId>org.jboss.ide.eclipse.freemarker.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
</dependencies>
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java 2012-03-22 13:30:00 UTC (rev 39766)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java 2012-03-22 13:58:07 UTC (rev 39767)
@@ -17,7 +17,6 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.helper.FileHelper;
import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
import org.jboss.tools.ui.bot.ext.helper.ResourceHelper;
@@ -44,6 +43,8 @@
eclipse.closeView(IDELabel.View.WELCOME);
eclipse.closeView(IDELabel.View.JBOSS_CENTRAL);
eclipse.closeAllEditors();
+ util.waitForAll();
+ open.perspective(ActionItem.Perspective.JAVA.LABEL);
}
@Test
@@ -75,7 +76,7 @@
util.waitForNonIgnoredJobs();
}
- private void openFTLFileInEditor() {
+ private void openFTLFileInEditor() {
SWTBotView viewOpen = open
.viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
@@ -136,7 +137,8 @@
.viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
Tree.select(viewOpen.bot(), prj,"src","org.jboss.tools.freemarker.testprj","FMTest.java");
- ContextMenuHelper.clickContextMenu(viewOpen.bot().tree(),"Run As","2 Java Application");
+ RunAs.click("Java Application");
+
SWTBotShell s = bot.shell("Progress Information");
bot.waitUntil(shellCloses(s));
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/RunAs.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/RunAs.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/RunAs.java 2012-03-22 13:58:07 UTC (rev 39767)
@@ -0,0 +1,49 @@
+package org.jboss.tools.freemarker.ui.bot.test;
+
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.WidgetResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+/**
+ * RunAs bot helper
+ * @author jpeterka
+ *
+ */
+public class RunAs {
+
+ public static void click(final String contains) {
+
+ SWTBotExt bot = new SWTBotExt();
+ final SWTBotMenu menuRunAs = bot.menu(IDELabel.Menu.RUN).menu(
+ IDELabel.Menu.RUN_AS);
+ final MenuItem menuItem = UIThreadRunnable
+ .syncExec(new WidgetResult<MenuItem>() {
+ public MenuItem run() {
+ int menuItemIndex = 0;
+ MenuItem menuItem = null;
+ final MenuItem[] menuItems = menuRunAs.widget.getMenu()
+ .getItems();
+ while (menuItem == null
+ && menuItemIndex < menuItems.length) {
+ if (menuItems[menuItemIndex].getText().indexOf(
+ contains) > -1) {
+ menuItem = menuItems[menuItemIndex];
+ } else {
+ menuItemIndex++;
+ }
+ }
+ return menuItem;
+ }
+ });
+ if (menuItem != null) {
+ new SWTBotMenu(menuItem).click();
+ } else {
+ throw new WidgetNotFoundException(
+ "Unable to find Menu Item with Label " + contains);
+ }
+ }
+}
Property changes on: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/RunAs.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
More information about the jbosstools-commits
mailing list