[jbosstools-commits] JBoss Tools SVN: r35801 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.

[jbosstools-commits at lists.jboss.org]

Author: lzoubek at redhat.com
Date: 2011-10-19 08:31:12 -0400 (Wed, 19 Oct 2011)
New Revision: 35801

Modified:
   trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
Log:
esb bot tests: fix example selection based on current AS/EAP

Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java	2011-10-19 11:56:19 UTC (rev 35800)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java	2011-10-19 12:31:12 UTC (rev 35801)
@@ -80,6 +80,7 @@
 		SWTBotTreeItem jmsCall = SWTEclipseExt.selectTreeLocation(packageExplorer.show().bot(),clientClass);
 		eclipse.runTreeItemAsJavaApplication(jmsCall);
 		bot.sleep(Timing.time5S());
+		util.waitForNonIgnoredJobs();
 		console.switchConsole(configuredState.getServer().name);
 		String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
 		if (text.length()>=text2.length()) {
@@ -182,12 +183,9 @@
 		if (!configuredState.getServer().isConfigured) {
 			throw new NullPointerException("No server was configured for test, but it is required");
 		}
-		if (configuredState.getServer().version.equals("5.0")) {
+		if (configuredState.getServer().version.startsWith("5.")) {
 			ret+="5.0";
 		}
-		else if (configuredState.getServer().version.equals("5.1")) {
-			ret+="5.0";
-		}
 		else if (configuredState.getServer().version.equals("4.3")) {
 			ret+="4.3";
 		}