Author: ldimaggio Date: 2012-04-22 21:49:52 -0400 (Sun, 22 Apr 2012) New Revision: 40400 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/HelloWorld.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java Log: ESBExampleTest.java Added code to ensure that the server console is selected after the client executes Added code to ensure that console text is returned to the calling test HelloWorld.java Added code to explicitly check for ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler] deploy error WebServiceConsumer1.java SmooksXML2POJO.java SmooksXML2XMLSimple.java SmooksCSV2XML.java SmooksXML2XMLDateManipulation.java Added statement to delete project from server after test completes 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-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -82,18 +82,39 @@ * @return string in server log console that was appended or null if nothing appended */ protected String executeClientGetServerOutput(String... clientClass) { - String text = console.getConsoleText(); + //String text = console.getConsoleText(); SWTBotTreeItem jmsCall = SWTEclipseExt.selectTreeLocation(packageExplorer.show().bot(),clientClass); eclipse.runTreeItemAsJavaApplication(jmsCall); bot.sleep(Timing.time5S()); util.waitForNonIgnoredJobs(); - console.switchConsole(configuredState.getServer().name); + + // New - the consoles fail to switch....sometimes + boolean consoleSwitched = false; + int switchLimit = 30; + int switchCounter = 0; + consoleSwitched = console.switchConsole(configuredState.getServer().name); + while (!consoleSwitched) { + consoleSwitched = console.switchConsole(configuredState.getServer().name); + bot.sleep(Timing.time10S()); + log.error("Console did not switch - retrying."); + if (switchCounter++ > switchLimit) { + break; + } + } + //console.switchConsole(configuredState.getServer().name); + //String text2 = console.getConsoleText(TIME_5S, TIME_20S, false); String text2 = console.getConsoleText(TIME_5S, TIME_60S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */ - if (text.length()>=text2.length()) { + log.info("text2=" + text2); + console.clearConsole(); + + if (text2.length() == 0) { return null; } - return text2.substring(text.length()); + else { + return text2; + } + } /** * executes given class in given project (path must include project name) 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-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -6,6 +6,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.junit.AfterClass; +import org.junit.Test; @Require(server=(a)Server(type=ServerType.SOA,state=ServerState.Running)) public class HelloWorld extends ESBExampleTest { @@ -27,10 +28,13 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworld.test","SendJMSMessage.java"); assertNotNull("Calling JMS Send message failed, nothing appened to server log",text); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Body: Hello World")); text = null; + text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworld.test","SendEsbMessage.java"); assertNotNull("Calling ESB Send message failed, nothing appened to server log",text); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb")); SWTTestExt.servers.removeAllProjectsFromServer(); Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -20,8 +20,8 @@ protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformcsv2xml","SendJMSMessage.java"); - SWTTestExt.servers.removeAllProjectsFromServer(); assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<csv-set>")); + SWTTestExt.servers.removeAllProjectsFromServer(); } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -25,7 +25,7 @@ assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items")); text = executeClient(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","ReceiveJMSMessage.java"); + assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items")); SWTTestExt.servers.removeAllProjectsFromServer(); - assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items")); } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -21,8 +21,8 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test","SendJMSMessage.java"); bot.sleep(Timing.time3S()); - SWTTestExt.servers.removeAllProjectsFromServer(); assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("OrderDate")); + SWTTestExt.servers.removeAllProjectsFromServer(); } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -22,8 +22,8 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test","SendJMSMessage.java"); bot.sleep(Timing.time3S()); - SWTTestExt.servers.removeAllProjectsFromServer(); assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<Order")); + SWTTestExt.servers.removeAllProjectsFromServer(); } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-04-21 14:39:01 UTC (rev 40399) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-04-23 01:49:52 UTC (rev 40400) @@ -23,9 +23,8 @@ assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Greeting for")); text = null; text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test","SendEsbMessage.java"); - SWTTestExt.servers.removeAllProjectsFromServer(); 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 Greeting for")); - + SWTTestExt.servers.removeAllProjectsFromServer(); } }