Rename Data -> ArrayData.
[libdcp.git] / test / verify_test.cc
index b8a354adf58872adeafb367d8a38deabaf02701a..3e2a665fb79455ae72d4b46c65106ed59b79b435 100644 (file)
 #include "openjpeg_image.h"
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
+#include "interop_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "reel_subtitle_asset.h"
 #include "compose.hpp"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -58,7 +62,6 @@ using boost::shared_ptr;
 
 
 static list<pair<string, optional<boost::filesystem::path> > > stages;
-static int next_verify_test_number = 1;
 
 static void
 stage (string s, optional<boost::filesystem::path> p)
@@ -118,6 +121,8 @@ private:
        std::string _content;
 };
 
+
+#if 0
 static
 void
 dump_notes (list<dcp::VerificationNote> const & notes)
@@ -126,22 +131,23 @@ dump_notes (list<dcp::VerificationNote> const & notes)
                std::cout << dcp::note_to_string(i) << "\n";
        }
 }
+#endif
 
 /* Check DCP as-is (should be OK) */
 BOOST_AUTO_TEST_CASE (verify_test1)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       vector<boost::filesystem::path> directories = setup (1, 1);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test1/ASSETMAP.xml", next_verify_test_number);
+       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_cd49971e-bf4c-4594-8474-54ebef09a40c.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();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
@@ -152,15 +158,15 @@ BOOST_AUTO_TEST_CASE (verify_test1)
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/video.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/video.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/video.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/video.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/audio.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
@@ -172,17 +178,13 @@ BOOST_AUTO_TEST_CASE (verify_test1)
        ++st;
        BOOST_REQUIRE (st == stages.end());
 
-       dump_notes (notes);
-
        BOOST_CHECK_EQUAL (notes.size(), 0);
-
-       next_verify_test_number++;
 }
 
 /* Corrupt the MXFs and check that this is spotted */
 BOOST_AUTO_TEST_CASE (verify_test2)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 2);
 
        FILE* mod = fopen("build/test/verify_test2/video.mxf", "r+b");
        BOOST_REQUIRE (mod);
@@ -193,11 +195,15 @@ BOOST_AUTO_TEST_CASE (verify_test2)
 
        mod = fopen("build/test/verify_test2/audio.mxf", "r+b");
        BOOST_REQUIRE (mod);
-       fseek (mod, 4096, SEEK_SET);
+       BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0);
        BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
        fclose (mod);
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes;
+       {
+               dcp::ASDCPErrorSuspender sus;
+               notes = dcp::verify (directories, &stage, &progress, xsd_test);
+       }
 
        BOOST_REQUIRE_EQUAL (notes.size(), 2);
        BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
@@ -209,16 +215,14 @@ BOOST_AUTO_TEST_CASE (verify_test2)
 /* Corrupt the hashes in the PKL and check that the disagreement between CPL and PKL is spotted */
 BOOST_AUTO_TEST_CASE (verify_test3)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       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_cd49971e-bf4c-4594-8474-54ebef09a40c.xml");
                e.replace ("<Hash>", "<Hash>x");
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 6);
        list<dcp::VerificationNote>::const_iterator i = notes.begin();
@@ -245,14 +249,14 @@ BOOST_AUTO_TEST_CASE (verify_test3)
 /* Corrupt the ContentKind in the CPL */
 BOOST_AUTO_TEST_CASE (verify_test4)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 4);
 
        {
                Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
                e.replace ("<ContentKind>", "<ContentKind>x");
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 1);
        BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::GENERAL_READ);
@@ -270,7 +274,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_cd49971e-bf4c-4594-8474-54ebef09a40c.xml", n);
 }
 
 static
@@ -290,9 +294,7 @@ void check_after_replace (int n, boost::function<boost::filesystem::path (int)>
                e.replace (from, to);
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 1);
        BOOST_CHECK_EQUAL (notes.front().code(), code1);
