diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-03-01 11:56:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 7a77c0cb257f4e783b844c1699b003990977de5e (patch) | |
| tree | 611628ccb40130c9bd5ace19ec13bf4bc5d54b24 /test/dcp_subtitle_test.cc | |
| parent | b52491bd55097c343cd8514612d429a55d878be1 (diff) | |
Fix bugs in test.
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 66fe855cd..b1689a6cc 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -84,10 +84,10 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log())); decoder->subtitle->TextData.connect (bind (store, _1)); - while (!decoder->pass() || !stored) {} + stored = optional<ContentTextSubtitle> (); + while (!decoder->pass() && !stored) {} BOOST_REQUIRE (stored); - BOOST_REQUIRE_EQUAL (stored->subs.size(), 1); BOOST_REQUIRE_EQUAL (stored->subs.size(), 2); BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal."); BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois."); @@ -107,6 +107,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); decoder->subtitle->TextData.connect (bind (store, _1)); + stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { if (stored && stored->period().from == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); @@ -130,6 +131,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) wait_for_jobs (); shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log())); + stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { decoder->subtitle->TextData.connect (bind (store, _1)); if (stored && stored->period().from == ContentTime::from_seconds(0.08)) { |