diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-20 00:40:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-20 00:40:35 +0100 |
| commit | f614b4526cd06a4d28b46bd2d98a55d56b97b14f (patch) | |
| tree | 1eaf03b5e145a0cb7d8a42a37c1b8e6240c6ac23 /test | |
| parent | d989a83517fd77aa241c1423ac00cfed62d567fe (diff) | |
Tidy up handling of language metadata for subtitles.
Tried to normalise the idea that subtitle languages are stored as
strings but set as LanguageTags. This may be too defensive; perhaps
SMPTE language metadata is always right, or perhaps even if it isn't
we should throw errors.
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_metadata_test.cc | 3 | ||||
| -rw-r--r-- | test/reel_asset_test.cc | 2 | ||||
| -rw-r--r-- | test/write_subtitle_test.cc | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc index 5082b8f6..a97daaa9 100644 --- a/test/cpl_metadata_test.cc +++ b/test/cpl_metadata_test.cc @@ -233,7 +233,8 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test1) list<shared_ptr<dcp::Reel> > reels = cpl.reels (); BOOST_REQUIRE_EQUAL (reels.size(), 1); - BOOST_CHECK_EQUAL (reels.front()->main_subtitle()->language().get(), dcp::LanguageTag("de-DE")); + BOOST_REQUIRE (reels.front()->main_subtitle()->language()); + BOOST_CHECK_EQUAL (reels.front()->main_subtitle()->language().get(), "de-DE"); vector<string> asl = cpl.additional_subtitle_languages(); BOOST_REQUIRE_EQUAL (asl.size(), 2); diff --git a/test/reel_asset_test.cc b/test/reel_asset_test.cc index 45736a7a..42d76525 100644 --- a/test/reel_asset_test.cc +++ b/test/reel_asset_test.cc @@ -103,5 +103,5 @@ BOOST_AUTO_TEST_CASE (reel_subtitle_asset_test) BOOST_CHECK_EQUAL (ps.duration().get(), 525L); BOOST_CHECK_EQUAL (ps.hash().get(), string("3EABjX9BB1CAWhLUtHhrGSyLgOY=")); BOOST_REQUIRE (ps.language()); - BOOST_CHECK_EQUAL (ps.language()->to_string(), "de-DE"); + BOOST_CHECK_EQUAL (ps.language().get(), "de-DE"); } diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc index 1f5ded21..c3217dbc 100644 --- a/test/write_subtitle_test.cc +++ b/test/write_subtitle_test.cc @@ -407,7 +407,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test) { dcp::SMPTESubtitleAsset c; c.set_reel_number (1); - c.set_language ("EN"); + c.set_language (dcp::LanguageTag("en")); c.set_content_title_text ("Test"); c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00")); @@ -472,7 +472,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test) "<dcst:ContentTitleText>Test</dcst:ContentTitleText>" "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>" "<dcst:ReelNumber>1</dcst:ReelNumber>" - "<dcst:Language>EN</dcst:Language>" + "<dcst:Language>en</dcst:Language>" "<dcst:EditRate>24 1</dcst:EditRate>" "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>" "<dcst:SubtitleList>" @@ -500,7 +500,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2) { dcp::SMPTESubtitleAsset c; c.set_reel_number (1); - c.set_language ("EN"); + c.set_language (dcp::LanguageTag("en")); c.set_content_title_text ("Test"); c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00")); @@ -670,7 +670,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2) "<dcst:ContentTitleText>Test</dcst:ContentTitleText>" "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>" "<dcst:ReelNumber>1</dcst:ReelNumber>" - "<dcst:Language>EN</dcst:Language>" + "<dcst:Language>en</dcst:Language>" "<dcst:EditRate>24 1</dcst:EditRate>" "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>" "<dcst:SubtitleList>" @@ -699,7 +699,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3) { dcp::SMPTESubtitleAsset c; c.set_reel_number (1); - c.set_language ("EN"); + c.set_language (dcp::LanguageTag("en")); c.set_content_title_text ("Test"); c.add ( |