@@ -308,9 +310,7 @@ void check_after_replace (int n, boost::function<boost::filesystem::path (int)>
                e.replace (from, to);
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 2);
        BOOST_CHECK_EQUAL (notes.front().code(), code1);
@@ -334,9 +334,7 @@ void check_after_replace (
                e.replace (from, to);
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 3);
        list<dcp::VerificationNote>::const_iterator i = notes.begin ();
@@ -351,7 +349,7 @@ void check_after_replace (
 BOOST_AUTO_TEST_CASE (verify_test5)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       5, &cpl,
                        "<FrameRate>24 1", "<FrameRate>99 1",
                        dcp::VerificationNote::CPL_HASH_INCORRECT,
                        dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE
@@ -361,10 +359,10 @@ BOOST_AUTO_TEST_CASE (verify_test5)
 /* Missing asset */
 BOOST_AUTO_TEST_CASE (verify_test6)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 6);
 
        boost::filesystem::remove ("build/test/verify_test6/video.mxf");
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 1);
        BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
@@ -382,7 +380,7 @@ assetmap (int n)
 BOOST_AUTO_TEST_CASE (verify_test7)
 {
        check_after_replace (
-                       next_verify_test_number++, &assetmap,
+                       7, &assetmap,
                        "<Path>video.mxf</Path>", "<Path></Path>",
                        dcp::VerificationNote::EMPTY_ASSET_PATH
                        );
@@ -392,7 +390,7 @@ BOOST_AUTO_TEST_CASE (verify_test7)
 BOOST_AUTO_TEST_CASE (verify_test8)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       8, &cpl,
                        "http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#",
                        dcp::VerificationNote::MISMATCHED_STANDARD,
                        dcp::VerificationNote::XML_VALIDATION_ERROR,
@@ -405,7 +403,7 @@ BOOST_AUTO_TEST_CASE (verify_test9)
 {
        /* There's no CPL_HASH_INCORRECT error here because it can't find the correct hash by ID (since the ID is wrong) */
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       9, &cpl,
                        "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
                        dcp::VerificationNote::XML_VALIDATION_ERROR
                        );
@@ -415,7 +413,7 @@ BOOST_AUTO_TEST_CASE (verify_test9)
 BOOST_AUTO_TEST_CASE (verify_test10)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       10, &cpl,
                        "<IssueDate>", "<IssueDate>x",
                        dcp::VerificationNote::XML_VALIDATION_ERROR,
                        dcp::VerificationNote::CPL_HASH_INCORRECT
@@ -426,8 +424,8 @@ BOOST_AUTO_TEST_CASE (verify_test10)
 BOOST_AUTO_TEST_CASE (verify_test11)
 {
        check_after_replace (
-               next_verify_test_number++, &pkl,
-               "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
+               11, &pkl,
+               "<Id>urn:uuid:cd4", "<Id>urn:uuid:xd4",
                dcp::VerificationNote::XML_VALIDATION_ERROR
                );
 }
@@ -436,8 +434,8 @@ BOOST_AUTO_TEST_CASE (verify_test11)
 BOOST_AUTO_TEST_CASE (verify_test12)
 {
        check_after_replace (
-               next_verify_test_number++, &asset_map,
-               "<Id>urn:uuid:74e", "<Id>urn:uuid:x4e",
+               12, &asset_map,
+               "<Id>urn:uuid:63c", "<Id>urn:uuid:x3c",
                dcp::VerificationNote::XML_VALIDATION_ERROR
                );
 }
@@ -446,17 +444,17 @@ BOOST_AUTO_TEST_CASE (verify_test12)
 BOOST_AUTO_TEST_CASE (verify_test13)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (3, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       vector<boost::filesystem::path> directories = setup (3, 13);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test%1/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test%1/ASSETMAP", next_verify_test_number);
+       boost::filesystem::path const cpl_file = "build/test/verify_test13/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
+       boost::filesystem::path const pkl_file = "build/test/verify_test13/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
+       boost::filesystem::path const assetmap_file = "build/test/verify_test13/ASSETMAP";
 
        list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
@@ -467,15 +465,15 @@ BOOST_AUTO_TEST_CASE (verify_test13)
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
@@ -487,20 +485,14 @@ BOOST_AUTO_TEST_CASE (verify_test13)
        ++st;
        BOOST_REQUIRE (st == stages.end());
 
-       dump_notes (notes);
-
        BOOST_CHECK_EQUAL (notes.size(), 0);
-
-       next_verify_test_number++;
 }
 
 /* DCP with a short asset */
 BOOST_AUTO_TEST_CASE (verify_test14)
 {
-       vector<boost::filesystem::path> directories = setup (8, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
+       vector<boost::filesystem::path> directories = setup (8, 14);
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        BOOST_REQUIRE_EQUAL (notes.size(), 4);
        list<dcp::VerificationNote>::const_iterator i = notes.begin ();
@@ -512,26 +504,12 @@ BOOST_AUTO_TEST_CASE (verify_test14)
        ++i;
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
        ++i;
-       next_verify_test_number++;
-}
-
-
-static
-shared_ptr<dcp::OpenJPEGImage>
-black_image ()
-{
-       shared_ptr<dcp::OpenJPEGImage> image(new dcp::OpenJPEGImage(dcp::Size(1998, 1080)));
-       int const pixels = 1998 * 1080;
-       for (int i = 0; i < 3; ++i) {
-               memset (image->data(i), 0, pixels * sizeof(int));
-       }
-       return image;
 }
 
 
 static
 void
-dcp_from_frame (dcp::Data const& frame, boost::filesystem::path dir)
+dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir)
 {
        shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
        boost::filesystem::create_directories (dir);
@@ -559,11 +537,11 @@ BOOST_AUTO_TEST_CASE (verify_test15)
 
        /* Compress a black image */
        shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-       dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
        BOOST_REQUIRE (frame.size() < too_big);
 
        /* Place it in a bigger block with some zero padding at the end */
-       dcp::Data oversized_frame(too_big);
+       dcp::ArrayData oversized_frame(too_big);
        memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
        memset (oversized_frame.data().get() + frame.size(), 0, too_big - frame.size());
 
@@ -573,7 +551,7 @@ BOOST_AUTO_TEST_CASE (verify_test15)
 
        vector<boost::filesystem::path> dirs;
        dirs.push_back (dir);
-       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
        BOOST_REQUIRE_EQUAL (notes.size(), 1);
        BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE);
 }
