CSPACE-1437 Added authorityrefs and refObjs tests for media service

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
index 628ee056833f97dd96887d248f9c5649b05556ea..7d244483ed7f0042faf1d0b189d84cde9f9c0481 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
@@ -3,10 +3,10 @@
   xmlns:ns2="http://collectionspace.org/services/jaxb"\r
   xmlns:ns3="http://collectionspace.org/services/acquisition">\r
   <acquisitionDates>\r
-    <acquisitionDate>NEW First Acquisition Date-333</acquisitionDate>\r
+    <acquisitionDate>NEW First Acquisition Date-334</acquisitionDate>\r
     <acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
   </acquisitionDates>\r
-  <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+  <acquisitionReferenceNumber>acquisitionReferenceNumber-1</acquisitionReferenceNumber>\r
   <owners>\r
     <owner>First Owner -1292275630222</owner>\r
     <owner>Second Owner-1292275630222</owner>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
index addfdc95216dc393cc54a131d48e0cca8edcb255..7d972ad08e3995aac0550ef0c75ef917d5276a2c 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd">\r
-<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1</acquisitionReferenceNumber>\r
 <acquisitionFundingList/>\r
 <acquisitionDates>\r
-<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>\r
+<acquisitionDate>NEW First Acquisition Date-334</acquisitionDate>\r
 <acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
 </acquisitionDates>\r
 <acquisitionSources>\r

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 2a2bc954a53ffd996cd42a05f4b5b45451b2169e..0d8bcfeb3050c6a298bb03a616f4b1a3a53d9bc6 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
@@ -25,10 +25,11 @@
     -->\r
     \r
     <!--\r
+    <run controlFile="loanin/loanin.xml" testGroup="makeone" />\r
+    \r
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />   \r
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="repeat" />\r
-    <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />   \r
     <run controlFile="objectexit/object-exit.xml" testGroup="domlist" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="authrefs" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />\r
@@ -36,9 +37,14 @@
     \r
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />\r
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
+    \r
+    <run controlFile="media/media.xml" testGroup="authrefs" />\r
+    \r
     -->\r
     \r
     \r
+    \r
+    \r
 \r
 </xmlReplayMaster>\r
 \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/li1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/li1.xml
index cd6c0ad996ededc3d65454278af4b4bae89ddaa1..d7695200bbef6ca867fc950e4e7b6a969a6a0d05 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/li1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/li1.xml
@@ -2,7 +2,7 @@
 <ns2:loansin_common\r
 xmlns:ns2="http://collectionspace.org/services/loanin"\r
 xmlns:ns3="http://collectionspace.org/services/jaxb">\r
-  <loanInNumber>loaninNumber-1292347312955</loanInNumber>\r
+  <loanInNumber>loaninNumber-4</loanInNumber>\r
   <lenderGroupList>\r
     <lenderGroup>\r
         <lendersAuthorizer>An Authorizer</lendersAuthorizer>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/media.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/media.xml
new file mode 100755 (executable)
index 0000000..586103d
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/media.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xmlReplay>\r
+\r
+<testGroup ID="authrefs" autoDeletePOSTS="false">\r
+        <test ID="oe9">\r
+         <method>POST</method>\r
+         <uri>/cspace-services/personauthorities/</uri>\r
+         <part>\r
+             <label>personauthorities_common</label>\r
+             <filename>media/oe9.xml</filename>\r
+         </part>\r
+      </test>\r
+      <test ID="oe11">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/personauthorities/${oe9.CSID}/items/</uri>\r
+             <part>\r
+                 <label>persons_common</label>\r
+                 <filename>media/oe11.xml</filename>\r
+             </part>\r
+        </test>\r
+        <test ID="oe15">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/media/</uri>\r
+             <part>\r
+                 <label>media_common</label>\r
+                 <filename>media/oe15.xml</filename>\r
+             </part>\r
+        </test>\r
+       <test ID="authorityrefs">\r
+             <method>GET</method>\r
+             <uri>/cspace-services/media/${oe15.CSID}/authorityrefs</uri>\r
+        </test>\r
+        <test ID="refObjs">\r
+             <method>GET</method>\r
+             <uri>/cspace-services/personauthorities/${oe9.CSID}/items/${oe11.CSID}/refObjs</uri>\r
+        </test>\r
+    </testGroup>\r
+\r
+</xmlReplay>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe11.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe11.xml
new file mode 100755 (executable)
index 0000000..e40aa5d
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe11.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns2:persons_common\r
+xmlns:ns2="http://collectionspace.org/services/person"\r
+xmlns:ns3="http://collectionspace.org/services/jaxb">\r
+  <!--<inAuthority>7f441679-ab83-4832-85f9</inAuthority>-->\r
+  <shortIdentifier>owenCurOwner2</shortIdentifier>\r
+  <refName>urn:cspace:org.collectionspace.demo:personauthority:name(MediaPersonAuth2)'MediaPersonAuth2':person:name(owenCurOwner2)</refName>\r
+  <displayNameComputed>true</displayNameComputed>\r
+  <shortDisplayNameComputed>true</shortDisplayNameComputed>\r
+  <foreName>Owen the Cur</foreName>\r
+  <surName>Owner</surName>\r
+</ns2:persons_common>\r
+\r
+\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe15.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe15.xml
new file mode 100755 (executable)
index 0000000..600802c
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe15.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns2:media_common\r
+xmlns:ns2="http://collectionspace.org/services/media"\r
+xmlns:ns3="http://collectionspace.org/services/jaxb">\r
+  <contributor>urn:cspace:org.collectionspace.demo:personauthority:name(MediaPersonAuth2)'MediaPersonAuth2':person:name(owenCurOwner2)</contributor>\r
+  <title>title new authority</title>\r
+  <source>source 1</source>\r
+</ns2:media_common>\r
+\r
+\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe9.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe9.xml
new file mode 100755 (executable)
index 0000000..41a99e0
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/media/oe9.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns2:personauthorities_common\r
+xmlns:ns2="http://collectionspace.org/services/person"\r
+xmlns:ns3="http://collectionspace.org/services/jaxb">\r
+  <displayName>MediaPersonAuth2</displayName>\r
+  <shortIdentifier>MediaPersonAuth2</shortIdentifier>\r
+  <refName>urn:cspace:org.collectionspace.demo:personauthority:name(MediaPersonAuth2)'MediaPersonAuth2'</refName>\r
+  <vocabType>PersonAuthority</vocabType>\r
+</ns2:personauthorities_common>\r
+\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 892495ca13c6628a9fbc0e6ab8ee049feeb5d1d0..48afa2540057358a4aa4e65f57e4e5adc1e4eacf 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -23,7 +23,8 @@
     <run controlFile="./security.xml" testGroup="securityRemovingRoleperms" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />\r
-    <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
+    <run controlFile="media/media.xml" testGroup="authrefs" />\r
+    <!--<run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />-->\r
 \r
     <!--<run controlFile="./organization.xml" testGroup="organization" />-->\r
 \r