[jbosstools-commits] JBoss Tools SVN: r25298 - in trunk: hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite and 1 other directories.
Author: jpeterka
Date: 2010-09-29 09:48:41 -0400 (Wed, 29 Sep 2010)
New Revision: 25298
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
Updated to work with JBT 3.2.0 Beta1
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java
===================================================================
---
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2010-09-29
13:30:20 UTC (rev 25297)
+++
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase/ConfigurationFileTest.java 2010-09-29
13:48:41 UTC (rev 25298)
@@ -119,8 +119,8 @@
String roleName = "role1";
String entityName = "entity1";
- bot.textWithLabel("Role*").setText("role1");
- bot.textWithLabel("Entity-Name*").setText("entity1");
+ bot.textWithLabel("Role:*").setText("role1");
+ bot.textWithLabel("Entity-Name:*").setText("entity1");
SWTBotShell shell = bot.shell("Add Grant");
assertNotNull(shell);
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateTest.java
===================================================================
---
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateTest.java 2010-09-29
13:30:20 UTC (rev 25297)
+++
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testsuite/HibernateTest.java 2010-09-29
13:48:41 UTC (rev 25298)
@@ -47,6 +47,7 @@
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.PerspectiveType;
import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.junit.BeforeClass;
public class HibernateTest extends SWTTestExt {
@@ -62,8 +63,10 @@
/**
* Prepare project and classes
*/
+ @BeforeClass
public static void prepare() {
log.info("Hibernate All Test Started");
+ jbt.closeReportUsageWindowIfOpened(true);
}
/**
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-09-29
13:30:20 UTC (rev 25297)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-09-29
13:48:41 UTC (rev 25298)
@@ -179,7 +179,12 @@
bot.sleep(Timing.time1S());
menu2.menu(IDELabel.Menu.OTHER).click();
bot.sleep(Timing.time1S());
+ try {
bot.table().select(perspectiveLabel);
+ } catch (WidgetNotFoundException e) {
+ log.warn("WARN - Perspecive with label " + perspectiveLabel + " not
found, try + (default)");
+ bot.table().select(perspectiveLabel + (" (default)"));
+ }
bot.sleep(Timing.time1S());
// Another approach
SWTBotShell openPerpectiveShell = bot.shell("Open Perspective");
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-09-29
13:30:20 UTC (rev 25297)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-09-29
13:48:41 UTC (rev 25298)
@@ -508,7 +508,7 @@
*/
public void closeReportUsageWindowIfOpened(boolean cancel) {
try {
- bot.shell("Report usage").activate();
+ bot.shell("JBoss Tools Usage").activate();
bot.button(
cancel ? IDELabel.Button.CANCEL
: IDELabel.Button.OK).click();