Various comment fixes to tests.

[dcpomatic.git] / test / subrip_test.cc

diff --git a/test/subrip_test.cc b/test/subrip_test.cc
index d8c2d75de0da539c4d8a2fc66fe0c1aed63fe8bf..48bb265d515a5865b82bcfa5b28b125e589d8a61 100644 (file)
--- a/test/subrip_test.cc
+++ b/test/subrip_test.cc
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  test/subrip_test.cc
+ *  @brief Various tests of the subrip code.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <dcp/subtitle_content.h>
 #include "lib/subrip.h"
@@ -130,45 +134,45 @@ BOOST_AUTO_TEST_CASE (subrip_parse_test)
        vector<SubRipSubtitle>::const_iterator i = s._subtitles.begin();
 
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 49.200));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 52.351));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 49.200));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 52.351));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "This is a subtitle, and it goes over two lines.");
 
        ++i;
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 52.440));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 54.351));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 52.440));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 54.351));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "We have emboldened this");
        BOOST_CHECK_EQUAL (i->pieces.front().bold, true);
 
        ++i;
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 54.440));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 56.590));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 54.440));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 56.590));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "And italicised this.");
        BOOST_CHECK_EQUAL (i->pieces.front().italic, true);
 
        ++i;
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 56.680));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 58.955));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 56.680));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 58.955));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "Shall I compare thee to a summers' day?");
 
        ++i;
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((2 * 60) + 0.840));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((2 * 60) + 3.400));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((2 * 60) + 0.840));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((2 * 60) + 3.400));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "Is this a dagger I see before me?");
 
        ++i;
        BOOST_CHECK (i != s._subtitles.end ());
-       BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((3 * 60) + 54.560));
-       BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((3 * 60) + 56.471));
+       BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((3 * 60) + 54.560));
+       BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((3 * 60) + 56.471));
        BOOST_CHECK_EQUAL (i->pieces.size(), 1);
        BOOST_CHECK_EQUAL (i->pieces.front().text, "Hello world.");
 
@@ -185,12 +189,11 @@ BOOST_AUTO_TEST_CASE (subrip_render_test)
 
        shared_ptr<Film> film = new_test_film ("subrip_render_test");
 
-       shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (film, content));
-       shared_ptr<DecodedTextSubtitle> dts = dynamic_pointer_cast<DecodedTextSubtitle> (decoder->peek ());
+       shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content));
+       list<shared_ptr<ContentTextSubtitle> > cts = decoder->get_text_subtitles (ContentTime::from_seconds (109), ContentTime::from_seconds (110));
+       BOOST_CHECK_EQUAL (cts.size(), 1);
 
-       shared_ptr<Image> image;
-       Position<int> position;
-       render_subtitles (dts->subs, dcp::Size (1998, 1080), image, position);
-       write_image (image, "build/test/subrip_render_test.png");
+       PositionImage image = render_subtitles (cts.front()->subs, dcp::Size (1998, 1080));
+       write_image (image.image, "build/test/subrip_render_test.png");
        check_file ("build/test/subrip_render_test.png", "test/data/subrip_render_test.png");
 }