@@ -586,11 +564,11 @@ BOOST_AUTO_TEST_CASE (verify_test16)
 
        /* Compress a black image */
        shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-       dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
        BOOST_REQUIRE (frame.size() < nearly_too_big);
 
        /* Place it in a bigger block with some zero padding at the end */
-       dcp::Data oversized_frame(nearly_too_big);
+       dcp::ArrayData oversized_frame(nearly_too_big);
        memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
        memset (oversized_frame.data().get() + frame.size(), 0, nearly_too_big - frame.size());
 
@@ -600,7 +578,7 @@ BOOST_AUTO_TEST_CASE (verify_test16)
 
        vector<boost::filesystem::path> dirs;
        dirs.push_back (dir);
-       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
        BOOST_REQUIRE_EQUAL (notes.size(), 1);
        BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE);
 }
@@ -611,7 +589,7 @@ BOOST_AUTO_TEST_CASE (verify_test17)
 {
        /* Compress a black image */
        shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-       dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
        BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 
        boost::filesystem::path const dir("build/test/verify_test17");
@@ -620,7 +598,267 @@ BOOST_AUTO_TEST_CASE (verify_test17)
 
        vector<boost::filesystem::path> dirs;
        dirs.push_back (dir);
-       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, "xsd");
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 0);
+}
+
+
+/* DCP with valid Interop subtitles */
+BOOST_AUTO_TEST_CASE (verify_test18)
+{
+       boost::filesystem::path const dir("build/test/verify_test18");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+       boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
+       shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+       dcp->add (cpl);
+       dcp->write_xml (dcp::INTEROP);
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
        BOOST_REQUIRE_EQUAL (notes.size(), 0);
 }
 
