using std::vector;
using std::make_pair;
using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
static list<pair<string, optional<boost::filesystem::path> > > stages;
}
+static void
+prepare_directory (boost::filesystem::path path)
+{
+ using namespace boost::filesystem;
+ remove_all (path);
+ create_directories (path);
+}
+
+
static vector<boost::filesystem::path>
setup (int reference_number, int verify_test_number)
{
- boost::filesystem::remove_all (dcp::String::compose("build/test/verify_test%1", verify_test_number));
- boost::filesystem::create_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number));
+ prepare_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number));
for (boost::filesystem::directory_iterator i(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number)); i != boost::filesystem::directory_iterator(); ++i) {
boost::filesystem::copy_file (i->path(), dcp::String::compose("build/test/verify_test%1", verify_test_number) / i->path().filename());
}
++st;
BOOST_REQUIRE (st == stages.end());
- BOOST_CHECK_EQUAL (notes.size(), 0);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
}
/* DCP with a short asset */
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);
+ BOOST_REQUIRE_EQUAL (notes.size(), 5);
list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
+ ++i;
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
++i;
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
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);
+ prepare_directory (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));
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);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
}
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);
+ prepare_directory (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));
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);
+ BOOST_REQUIRE_EQUAL (notes.size(), 3);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
}
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);
+ prepare_directory (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));
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);
+ prepare_directory (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));
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);
+ prepare_directory (ov_dir);
shared_ptr<dcp::OpenJPEGImage> image = black_image ();
dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
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);
+ prepare_directory (vf_dir);
shared_ptr<dcp::Reel> reel(new dcp::Reel());
reel->add (ov.cpls().front()->reels().front()->main_picture());
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);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
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);
+ prepare_directory (dir);
shared_ptr<dcp::Reel> reel(new dcp::Reel());
reel->add (black_picture_asset(dir));
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);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
}
+
+/* SMPTE DCP with invalid <Language> in the MainSubtitle reel and also in the XML within the MXF */
+BOOST_AUTO_TEST_CASE (verify_test26)
+{
+ boost::filesystem::path const dir("build/test/verify_test26");
+ prepare_directory (dir);
+ boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ asset->_language = "wrong-andbad";
+ asset->write (dir / "subs.mxf");
+ shared_ptr<dcp::ReelSubtitleAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ reel_asset->_language = "badlang";
+ 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(), 2U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "badlang");
+ i++;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad");
+}
+