From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 7 Sep 2012 20:53:04 +0000 (-0700)
Subject: Merge branch 'CSPACE-5518-REM'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d630ec25e6969f4592ced188bbb980e77b2b1b96;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5518-REM'
---

d630ec25e6969f4592ced188bbb980e77b2b1b96
diff --cc services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 91a621ee9,10f23e7e6..b68dca7cb
--- 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
@@@ -8,8 -8,34 +8,11 @@@
      <auths default="admin@core.collectionspace.org">
          <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
      </auths>
 -
 -    <!--
 -    This used to work, but for check-in, I'm commenting it out as it currently breaks if things are left around in DB.
 -    <run controlFile="./security.xml" testGroup="security" />
 -    -->
 -
 -    <!--
 -    This was working but is not now because security db hangs onto results from failed tests.
 -    However, it is more complete than testGroup="security", so is the correct testGroup to run.
 -    When the DB is cleaned with [ant create_db import] it runs OK.
 -    -->
 -
 -    <!-- run controlFile="./security.xml" testGroup="securityRemovingRoleperms" / -->
 -    <!-- run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" / -->
 -    <!-- run controlFile="objectexit/object-exit.xml" testGroup="domwalk" / -->
 -    <!--<run controlFile="media/media.xml" testGroup="authrefs" />-->
 -
 -    <!--<run controlFile="./organization.xml" testGroup="organization" />-->
 -    
      
 -    <!-- ============================================= -->
 -    <!-- XmlReplay now compatible with POX payloads.
 -         File below this line have been ported. -->
 -    <!-- ============================================= -->
      
+     <run controlFile="collectionobject/collectionobject-hierarchy.xml" testGroup="HierarchicCollectionObject" />
+     
+     
      <run controlFile="./security.xml" testGroup="deleteBug" />
      <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />
      <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />