Author: lzoubek(a)redhat.com Date: 2011-07-15 10:34:46 -0400 (Fri, 15 Jul 2011) New Revision: 32942 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 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/WebServiceProducer.java Log: updated esb example tests according to botext parrent 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -14,7 +14,27 @@ public class ESBExampleTest extends ExampleTest{ + + /** + * returns example project name (as it is imported to workspace) + * @return + */ + public String getExampleProjectName() { + return getProjectNames()[0]; + } + /** + * returns name of example client project (null if none) + * @return + */ + public String getExampleClientProjectName() { + return getProjectNames()[1]; + } @Override + public String[] getProjectNames() { + return new String[2]; + } + + @Override public String getExampleCategory() { return getRunningSoaVersionTreeLabel(); } 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -13,13 +13,9 @@ return "JBoss ESB HelloWorld Example - ESB"; } @Override - public String getExampleProjectName() { - return "helloworld"; + public String[] getProjectNames() { + return new String[] {"helloworld","helloworld_testclient"}; } - @Override - public String getExampleClientProjectName() { - return "helloworld_testclient"; - } @AfterClass public static void waitaminute() { //bot.sleep(Long.MAX_VALUE); 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -12,13 +12,9 @@ return "JBoss ESB HelloWorld Action Example - ESB"; } @Override - public String getExampleProjectName() { - return "helloworld_action"; + public String[] getProjectNames() { + return new String[] {"helloworld_action","helloworld_action_client"}; } - @Override - public String getExampleClientProjectName() { - return "helloworld_action_client"; - } @Override protected void executeExample() { 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -12,14 +12,10 @@ return "JBoss ESB HelloWorld File Action Example - ESB"; } @Override - public String getExampleProjectName() { - return "helloworld_file_action"; + public String[] getProjectNames() { + return new String[] {"helloworld_file_action","helloworld_file_action_client"}; } @Override - public String getExampleClientProjectName() { - return "helloworld_file_action_client"; - } - @Override protected void executeExample() { fail("Example execution not yet implemented"); } 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -12,15 +12,10 @@ return "JBoss ESB Smooks CSV->XML Example"; } @Override - public String getExampleProjectName() { - return "transform_CSV2XML"; + public String[] getProjectNames() { + return new String[] {"transform_CSV2XML","transform_CSV2XML_client"}; } @Override - public String getExampleClientProjectName() { - return "transform_CSV2XML_client"; - } - - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformcsv2xml","SendJMSMessage.java"); 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -13,15 +13,10 @@ return "JBoss ESB Smooks XML->POJO Example"; } @Override - public String getExampleProjectName() { - return "transform_XML2POJO"; + public String[] getProjectNames() { + return new String[] {"transform_XML2POJO","transform_XML2POJO_client"}; } @Override - public String getExampleClientProjectName() { - return "transform_XML2POJO_client"; - } - - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","SendJMSMessage.java"); 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -12,16 +12,10 @@ public String getExampleName() { return "JBoss ESB Smooks XML->XML date-manipulation Example"; } - @Override - public String getExampleProjectName() { - return "transform_XML2XML_date_manipulation"; + public String[] getProjectNames() { + return new String[] {"transform_XML2XML_date_manipulation","transform_XML2XML_date_manipulation_client"}; } @Override - public String getExampleClientProjectName() { - return "transform_XML2XML_date_manipulation_client"; - } - - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test","SendJMSMessage.java"); 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -12,16 +12,10 @@ public String getExampleName() { return "JBoss ESB Smooks XML->XML Example"; } - @Override - public String getExampleProjectName() { - return "transform_XML2XML_simple"; + public String[] getProjectNames() { + return new String[] {"transform_XML2XML_simple","transform_XML2XML_simple_client"}; } @Override - public String getExampleClientProjectName() { - return "transform_XML2XML_simple_client"; - } - - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test","SendJMSMessage.java"); 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 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -11,15 +11,10 @@ public String getExampleName() { return "JBoss ESB Web Service consumer1 Example"; } - @Override - public String getExampleProjectName() { - return "webservice_consumer1"; + public String[] getProjectNames() { + return new String[] {"webservice_consumer1","webservice_consumer1_client"}; } @Override - public String getExampleClientProjectName() { - return "webservice_consumer1_client"; - } - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test","SendJMSMessage.java"); Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2011-07-15 14:32:10 UTC (rev 32941) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2011-07-15 14:34:46 UTC (rev 32942) @@ -11,16 +11,10 @@ public String getExampleName() { return "JBoss ESB Web Service producer Example"; } - @Override - public String getExampleProjectName() { - return "webservice_producer"; + public String[] getProjectNames() { + return new String[] {"webservice_producer","webservice_producer_client"}; } @Override - public String getExampleClientProjectName() { - return "webservice_producer_client"; - } - - @Override protected void executeExample() { super.executeExample(); String text = executeClientGetServerOutput("org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage","jms");