Author: objectiser Date: 2010-10-07 05:53:32 -0400 (Thu, 07 Oct 2010) New Revision: 1030 Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartBPELInvokeESBEBWSTestCase.java Removed: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java Modified: trunk/integration-tests/build.xml Log: Prevent packaging of ESB tests. Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-10-07 09:01:26 UTC (rev 1029) +++ trunk/integration-tests/build.xml 2010-10-07 09:53:32 UTC (rev 1030) @@ -26,10 +26,16 @@ <available file="${oracle.driver.path}" /> </condition> - <condition property="is.replace.qa.jdbc"> - <equals arg1="true" arg2="${replace.qa.jdbc}" /> - </condition> + <condition property="is.replace.qa.jdbc"> + <equals arg1="true" arg2="${replace.qa.jdbc}" /> + </condition> + <condition property="is.test.esb"> + <not> + <equals arg1="false" arg2="${testesb}" /> + </not> + </condition> + <target name="get.oracle.driver" unless="is.oracle.driver.available" description="Download oracle jdbc"> @@ -169,21 +175,11 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_pick/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_bpel_approval_service/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world_extended_timeout/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world_no_extended_timeout/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_loan_approval/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_loan_fault/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml" /> - <ant antfile="src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml" /> - <ant antfile="src/test/resources/samples/Tutorial_bpel_atm/build.xml" /> <ant antfile="src/test/resources/samples/Tutorial_bpel_purchase/build.xml" /> <ant antfile="src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_118/build.xml" /> - <ant antfile="src/test/resources/testcases/RiftSaw_144/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_154/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_163/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_70/build.xml" /> @@ -199,9 +195,23 @@ <ant antfile="src/test/resources/tutorials/BluePrint4/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint5/build.xml" /> + <antcall target="package-tests-esb" /> <antcall target="package-tests-ws-stack" /> </target> + <target name="package-tests-esb" if="is.test.esb" > + <ant antfile="src/test/resources/samples/Quickstart_bpel_approval_service/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world_extended_timeout/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_hello_world_no_extended_timeout/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_loan_approval/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_esb_bpel_loan_fault/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml" /> + + <ant antfile="src/test/resources/testcases/RiftSaw_144/build.xml" /> + </target> + <target name="package-tests-ws-stack" if="is.cxf.ws.stack" > <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service/build.xml" /> Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartBPELInvokeESBEBWSTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java) =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartBPELInvokeESBEBWSTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartBPELInvokeESBEBWSTestCase.java 2010-10-07 09:53:32 UTC (rev 1030) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.soa.bpel.tests.esb; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_loan_approval sample from an ESB service. + */ +public class QuickstartBPELInvokeESBEBWSTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_approval_service"; + + public QuickstartBPELInvokeESBEBWSTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + if (System.getProperty("ws.stack","native").equals("native")) { + return(new RiftSawTestSetup(QuickstartBPELInvokeESBEBWSTestCase.class, + TEST_NAME, "CreditAgency.esb,Quickstart_bpel_approval_service-1.jar")); + } else { + return(new junit.framework.TestSuite()); + } + } + + public void testSendHello() throws Exception { + + String result=sendSOAPMessage("approve_request1.xml", + "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); + + result = processResult(result); + + assertMessageFromFile(result, "approve_response1.xml"); + } +} Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-10-07 09:01:26 UTC (rev 1029) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-10-07 09:53:32 UTC (rev 1030) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.soa.bpel.tests.samples; - -import org.jboss.soa.bpel.tests.RiftSawTest; -import org.jboss.soa.bpel.tests.RiftSawTestSetup; - -import junit.framework.Test; - -/** - * Test case for running the Quickstart_bpel_loan_approval sample from an ESB service. - */ -public class QuickstartBPELInvokeESBEBWSTestCase extends RiftSawTest { - - private static final String TEST_NAME = "Quickstart_bpel_approval_service"; - - public QuickstartBPELInvokeESBEBWSTestCase() { - super(TEST_NAME); - } - - public static Test suite() { - if (System.getProperty("ws.stack","native").equals("native")) { - return(new RiftSawTestSetup(QuickstartBPELInvokeESBEBWSTestCase.class, - TEST_NAME, "CreditAgency.esb,Quickstart_bpel_approval_service-1.jar")); - } else { - return(new junit.framework.TestSuite()); - } - } - - public void testSendHello() throws Exception { - - String result=sendSOAPMessage("approve_request1.xml", - "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); - - result = processResult(result); - - assertMessageFromFile(result, "approve_response1.xml"); - } -}