Author: mriou
Date: Wed Mar 28 13:32:04 2007
New Revision: 523453
URL: http://svn.apache.org/viewvc?view=rev&rev=523453
Log:
Fixed the basic test case (hello, wrong NS, if and timer).
Modified:
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/scheduler/TestScheduler.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTestAbstract.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/test.properties
Modified:
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/scheduler/TestScheduler.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/scheduler/TestScheduler.java?view=diff&rev=523453&r1=523452&r2=523453
==============================================================================
---
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/scheduler/TestScheduler.java
(original)
+++
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/scheduler/TestScheduler.java
Wed Mar 28 13:32:04 2007
@@ -48,6 +48,13 @@
};
public String schedulePersistedJob(Map<String, Object> detail, Date date)
throws ContextException {
+ if (date != null) {
+ try {
+ while(new Date().before(date)) Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
return scheduleVolatileJob(true, detail);
}
Modified:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTestAbstract.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTestAbstract.java?view=diff&rev=523453&r1=523452&r2=523453
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTestAbstract.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTestAbstract.java
Wed Mar 28 13:32:04 2007
@@ -225,7 +225,7 @@
throw e;
}
- running.get(20000, TimeUnit.MILLISECONDS);
+ running.get(200000, TimeUnit.MILLISECONDS);
switch (mex.getStatus()) {
case RESPONSE:
Modified:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?view=diff&rev=523453&r1=523452&r2=523453
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
Wed Mar 28 13:32:04 2007
@@ -8,11 +8,8 @@
public void testNegativeTargetNS1() throws Throwable {
/**
* Test for an invalid targetNamespace has been entered into
the WSDL.
- *
* See JIRA ODE-67
- *
* Test for a specific exception message.
- *
*/
go("target/test-classes/bpel/2.0/NegativeTargetNSTest1");
}
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel?view=diff&rev=523453&r1=523452&r2=523453
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel
Wed Mar 28 13:32:04 2007
@@ -1,46 +1,46 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testTimer";
- xmlns:wns="http://ode/bpel/unit-test/testTimer.wsdl";
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
- name="TestTimerProcess"
- targetNamespace="http://ode/bpel/unit-test/testTimer";
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-
- <import location="TestTimer.wsdl"
- namespace="http://ode/bpel/unit-test/testTimer.wsdl";
- importType="http://schemas.xmlsoap.org/wsdl/"; />
- <import location="../ProbeService/probeService.wsdl"
- namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
- importType="http://schemas.xmlsoap.org/wsdl/"/>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testTimer";
+ xmlns:wns="http://ode/bpel/unit-test/testTimer.wsdl";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ name="TestTimerProcess"
+ targetNamespace="http://ode/bpel/unit-test/testTimer";
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <import location="TestTimer.wsdl"
+ namespace="http://ode/bpel/unit-test/testTimer.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+ <import location="../ProbeService/probeService.wsdl"
+ namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
<!-- Unit test Timer Service Test -->
<partnerLinks>
- <partnerLink name="request"
partnerLinkType="wns:testTimerRequest" myRole="testTimerService"/>
+ <partnerLink name="request"
partnerLinkType="wns:testTimerRequest" myRole="testTimerService"/>
<partnerLink name="probe" partnerLinkType="wns:probeRequest"
partnerRole="probeService" initializePartnerRole="yes"/>
- </partnerLinks>
+ </partnerLinks>
<variables>
<variable name="request" messageType="wns:requestMessage"/>
@@ -63,14 +63,11 @@
<invoke name="probe1" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"/>
- <wait>
- <for>'PT10S'</for>
+ <wait>
+ <for>'PT10S'</for>
</wait>
<invoke name="probe2" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"/>
-
- <!-- block until request message is sent -->
- <receive name="receive2" partnerLink="request"
portType="wns:testTimerPT" operation="continue" variable="request"/>
<!-- Copy input variables to internal accumulators -->
<assign name="assign2">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/test.properties?view=diff&rev=523453&r1=523452&r2=523453
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestTimer/test.properties
Wed Mar 28 13:32:04 2007
@@ -2,6 +2,4 @@
service=testTimerService
operation=request
request1=<message><requestID>Start Test4.1</requestID><requestText>Event Start
Test4.1</requestText></message>
-response1=.*test.*
-request2=<message><requestID>Start Test4.2</requestID><requestText>Event Start
Test4.2</requestText></message>
-response2=.*test.*
+response1=.*Test.*
