CSPACE-3780 got tests working

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 9e44b4c24fa27ce2a06d691ed81412650267ceae..d132ee2a337b143c7f5fc94a54471cd5872c0b30 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
@@ -64,6 +64,7 @@
     <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
     \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 8e682670008b9c3e7231a18dfa368a62d0a1aa36..d4753d4df80f44748368f557658e6c4a17395f45 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
@@ -57,8 +57,8 @@
              <vars>\r
                 <var ID="documentId1">${Person1.CSID}</var>\r
                 <var ID="documentId2">${Person2.CSID}</var>\r
-                <var ID="documentType1">persons</var>\r
-                <var ID="documentType2">persons</var>\r
+                <var ID="documentType1">Persons</var>\r
+                <var ID="documentType2">Persons</var>\r
                 <var ID="relationshipType">hasBroader</var>\r
              </vars>\r
         </test>\r
@@ -73,8 +73,8 @@
              -->\r
                 <var ID="documentId1">${Person2.CSID}</var>\r
                 <var ID="documentId2">${Person1.CSID}</var>\r
-                <var ID="documentType1">persons</var>\r
-                <var ID="documentType2">persons</var>\r
+                <var ID="documentType1">Persons</var>\r
+                <var ID="documentType2">Persons</var>\r
                 <var ID="relationshipType">hasNarrower</var>\r
              </vars>\r
          </test>\r
@@ -94,6 +94,14 @@
         \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
@@ -160,6 +168,8 @@
                <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 bc36c2ab7d8b1660787ef6d322d0840cb28fd4c2..1588f153d3e161f03fdcf06b75e56d9623cfe2a5 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,6 +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
                <relationshipType>hasBroader</relationshipType>\r
                <predicate>hasBroader</predicate>\r
                <predicateDisplayName>hasBroader</predicateDisplayName>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml
index 4f4e1ea743ad4b00b6b72d31bd764880c35d6492..d8176361179e7dbb2f5c5d246bad46d373da563c 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml
@@ -5,7 +5,7 @@
         <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
    \r
-    <testGroup ID="makeRelations" autoDeletePOSTS="false">\r
+    <testGroup ID="makeRelations" autoDeletePOSTS="true">\r
          <test ID="oe1"  auth="test">\r
              <method>POST</method>\r
              <uri>/cspace-services/objectexit/</uri>\r
@@ -23,8 +23,8 @@
              <vars>\r
                 <var ID="documentId1">${oe1.CSID}</var>\r
                 <var ID="documentId2">${oe2.CSID}</var>\r
-                <var ID="documentType1">objectexit</var>\r
-                <var ID="documentType2">objectexit</var>\r
+                <var ID="documentType1">ObjectExit</var>\r
+                <var ID="documentType2">ObjectExit</var>\r
                 <var ID="relationshipType">hasBroader</var>\r
              </vars>\r
          </test>\r
@@ -36,11 +36,15 @@
                 <!-- switched oe2 and oe1 on this -->\r
                 <var ID="documentId1">${oe2.CSID}</var>\r
                 <var ID="documentId2">${oe1.CSID}</var>\r
-                <var ID="documentType1">objectexit</var>\r
-                <var ID="documentType2">objectexit</var>\r
+                <var ID="documentType1">ObjectExit</var>\r
+                <var ID="documentType2">ObjectExit</var>\r
                 <var ID="relationshipType">hasBroader</var>\r
              </vars>\r
          </test>\r
+         <test ID="relationsGET"  auth="test">\r
+             <method>GET</method>\r
+             <uri>/cspace-services/relations/</uri>\r
+         </test>\r
          \r
          <!--\r
          <test>\r