diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-28 16:00:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-28 16:00:16 +0000 |
| commit | 15137597824b263c875bd427f7d121eae28d45a6 (patch) | |
| tree | cb6dc61e13822c103ece293f875e85dab24823c0 /test | |
| parent | 4126980a15f4f6bb981d0793bd37483456c5bc79 (diff) | |
Various fixes.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_test.cc | 6 | ||||
| -rw-r--r-- | test/util_test.cc | 43 |
2 files changed, 47 insertions, 2 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 38c9a3fd..af5a79f5 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (dcp_test) shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1))); mp->set_progress (&d.Progress); mp->set_metadata (mxf_meta); - shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/bar/video.mxf", dcp::SMPTE, false); + shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/foo/video.mxf", dcp::SMPTE, false); dcp::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { picture_writer->write (j2c.data (), j2c.size ()); @@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (dcp_test) shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1)); ms->set_progress (&d.Progress); ms->set_metadata (mxf_meta); - shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/bar/audio.mxf", dcp::SMPTE); + shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/foo/audio.mxf", dcp::SMPTE); SF_INFO info; info.format = 0; @@ -100,6 +100,8 @@ BOOST_AUTO_TEST_CASE (dcp_test) )); d.add (cpl); + d.add (mp); + d.add (ms); d.write_xml (dcp::SMPTE, xml_meta); diff --git a/test/util_test.cc b/test/util_test.cc index 74a3e920..15f22f57 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -70,3 +70,46 @@ BOOST_AUTO_TEST_CASE (content_kind_test) BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT); BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ADVERTISEMENT); } + +BOOST_AUTO_TEST_CASE (relative_to_root_test) +{ + { + boost::filesystem::path root = "a"; + root /= "b"; + + boost::filesystem::path file = "a"; + file /= "b"; + file /= "c"; + + boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + BOOST_CHECK (rel); + BOOST_CHECK_EQUAL (rel.get(), boost::filesystem::path ("c")); + } + + { + boost::filesystem::path root = "a"; + root /= "b"; + root /= "c"; + + boost::filesystem::path file = "a"; + file /= "b"; + + boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + BOOST_CHECK (!rel); + } + + { + boost::filesystem::path root = "a"; + + boost::filesystem::path file = "a"; + file /= "b"; + file /= "c"; + + boost::optional<boost::filesystem::path> rel = dcp::relative_to_root (root, file); + BOOST_CHECK (rel); + + boost::filesystem::path check = "b"; + check /= "c"; + BOOST_CHECK_EQUAL (rel.get(), check); + } +} |