projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: whitespace.
[dcpomatic.git]
/
test
/
closed_caption_test.cc
diff --git
a/test/closed_caption_test.cc
b/test/closed_caption_test.cc
index bcb6f84a76d021c6f73af57def91cb8321136b1e..80effc9a0c0c99e0652eca18c2fea378aa246ba0 100644
(file)
--- a/
test/closed_caption_test.cc
+++ b/
test/closed_caption_test.cc
@@
-18,19
+18,21
@@
*/
*/
+
#include "lib/film.h"
#include "lib/film.h"
-#include "lib/text_content.h"
#include "lib/string_text_file_content.h"
#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
#include "test.h"
#include "test.h"
-#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/cpl.h>
+#include <dcp/dcp.h>
#include <dcp/reel.h>
#include <dcp/reel_closed_caption_asset.h>
#include <boost/test/unit_test.hpp>
#include <dcp/reel.h>
#include <dcp/reel_closed_caption_asset.h>
#include <boost/test/unit_test.hpp>
+
using std::list;
using std::make_shared;
using std::list;
using std::make_shared;
-using std::shared_ptr;
+
/** Basic test that Interop closed captions are written */
BOOST_AUTO_TEST_CASE (closed_caption_test1)
/** Basic test that Interop closed captions are written */
BOOST_AUTO_TEST_CASE (closed_caption_test1)
@@
-100,15
+102,15
@@
BOOST_AUTO_TEST_CASE (closed_caption_test2)
BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
auto i = ccaps.begin ();
BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
auto i = ccaps.begin ();
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text()
.get_value_or("")
, "First track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
++i;
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
++i;
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text()
.get_value_or("")
, "Second track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
++i;
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
++i;
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text()
.get_value_or("")
, "Third track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");