From adc66f5909966f86a380400d5af55378991ac448 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 7 Aug 2013 09:41:17 -0700
Subject: [PATCH] CSPACE-5678-E: Fixed XMLReplay Person-Siblings tests to
 reflect the fact that termDisplayName is used as the objectNumber instead of
 shortIdentifier being used.

---
 .../test/resources/test-data/xmlreplay/person/person.xml  | 5 +++++
 .../test-data/xmlreplay/person/persons_common.xml         | 2 +-
 .../xmlreplay/person/res/GETpostPerson_siblings.res.xml   | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

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 3be5d13b0..99b43a029 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml
@@ -268,6 +268,7 @@
             	<var ID="inAuthority">${PersonAuth1.CSID}</var>
             	<var ID="authShortIdentifier">CSPACE3739PersonAuthority</var>
             	<var ID="shortIdentifier">johnWayneActorChild</var>
+            	<var ID="termDisplayNameSuffix">actorChild1</var>
             </vars>
         </test>
         
@@ -279,6 +280,7 @@
             	<var ID="inAuthority">${PersonAuth1.CSID}</var>
             	<var ID="authShortIdentifier">CSPACE3739PersonAuthority</var>
             	<var ID="shortIdentifier">johnWayneActorChild2</var>
+            	<var ID="termDisplayNameSuffix">actorChild2</var>
             </vars>
         </test>
         
@@ -290,6 +292,7 @@
             	<var ID="inAuthority">${PersonAuth1.CSID}</var>
             	<var ID="authShortIdentifier">CSPACE3739PersonAuthority</var>
             	<var ID="shortIdentifier">johnWayneActorChild3</var>
+            	<var ID="termDisplayNameSuffix">actorChild3</var>
             </vars>
         </test>
         
@@ -329,6 +332,8 @@
 					<var ID="childCSID">${PersonChild.CSID}</var>
 					<var ID="child2CSID">${PersonChild2.CSID}</var>
 					<var ID="child3CSID">${PersonChild3.CSID}</var>
+					<var ID="termDisplayNameSuffix2">${PersonChild2.termDisplayNameSuffix}</var>
+					<var ID="termDisplayNameSuffix3">${PersonChild3.termDisplayNameSuffix}</var>
 				</vars>
 				<startElement>/document/*[local-name()='relations-common-list']</startElement>
 		 </response>
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 40cd18033..5e6765c98 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
@@ -9,7 +9,7 @@
 		<personTermGroup>
 			<termName>John Wayne</termName>
 			<termPrefForLang>false</termPrefForLang>
-			<termDisplayName>John Wayne</termDisplayName>
+			<termDisplayName>John Wayne${termDisplayNameSuffix}</termDisplayName>
 		    <foreName>John</foreName>
 		    <surName>Wayne</surName>
 		</personTermGroup>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/GETpostPerson_siblings.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/GETpostPerson_siblings.res.xml
index 3bea20241..658e7e1dc 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/GETpostPerson_siblings.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/GETpostPerson_siblings.res.xml
@@ -13,11 +13,11 @@
       <objectCsid>${personCSID}</objectCsid>
       <subject>
         <csid>${child2CSID}</csid>
-        <number>johnWayneActorChild2</number>
+        <number>John Wayne${termDisplayNameSuffix2}</number>
       </subject>
       <object>
         <csid>${personCSID}</csid>
-        <number>johnWayneActor</number>
+        <number>John Wayne</number>
       </object>
     </relation-list-item>
     <relation-list-item>
@@ -26,11 +26,11 @@
       <objectCsid>${personCSID}</objectCsid>
       <subject>
         <csid>${child3CSID}</csid>
-        <number>johnWayneActorChild3</number>
+        <number>John Wayne${termDisplayNameSuffix3}</number>
       </subject>
       <object>
         <csid>${personCSID}</csid>
-        <number>johnWayneActor</number>
+        <number>John Wayne</number>
       </object>
     </relation-list-item>
   </ns2:relations-common-list>
-- 
2.47.3