From c8654d900352839311c9399cca1936908819a7f5 Mon Sep 17 00:00:00 2001
From: Laramie Crocker <laramie@berkeley.edu>
Date: Sun, 17 Apr 2011 17:14:45 +0000
Subject: [PATCH] CSPACE-3780 test control files updated

---
 .../resources/test-data/xmlreplay/dev-master.xml   |  7 ++++---
 .../test-data/xmlreplay/person/person.xml          | 14 ++++----------
 .../person/persons_common_w_relations.xml          |  6 ++++--
 3 files changed, 12 insertions(+), 15 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 d132ee2a3..d9742dcda 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
@@ -9,7 +9,7 @@
      when you check it in.
 -->
     <!--<protoHostPort>http://173.45.245.189:8180</protoHostPort>-->
-    <protoHostPort>http://localhost:8280</protoHostPort>
+    <protoHostPort>http://localhost:8180</protoHostPort>
     
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
     <dump payloads="true" dumpServiceResult="detailed" />
@@ -62,9 +62,10 @@
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />
     <run controlFile="person/person.xml" testGroup="person" />
     <run controlFile="person/person.xml" testGroup="addOnePerson" />
-    -->
-    <run controlFile="person/person.xml" testGroup="updatePerson" />
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />
+    <run controlFile="person/person.xml" testGroup="updatePerson" />
+    -->
+    
     
 </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 d4753d4df..f298ae509 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
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplay>
+    <!-- 
+         testGroup ID="person" is not live.  It works, but may not clean up correctly. 
+         For now, use ID="updatePerson"
+    -->
     <testGroup ID="person" autoDeletePOSTS="true">
         <test ID="PersonAuth1" auth="admin@collectionspace.org">
             <method>POST</method>
@@ -94,14 +98,6 @@
         
 	</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>
@@ -168,8 +164,6 @@
             	<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 1588f153d..988d7fd5c 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,8 +30,8 @@
     <fieldsReturned>subjectCsid|relationshipType|predicateDisplayName|objectCsid|uri|csid|subject|object</fieldsReturned>
     <relation-list-item>
 		<subjectCsid>${myCSID}</subjectCsid>
-		<documentType1>${documentType1}</documentType1>
-		<documentType2>${documentType2}</documentType2>
+		<documentType1>Person</documentType1>
+		<documentType2>Person</documentType2>
 		<relationshipType>hasBroader</relationshipType>
 		<predicate>hasBroader</predicate>
 		<predicateDisplayName>hasBroader</predicateDisplayName>
@@ -49,6 +49,8 @@
 	</relation-list-item>
 	<relation-list-item>
 		<subjectCsid>${childCSID}</subjectCsid>
+		<documentType1>Person</documentType1>
+		<documentType2>Person</documentType2>
 		<relationshipType>hasBroader</relationshipType>
 		<predicate>hasBroader</predicate>
 		<predicateDisplayName>hasBroader</predicateDisplayName>
-- 
2.47.3