+
+/* DCP with broken Interop subtitles */
+BOOST_AUTO_TEST_CASE (verify_test19)
+{
+       boost::filesystem::path const dir("build/test/verify_test19");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+       boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
+       shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+       dcp->add (cpl);
+       dcp->write_xml (dcp::INTEROP);
+
+       {
+               Editor e (dir / "subs.xml");
+               e.replace ("</ReelNumber>", "</ReelNumber><Foo></Foo>");
+       }
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 2);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+       BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+}
+
+
+/* DCP with valid SMPTE subtitles */
+BOOST_AUTO_TEST_CASE (verify_test20)
+{
+       boost::filesystem::path const dir("build/test/verify_test20");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+       boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+       dcp->add (cpl);
+       dcp->write_xml (dcp::SMPTE);
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 0);
+}
+
+
+/* DCP with broken SMPTE subtitles */
+BOOST_AUTO_TEST_CASE (verify_test21)
+{
+       boost::filesystem::path const dir("build/test/verify_test21");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+       boost::filesystem::copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
+       shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+       dcp->add (cpl);
+       dcp->write_xml (dcp::SMPTE);
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 2);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+       BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+}
+
+
+/* VF */
+BOOST_AUTO_TEST_CASE (verify_test22)
+{
+       boost::filesystem::path const ov_dir("build/test/verify_test22_ov");
+       boost::filesystem::remove_all (ov_dir);
+       boost::filesystem::create_directories (ov_dir);
+
+       shared_ptr<dcp::OpenJPEGImage> image = black_image ();
+       dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
+       dcp_from_frame (frame, ov_dir);
+
+       dcp::DCP ov (ov_dir);
+       ov.read ();
+
+       boost::filesystem::path const vf_dir("build/test/verify_test22_vf");
+       boost::filesystem::remove_all (vf_dir);
+       boost::filesystem::create_directories (vf_dir);
+
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (ov.cpls().front()->reels().front()->main_picture());
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       dcp::DCP vf (vf_dir);
+       vf.add (cpl);
+       vf.write_xml (dcp::SMPTE);
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (vf_dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 1);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::EXTERNAL_ASSET);
+}
+
+
+/* DCP with valid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test23)
+{
+       boost::filesystem::path const dir("build/test/verify_test23");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+
+       boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (dcp::SMPTE);
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+}
+
+
+boost::filesystem::path find_cpl (boost::filesystem::path dir)
+{
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); i++) {
+               if (boost::starts_with(i->path().filename().string(), "cpl_")) {
+                       return i->path();
+               }
+       }
+
+       BOOST_REQUIRE (false);
+       return boost::filesystem::path();
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test24)
+{
+       boost::filesystem::path const dir("build/test/verify_test24");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (black_picture_asset(dir));
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (dcp::SMPTE);
+
+       {
+               Editor e (find_cpl("build/test/verify_test24"));
+               e.replace ("MainSound", "MainSoundX");
+       }
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), 4);
+
+       list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+       ++i;
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+       ++i;
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+       ++i;
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT);
+       ++i;
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test25)
+{
+       boost::filesystem::path const dir("build/test/verify_test25");
+       boost::filesystem::remove_all (dir);
+       boost::filesystem::create_directories (dir);
+
+       boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+       shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+
+       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       reel->add (reel_asset);
+       shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (dcp::SMPTE);
+
+       {
+               Editor e (find_cpl("build/test/verify_test25"));
+               e.replace ("</MainPictureActiveArea>", "</MainPictureActiveArea><BadTag></BadTag>");
+       }
+
+       vector<boost::filesystem::path> dirs;
+       dirs.push_back (dir);
+       list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+}
+