Author: vanto Date: Wed Jul 18 15:39:12 2007 New Revision: 557420 URL: http://svn.apache.org/viewvc?view=rev&rev=557420 Log: Trying to earn some karma :), some test cases have been fixed.
Modified: incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl Modified: incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?view=diff&rev=557420&r1=557419&r2=557420 ============================================================================== --- incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original) +++ incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Wed Jul 18 15:39:12 2007 @@ -233,7 +233,7 @@ addInvoke(testPropsFile + "#" + i, serviceId, operation, in, responsePattern); } - + propsFileCnt++; testPropsFile = new File(deployDir, "test" + propsFileCnt + ".properties"); } } @@ -422,6 +422,9 @@ public String toString() { StringBuffer sbuf = new StringBuffer(where + ": " + msg); + if (ex != null) { + sbuf.append("; got exception msg: " + ex.getMessage()); + } if (actual != null) sbuf.append("; got " + actual + ", expected " + expected); return sbuf.toString(); Modified: incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java?view=diff&rev=557420&r1=557419&r2=557420 ============================================================================== --- incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java (original) +++ incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java Wed Jul 18 15:39:12 2007 @@ -63,9 +63,19 @@ // so no instance has been created after a process has been retired. go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-1"); assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); + + // clean up deployment and invocations + _deployments.clear(); + _invocations.clear(); + go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-2"); assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances()); + + // clean up deployment and invocations + _deployments.clear(); + _invocations.clear(); + go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-3"); assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances()); @@ -75,6 +85,10 @@ public void testVersionedUndeployDeploy() throws Throwable { go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-1"); doUndeployments(); + + //clean up invocations before next run + _invocations.clear(); + go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-1"); // We should have a brand new version 1 with no version 2 assertNull(store.getProcessConfiguration(qName1)); Modified: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl?view=diff&rev=557420&r1=557419&r2=557420 ============================================================================== --- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl (original) +++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl Wed Jul 18 15:39:12 2007 @@ -46,7 +46,7 @@ </wsdl:operation> </wsdl:portType> - <plnk:partnerLinkType name="testImplicitFaultHandlwequest"> + <plnk:partnerLinkType name="testImplicitFaultHandlerRequest"> <plnk:role name="testImplicitFaultHandlerService" portType="tns:testImplicitFaultHandlerPT"/> </plnk:partnerLinkType>