Author: hansbak
Date: Thu Mar 18 07:33:48 2010
New Revision: 924662
URL: http://svn.apache.org/viewvc?rev=924662&view=rev
Log:
make the custrequest tests work again (failed because of r924647 ) and move
them from the party to the order component in their own file
Added:
ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
ofbiz/trunk/applications/order/testdef/CustRequestTests.xml
Modified:
ofbiz/trunk/applications/order/ofbiz-component.xml
ofbiz/trunk/applications/order/testdef/OrderTest.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=924662&r1=924661&r2=924662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Thu Mar 18 07:33:48 2010
@@ -52,6 +52,7 @@ under the License.
<service-resource type="eca" loader="main"
location="servicedef/secas.xml"/>
<test-suite loader="main" location="testdef/OrderTest.xml"/>
+ <test-suite loader="main" location="testdef/CustRequestTests.xml"/>
<test-suite loader="main" location="testdef/quotetests.xml"/>
<test-suite loader="main" location="testdef/ShoppingListTests.xml"/>
Added:
ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml?rev=924662&view=auto
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
(added)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
Thu Mar 18 07:33:48 2010
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>
+
+ <simple-method method-name="testCreateNewRequest"
short-description="create a new request" login-required="false">
+ <set field="createNewRequestMap.custRequestTypeId"
value="RF_PROPOSAL"/>
+ <set field="createNewRequestMap.statusId" value="CRQ_SUBMITTED"/>
+ <set field="createNewRequestMap.custRequestName" value="Test Customer
request"/>
+ <set field="createNewRequestMap.priority" value="1L" type="Long"/>
+ <set field="createNewRequestMap.fromPartyId" value="DemoCustomer"/>
+ <entity-one entity-name="UserLogin"
value-field="createNewRequestMap.userLogin">
+ <field-map field-name="userLoginId" value="system"/>
+ </entity-one>
+ <call-service service-name="createCustRequest"
in-map-name="createNewRequestMap">
+ <result-to-field result-name="custRequestId"
field="requestMap.custRequestId"/>
+ </call-service>
+ <call-simple-method method-name="inlineUpdateRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest">
+ <field-map field-name="custRequestId"
from-field="requestMap.custRequestId"/>
+ </entity-one>
+ <assert>
+ <not><if-empty field="custRequest"/></not>
+ <if-compare-field field="custRequest.custRequestId"
to-field="requestMap.custRequestId" operator="equals"/>
+ <if-compare-field field="custRequest.custRequestTypeId"
to-field="updateRequestMap.custRequestTypeId" operator="equals"/>
+ <if-compare-field field="custRequest.statusId"
to-field="updateRequestMap.statusId" operator="equals"/>
+ <if-compare-field field="custRequest.custRequestName"
to-field="updateRequestMap.custRequestName" operator="equals"/>
+ <if-compare-field field="custRequest.priority"
to-field="updateRequestMap.priority" operator="equals"/>
+ <if-compare-field field="custRequest.fromPartyId"
to-field="updateRequestMap.fromPartyId" operator="equals"/>
+ </assert>
+ <check-errors/>
+ </simple-method>
+ <simple-method method-name="inlineUpdateRequest" short-description="update
a request" login-required="false">
+ <set field="updateRequestMap.custRequestId"
from-field="requestMap.custRequestId"/>
+ <set field="updateRequestMap.custRequestTypeId" value="RF_INFO"/>
+ <set field="updateRequestMap.statusId" value="CRQ_ACCEPTED"/>
+ <set field="updateRequestMap.custRequestName" value="New Test Customer
request"/>
+ <set field="updateRequestMap.priority" value="2L" type="Long"/>
+ <set field="updateRequestMap.fromPartyId" value="admin"/>
+ <entity-one entity-name="UserLogin"
value-field="updateRequestMap.userLogin">
+ <field-map field-name="userLoginId" value="system"/>
+ </entity-one>
+ <call-service service-name="updateCustRequest"
in-map-name="updateRequestMap"/>
+ <check-errors/>
+ </simple-method>
+
+</simple-methods>
Added: ofbiz/trunk/applications/order/testdef/CustRequestTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/testdef/CustRequestTests.xml?rev=924662&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/testdef/CustRequestTests.xml (added)
+++ ofbiz/trunk/applications/order/testdef/CustRequestTests.xml Thu Mar 18
07:33:48 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<test-suite suite-name="custrequesttests"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";>
+
+ <test-case case-name="custrequest-tests">
+ <simple-method-test
location="component://order/script/org/ofbiz/order/test/CustRequestTests.xml"/>
+ </test-case>
+</test-suite>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/testdef/OrderTest.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/testdef/OrderTest.xml?rev=924662&r1=924661&r2=924662&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/testdef/OrderTest.xml (original)
+++ ofbiz/trunk/applications/order/testdef/OrderTest.xml Thu Mar 18 07:33:48
2010
@@ -21,6 +21,9 @@ under the License.
<test-suite suite-name="ordertests"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";>
+ <test-case case-name="custRequest-test">
+ <junit-test-suite class-name="org.ofbiz.order.test.CustRequestTest"/>
+ </test-case>
<test-case case-name="purchaseOrder-test">
<junit-test-suite class-name="org.ofbiz.order.test.PurchaseOrderTest"/>
</test-case>
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml?rev=924662&r1=924661&r2=924662&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
(original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTests.xml
Thu Mar 18 07:33:48 2010
@@ -237,43 +237,6 @@ under the License.
<call-service service-name="updateCommunicationEvent"
in-map-name="updateCommEventMap"/>
<check-errors/>
</simple-method>
- <simple-method method-name="testCreateNewRequest"
short-description="create a new request" login-required="false">
- <set field="createNewRequestMap.custRequestTypeId"
value="RF_PROPOSAL"/>
- <set field="createNewRequestMap.statusId" value="CRQ_SUBMITTED"/>
- <set field="createNewRequestMap.priority" value="1L" type="Long"/>
- <set field="createNewRequestMap.fromPartyId" value="DemoCustomer"/>
- <entity-one entity-name="UserLogin"
value-field="createNewRequestMap.userLogin">
- <field-map field-name="userLoginId" value="system"/>
- </entity-one>
- <call-service service-name="createCustRequest"
in-map-name="createNewRequestMap">
- <result-to-field result-name="custRequestId"
field="requestMap.custRequestId"/>
- </call-service>
- <call-simple-method method-name="inlineUpdateRequest"/>
- <entity-one entity-name="CustRequest" value-field="custRequest">
- <field-map field-name="custRequestId"
from-field="requestMap.custRequestId"/>
- </entity-one>
- <assert>
- <not><if-empty field="custRequest"/></not>
- <if-compare-field field="custRequest.custRequestId"
to-field="requestMap.custRequestId" operator="equals"/>
- <if-compare-field field="custRequest.custRequestTypeId"
to-field="updateRequestMap.custRequestTypeId" operator="equals"/>
- <if-compare-field field="custRequest.statusId"
to-field="updateRequestMap.statusId" operator="equals"/>
- <if-compare-field field="custRequest.priority"
to-field="updateRequestMap.priority" operator="equals"/>
- <if-compare-field field="custRequest.fromPartyId"
to-field="updateRequestMap.fromPartyId" operator="equals"/>
- </assert>
- <check-errors/>
- </simple-method>
- <simple-method method-name="inlineUpdateRequest" short-description="update
a request" login-required="false">
- <set field="updateRequestMap.custRequestId"
from-field="requestMap.custRequestId"/>
- <set field="updateRequestMap.custRequestTypeId" value="RF_INFO"/>
- <set field="updateRequestMap.statusId" value="CRQ_ACCEPTED"/>
- <set field="updateRequestMap.priority" value="2L" type="Long"/>
- <set field="updateRequestMap.fromPartyId" value="admin"/>
- <entity-one entity-name="UserLogin"
value-field="updateRequestMap.userLogin">
- <field-map field-name="userLoginId" value="system"/>
- </entity-one>
- <call-service service-name="updateCustRequest"
in-map-name="updateRequestMap"/>
- <check-errors/>
- </simple-method>
<simple-method method-name="testCreatePartyTelecomNumber"
short-description="Test createPartyTelecomNumber service"
login-required="false">
<set field="partyId" value="DemoCustomer"/>
