From f3e3f782516a16d33d3d62ba1b6e37b52bef1635 Mon Sep 17 00:00:00 2001
From: Laramie Crocker <laramie@berkeley.edu>
Date: Sun, 17 Apr 2011 04:07:34 +0000
Subject: [PATCH] CSPACE-3780 got tests working

---
 .../test-data/xmlreplay/dev-master.xml         |  1 +
 .../test-data/xmlreplay/person/person.xml      | 18 ++++++++++++++----
 .../person/persons_common_w_relations.xml      |  2 ++
 .../test-data/xmlreplay/relation/relation.xml  | 14 +++++++++-----
 4 files changed, 26 insertions(+), 9 deletions(-)

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 9e44b4c24..d132ee2a3 100644
--- 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" />
     -->
     <run controlFile="person/person.xml" testGroup="updatePerson" />
+    <run controlFile="relation/relation.xml" testGroup="makeRelations" />
     
 </xmlReplayMaster>
 
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 8e6826700..d4753d4df 100755
--- 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>
                 <var ID="documentId1">${Person1.CSID}</var>
                 <var ID="documentId2">${Person2.CSID}</var>
-                <var ID="documentType1">persons</var>
-                <var ID="documentType2">persons</var>
+                <var ID="documentType1">Persons</var>
+                <var ID="documentType2">Persons</var>
                 <var ID="relationshipType">hasBroader</var>
              </vars>
         </test>
@@ -73,8 +73,8 @@
              -->
                 <var ID="documentId1">${Person2.CSID}</var>
                 <var ID="documentId2">${Person1.CSID}</var>
-                <var ID="documentType1">persons</var>
-                <var ID="documentType2">persons</var>
+                <var ID="documentType1">Persons</var>
+                <var ID="documentType2">Persons</var>
                 <var ID="relationshipType">hasNarrower</var>
              </vars>
          </test>
@@ -94,6 +94,14 @@
         
 	</testGroup>
 	
+	
+	
+	
+	
+	
+	<!-- ONLY SETTING autoDeletePOSTS TO FALSE FOR TESTING.  DON'T CHECK IN. -->
+	
+	
 	<testGroup ID="updatePerson" autoDeletePOSTS="true">
 	    <test ID="PersonAuth1" auth="admin@collectionspace.org">
             <method>POST</method>
@@ -160,6 +168,8 @@
             	<var ID="myCSID">${Person1.CSID}</var>
             	<var ID="parentCSID">${PersonParent.CSID}</var>
             	<var ID="childCSID">${PersonChild.CSID}</var>
+            	<var ID="documentType1">Person</var>
+            	<var ID="documentType2">Person</var>
             </vars>
         </test>
         
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 bc36c2ab7..1588f153d 100755
--- 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>
     <relation-list-item>
 		<subjectCsid>${myCSID}</subjectCsid>
+		<documentType1>${documentType1}</documentType1>
+		<documentType2>${documentType2}</documentType2>
 		<relationshipType>hasBroader</relationshipType>
 		<predicate>hasBroader</predicate>
 		<predicateDisplayName>hasBroader</predicateDisplayName>
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 4f4e1ea74..d81763611 100644
--- 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>
     </auths>
    
-    <testGroup ID="makeRelations" autoDeletePOSTS="false">
+    <testGroup ID="makeRelations" autoDeletePOSTS="true">
          <test ID="oe1"  auth="test">
              <method>POST</method>
              <uri>/cspace-services/objectexit/</uri>
@@ -23,8 +23,8 @@
              <vars>
                 <var ID="documentId1">${oe1.CSID}</var>
                 <var ID="documentId2">${oe2.CSID}</var>
-                <var ID="documentType1">objectexit</var>
-                <var ID="documentType2">objectexit</var>
+                <var ID="documentType1">ObjectExit</var>
+                <var ID="documentType2">ObjectExit</var>
                 <var ID="relationshipType">hasBroader</var>
              </vars>
          </test>
@@ -36,11 +36,15 @@
                 <!-- switched oe2 and oe1 on this -->
                 <var ID="documentId1">${oe2.CSID}</var>
                 <var ID="documentId2">${oe1.CSID}</var>
-                <var ID="documentType1">objectexit</var>
-                <var ID="documentType2">objectexit</var>
+                <var ID="documentType1">ObjectExit</var>
+                <var ID="documentType2">ObjectExit</var>
                 <var ID="relationshipType">hasBroader</var>
              </vars>
          </test>
+         <test ID="relationsGET"  auth="test">
+             <method>GET</method>
+             <uri>/cspace-services/relations/</uri>
+         </test>
          
          <!--
          <test>
-- 
2.47.3