CSPACE-3780 test control files updated

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
index d132ee2a337b143c7f5fc94a54471cd5872c0b30..d9742dcda1cde8ac3c9e4e3f0649565636ffab38 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
@@ -9,7 +9,7 @@
      when you check it in.\r
 -->\r
     <!--<protoHostPort>http://173.45.245.189:8180</protoHostPort>-->\r
-    <protoHostPort>http://localhost:8280</protoHostPort>\r
+    <protoHostPort>http://localhost:8180</protoHostPort>\r
     \r
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->\r
     <dump payloads="true" dumpServiceResult="detailed" />\r
@@ -62,9 +62,10 @@
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />\r
     <run controlFile="person/person.xml" testGroup="person" />\r
     <run controlFile="person/person.xml" testGroup="addOnePerson" />\r
-    -->\r
-    <run controlFile="person/person.xml" testGroup="updatePerson" />\r
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />\r
+    <run controlFile="person/person.xml" testGroup="updatePerson" />\r
+    -->\r
+    \r
     \r
 </xmlReplayMaster>\r
 \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml
index d4753d4df80f44748368f557658e6c4a17395f45..f298ae509178a5f19e87ab2662f6424a14822a44 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xmlReplay>\r
+    <!-- \r
+         testGroup ID="person" is not live.  It works, but may not clean up correctly. \r
+         For now, use ID="updatePerson"\r
+    -->\r
     <testGroup ID="person" autoDeletePOSTS="true">\r
         <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
             <method>POST</method>\r
@@ -94,14 +98,6 @@
         \r
        </testGroup>\r
        \r
-       \r
-       \r
-       \r
-       \r
-       \r
-       <!-- ONLY SETTING autoDeletePOSTS TO FALSE FOR TESTING.  DON'T CHECK IN. -->\r
-       \r
-       \r
        <testGroup ID="updatePerson" autoDeletePOSTS="true">\r
            <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
             <method>POST</method>\r
@@ -168,8 +164,6 @@
                <var ID="myCSID">${Person1.CSID}</var>\r
                <var ID="parentCSID">${PersonParent.CSID}</var>\r
                <var ID="childCSID">${PersonChild.CSID}</var>\r
-               <var ID="documentType1">Person</var>\r
-               <var ID="documentType2">Person</var>\r
             </vars>\r
         </test>\r
         \r

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 1588f153d3e161f03fdcf06b75e56d9623cfe2a5..988d7fd5c52323c7e42ab8f9f3a22ffd130004dc 100755 (executable)
--- 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
@@ -30,8 +30,8 @@
     <fieldsReturned>subjectCsid|relationshipType|predicateDisplayName|objectCsid|uri|csid|subject|object</fieldsReturned>\r
     <relation-list-item>\r
                <subjectCsid>${myCSID}</subjectCsid>\r
-               <documentType1>${documentType1}</documentType1>\r
-               <documentType2>${documentType2}</documentType2>\r
+               <documentType1>Person</documentType1>\r
+               <documentType2>Person</documentType2>\r
                <relationshipType>hasBroader</relationshipType>\r
                <predicate>hasBroader</predicate>\r
                <predicateDisplayName>hasBroader</predicateDisplayName>\r
@@ -49,6 +49,8 @@
        </relation-list-item>\r
        <relation-list-item>\r
                <subjectCsid>${childCSID}</subjectCsid>\r
+               <documentType1>Person</documentType1>\r
+               <documentType2>Person</documentType2>\r
                <relationshipType>hasBroader</relationshipType>\r
                <predicate>hasBroader</predicate>\r
                <predicateDisplayName>hasBroader</predicateDisplayName>\r