[jbosstools-commits] JBoss Tools SVN: r42985 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: examples and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: ldimaggio
Date: 2012-08-11 18:59:44 -0400 (Sat, 11 Aug 2012)
New Revision: 42985

Modified:
   trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
   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/HelloWorld.java
Log:
Updated to run on Eclipse Juno
https://issues.jboss.org/browse/JBQA-6462



Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java	2012-08-11 00:22:14 UTC (rev 42984)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java	2012-08-11 22:59:44 UTC (rev 42985)
@@ -32,7 +32,7 @@
 	NewProjectUsingRuntime.class,
 	NewProjectUsingBundledInEAP.class,
 	Editing.class,
-	HelloWorld.class,
+	HelloWorld.class,	
 	HelloWorldAction.class,
 	HelloWorldFileAction.class,
 	SmooksCSV2XML.class,
@@ -40,7 +40,7 @@
 	SmooksXML2XMLDateManipulation.class,
 	SmooksXML2XMLSimple.class,
 	WebServiceConsumer1.class,
-//	WebServiceProducer.class,  // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+	WebServiceProducer.class,  // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
 	WebServiceProducerHttp.class,
 	WebServiceProducerSocket.class
 	//SimpleEAPTest.class

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	2012-08-11 00:22:14 UTC (rev 42984)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java	2012-08-11 22:59:44 UTC (rev 42985)
@@ -94,7 +94,11 @@
 	protected String executeClientGetServerOutput(String... clientClass) {
 		//String text = console.getConsoleText();
 		SWTBotTreeItem jmsCall = SWTEclipseExt.selectTreeLocation(packageExplorer.show().bot(),clientClass);
-		eclipse.runTreeItemAsJavaApplication(jmsCall);
+		// eclipse.runTreeItemAsJavaApplication(jmsCall);
+		
+		/* ldimaggi - Aug 2012 - https://issues.jboss.org/browse/JBQA-6462 */
+		eclipse.runTreeItemAsJavaApplication2(jmsCall);
+		
 		bot.sleep(Timing.time5S());
 		util.waitForNonIgnoredJobs();
 		String returnString = consoleWaiting();
@@ -110,7 +114,11 @@
 	 */
 	protected String executeClient(String... clientClass) {	
 		SWTBotTreeItem jmsCall = SWTEclipseExt.selectTreeLocation(packageExplorer.show().bot(),clientClass);
-		eclipse.runTreeItemAsJavaApplication(jmsCall);
+		
+		//eclipse.runTreeItemAsJavaApplication(jmsCall);
+		/* ldimaggi - Aug 2012 - https://issues.jboss.org/browse/JBQA-6462 */
+		eclipse.runTreeItemAsJavaApplication2(jmsCall);
+		
 		bot.sleep(Timing.time5S());
 		String text =  console.getConsoleText(TIME_5S, TIME_20S, false);
 		console.switchConsole(configuredState.getServer().name); // switch console back for sure
@@ -132,6 +140,7 @@
 	
 	protected String consoleWaiting () {
 		// New - the consoles fail to switch....sometimes
+		bot.sleep(60000);
 		boolean consoleSwitched = false;	
 		int switchLimit = 30;
 		int switchCounter = 0;
@@ -204,7 +213,7 @@
 				new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.PROPERTIES, false)).click();
 				SWTBotShell shell = bot.activeShell();
 
-				/* ldimagi - July 2012 - added this as all tests were failing - unclear how this EVER worked before the change */
+				/* ldimaggi - July 2012 - added this as all tests were failing - unclear how this EVER worked before the change */
 				if (lib.contains("ESB")) {
 					shell.bot().table().select("ESB-" + configuredState.getServer().bundledESBVersion);
 				}

Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java	2012-08-11 00:22:14 UTC (rev 42984)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java	2012-08-11 22:59:44 UTC (rev 42985)
@@ -36,7 +36,7 @@
 		assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
 		assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
 		assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb"));
-		
+	
 		SWTTestExt.servers.removeAllProjectsFromServer();
 	}
 }