CSPACE-5518,CSPACE-5520: Remove dev-master, committed temporarily to master branch...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
index d5b658a0ef8439687779047bd9fa66473482546a..da4720e78c4bd7d1e905a35d87aef0c95bbb63cd 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
@@ -145,6 +145,7 @@
             <uri>/cspace-services/collectionobjects</uri>
             <filename>collectionobject/hierarchy/2-collectionobjects-with-relations-create.xml</filename>
             <vars>
+                <var ID="objectNumber">CSPACE-5518-BlackRook</var>
                 <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
                 <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
                 <var ID="bagOfWhiteChessPiecesCSID">${CreateBagOfWhiteChessPieces.CSID}</var>

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
deleted file mode 100644 (file)
index 5a8f528..0000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xmlReplayMaster>\r
-<!-- Use this file to drive local testing.  \r
-\r
-     To run this file, copy the checked-in file to your own local version of the correct name\r
-     in the same location.  If it is named dev-master.xml, then XmlReplayDevTest will pick it up.\r
-     If it is not there, XmlReplayDevTest will skip it, which is what we want for production, since \r
-     production runs XmlReplayMasterTest which calls xml-replay-master.xml\r
-     \r
-         cd trunk/services/IntegrationTests/src/test/resources/test-data/xmlreplay/\r
-         cp dev-master-example.xml dev-master.xml\r
-\r
-     IMPORTANT :: DO NOT CHECK IN YOUR LOCAL COPY, CALLED dev-master.xml\r
-                  EITHER LEAVE IT AROUND AND IGNORE THE SVN UNVERSIONED FILE MESSAGE, \r
-                    OR DELETE IT IF IT BOTHERS YOU.\r
-     \r
-     Then, to run this file, you can execute the following: \r
-     \r
-          cd trunk/services/IntegrationTests\r
-          mvn test -Dtest=XmlReplayDevTest\r
-\r
-     Maven surefire will kick off XmlReplayDevTest.\r
-     \r
-                  \r
-     This file can be used to point at a controlFile \r
-                 and a testGroup, so you can test just one thing at a time, or a limited suite.\r
-     \r
-     You can find other tests to run in two places:\r
-       The tests that get run on nightly: \r
-        xml-replay-master.xml\r
-       The set of possible tests, including ones that don't work:\r
-         dev-all.xml\r
--->\r
-    <protoHostPort>http://localhost:8180</protoHostPort>\r
-    \r
-    <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->\r
-    <dump payloads="true" dumpServiceResult="full" />\r
-    \r
-    <auths default="admin@core.collectionspace.org">\r
-       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>\r
-    </auths>\r
-    \r
-    <run controlFile="collectionobject/collectionobject-hierarchy.xml" testGroup="HierarchicCollectionObject" />\r
-</xmlReplayMaster>\r
-\r