Author: ldimaggio Date: 2012-04-25 00:09:04 -0400 (Wed, 25 Apr 2012) New Revision: 40464 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/HelloWorldAction.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.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 Log: Added code to undeploy all projects when each 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -105,17 +105,19 @@ //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 */ - log.info("text2=" + text2); - console.clearConsole(); - - if (text2.length() == 0) { + log.info("text2 = " + text2); + //console.clearConsole(); + + if (text2.length() == 0) { return null; } else { return text2; - } - + } } + + + /** * executes given class in given project (path must include project name) * @param path clientClass as could be seen in package explorer (e.g src, org.jboss.tools.test.Class.java) 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -27,14 +27,14 @@ protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworld.test","SendJMSMessage.java"); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); 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]")); + 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(); Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-04-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -23,6 +23,6 @@ String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworldaction.test","SendJMSMessage.java"); assertNotNull("Calling JMS Send message failed, nothing appened to server log",text); assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Action ESB invoked!")); - SWTTestExt.servers.removeAllProjectsFromServer(); + SWTTestExt.servers.removeAllProjectsFromServer(); } } Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-04-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -114,7 +114,7 @@ String text = executeClientGetServerOutput(getExampleClientProjectName(),"src", "org.jboss.soa.esb.samples.quickstart.helloworldfileaction.test", "CreateTestFile.java"); - + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); assertNotNull("Calling JMS Send message failed, nothing appened to server log",text); assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Body: Hello World")); 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -20,6 +20,7 @@ protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformcsv2xml","SendJMSMessage.java"); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -22,9 +22,13 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","SendJMSMessage.java"); bot.sleep(Timing.time3S()); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); 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"); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); + assertNotNull("Calling Send message failed, nothing appened to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items")); SWTTestExt.servers.removeAllProjectsFromServer(); } 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -21,6 +21,7 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test","SendJMSMessage.java"); bot.sleep(Timing.time3S()); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); 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-25 03:43:53 UTC (rev 40463) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-04-25 04:09:04 UTC (rev 40464) @@ -22,6 +22,7 @@ super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test","SendJMSMessage.java"); bot.sleep(Timing.time3S()); + assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]")); 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();