Use the <Id> read in when the Reel was created from XML (if appropriate)

when writing it out again, rather than creating a new one each time.

Also there is the associated test churn here from removing a call
to make_uuid().

1 files changed, 5 insertions, 5 deletions

diff --git a/test/verify_test.cc b/test/verify_test.cc
index e025a013..f1213c10 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (verify_test1)
 	list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
 	boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml";
-	boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml";
+	boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml";
 	boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml";
 
 	list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE (verify_test3)
 	vector<boost::filesystem::path> directories = setup (1, 3);
 
 	{
-		Editor e ("build/test/verify_test3/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml");
+		Editor e ("build/test/verify_test3/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml");
 		e.replace ("<Hash>", "<Hash>x");
 	}
 
@@ -271,7 +271,7 @@ static
 boost::filesystem::path
 pkl (int n)
 {
-	return dcp::String::compose("build/test/verify_test%1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", n);
+	return dcp::String::compose("build/test/verify_test%1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml", n);
 }
 
 static
@@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE (verify_test11)
 {
 	check_after_replace (
 		11, &pkl,
-		"<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
+		"<Id>urn:uuid:18b", "<Id>urn:uuid:x8b",
 		dcp::VerificationNote::XML_VALIDATION_ERROR
 		);
 }
@@ -438,7 +438,7 @@ BOOST_AUTO_TEST_CASE (verify_test12)
 {
 	check_after_replace (
 		12, &asset_map,
-		"<Id>urn:uuid:74e", "<Id>urn:uuid:x4e",
+		"<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
 		dcp::VerificationNote::XML_VALIDATION_ERROR
 		);
 }