From 75342e83718ec4becb35308d5f376fa184c0acbf Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Wed, 9 May 2012 23:59:58 -0700 Subject: [PATCH] CSPACE-5126: Payloads for XmlReplay tests for person, location, and objectexit now updated and related tests are passing. --- .../xmlreplay/ServiceResult.java | 2 +- .../xmlreplay/XmlReplayEval.java | 2 +- .../xmlreplay/location/hierarchy/2-item.xml | 23 ++++++++++--- .../3-locations_w_relations_CSID.xml | 13 ++++++-- .../4-locations_w_relations_mixed.xml | 13 ++++++-- .../5-locations_w_relations_RefNames.xml | 12 +++++-- .../objectexit/object-exit-display.xml | 5 ++- .../objectexit/oePersonDisplayOnly.xml | 20 +++++++----- .../objectexit/res/oePersonDisplayGET.res.xml | 32 ++----------------- .../xmlreplay/person/person_pmadry.xml | 15 ++++++--- .../xmlreplay/person/person_pschmitz.xml | 15 ++++++--- .../xmlreplay/person/persons_common.xml | 17 ++++++---- .../person/persons_common_and_lifesci.xml | 17 ++++++---- ...persons_common_and_lifesci_set_broader.xml | 17 ++++++---- ...ersons_common_delete_all_relations_PUT.xml | 17 ++++++---- .../persons_common_delete_relations_PUT.xml | 17 ++++++---- .../person/persons_common_w_relations.xml | 17 ++++++---- .../person/persons_common_w_relations_2.xml | 17 ++++++---- .../person/persons_common_w_relations_3.xml | 17 ++++++---- .../persons_common_w_relations_POST.xml | 17 ++++++---- .../test-data/xmlreplay/xml-replay-master.xml | 22 +++++++++---- 21 files changed, 202 insertions(+), 125 deletions(-) diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java index 77a93ea08..b9e879a37 100644 --- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java +++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java @@ -288,7 +288,7 @@ public class ServiceResult { /** This method may be called from a test case, using a syntax like ${oe9.reqValue("personauthorities_common","//shortIdentifier")} */ public String sent(String xpath) throws Exception { try { - String source = this.requestPayloadsRaw; + String source = this.requestPayload; // REM - 5/9/2012 : Changing to requestPayload from requestPayloadsRaw to get actual sent payload if (source == null){ return "ERROR:null:requestPayloadsRaw"; } diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java index 7e482471e..1beebe553 100644 --- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java +++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java @@ -116,7 +116,7 @@ public class XmlReplayEval { start = cursor; Expression expr = jexl.createExpression(var); - Object resultObj = expr.evaluate(jc); + Object resultObj = expr.evaluate(jc); //REM - 5/9/2011 - Usually calls back to fields and methods in ServiceResult class to do the evaluation -e.g., the "got" method. String resultStr; if (null == resultObj){ //debug: System.out.println("null found while evaluationg variable: '"+var+"' Jexl context: "+dumpContext(jc)); diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml index 17a5fc4d6..5638665d0 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml @@ -2,11 +2,24 @@ ${shortIdentifier} - - Approved - true - false - ${name} + urn:cspace:core.collectionspace.org:locationauthorities:name(${authShortIdentifier}):item:name(${shortIdentifier})'${name}' + + + + false + ${name} + ${name} + + + Approved + + + + + + + + Basically clean diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml index cf1b8ecdd..7c81f5f66 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml @@ -4,9 +4,16 @@ - ${name} - false - true + + + + false + ${name} + ${name} + Approved + + + ${oePersonGET.got("//csid")} ${oePersonauthority.CSID} + ${oePersonauthority.sent("//shortIdentifier")} ${oePerson.sent("//displayName")} - urn:cspace:collectionspace.org:Personauthorities(${oePersonauthority.sent("//shortIdentifier")}):items(foobar)'${oePerson.sent("//displayName")}' + ${oePerson.sent("//shortIdentifier")} + urn:cspace:core.collectionspace.org:personauthorities:name(${inAuthorityShortIdentifier}):item:name(${shortIdentifier})'${displayName}' diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml index c2c16c90f..28e4a7b00 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml @@ -1,11 +1,15 @@ - - - ${displayName} - false - + + ${shortIdentifier} + + + ${displayName} + false + ${displayName} + + + - diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml index f7845ad40..e3d4280e6 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml @@ -1,37 +1,9 @@ - - - - - - false ${inAuthority} - Finbar the DisplayName + ${shortIdentifier} + ${refName} - - 1 - 2011-04-23T23:02:16Z - 2011-04-23T23:02:16Z - - - - 6b296c92-bb90-42d8-a804-3ec87c5e21d6 - admin@core.collectionspace.org - - - 70 - 1aa2c5b8-ce60-412b-bb45-cadba34fab7d - /personauthorities/*/items/*/workflow/ - CRUDL - - - 71 - a7f67d3d-ecee-41a5-9b8d-5a7f89345caa - persons - CRUDL - - diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml index b6b8a196f..a5f9d9888 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml @@ -2,11 +2,16 @@ pmadry - false - false - Penelope Madry - Penelope Madry, New York - ${termStatus} + + + + Penelope Madry, New York + false + Penelope Madry, New York + ${termStatus} + + + Project Manager for CollectionSpace diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml index ee908b055..d7f2cb81c 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml @@ -2,11 +2,16 @@ pschmitz - false - false - Patrick Schmitz - Patrick Schmitz, Berkeley - ${termStatus} + + + + Patrick Schmitz, Berkeley + false + Patrick Schmitz, Berkeley + ${termStatus} + + + Technical Lead for CollectionSpace This is a test PersonAuthority item Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml index f68b396ab..40cd18033 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml index d6532c217..0f2742f29 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml @@ -2,12 +2,17 @@ ${shortIdentifier} - ${foreName} ${surName} - false - >${foreName} ${surName} - false - ${foreName} - ${surName} + + + + ${foreName} ${surName} + false + ${foreName} ${surName} + ${foreName} + ${surName} + + + ${entityType} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml index 9955abb6b..5a5f91a4b 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml @@ -2,12 +2,17 @@ ${shortIdentifier} - ${foreName} ${surName} - false - >${foreName} ${surName} - false - ${foreName} - ${surName} + + + + ${foreName} ${surName} + false + ${foreName} ${surName} + ${foreName} + ${surName} + + + ${entityType} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml index 77d12cfc1..4a36bf057 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml index 827388bb8..820d7ad38 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml index 2934776f4..1564a871a 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml index c332ccac2..a257f38c8 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml index a573e0f7d..cc6175557 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml index 326de1fa3..0d05a7611 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml @@ -4,12 +4,17 @@ ${inAuthority} ${shortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne' - John Wayne - false - JohnWayne - false - John - Wayne + + + + John Wayne + false + John Wayne + John + Wayne + + + May 26, 1907 June 11, 1979 Winterset, Iowa diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml index c1dd47a0f..1a54443fb 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml @@ -37,27 +37,35 @@ + + +--> + + + + + + -- 2.47.3