diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-06 23:58:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-06 23:58:16 +0100 |
| commit | c90ff0d85c88a18730787d511ebc7a6f6c21a2ba (patch) | |
| tree | ba1fa1f807988dff7c7b95c3c2897b333182edd1 /test | |
| parent | ac530d2eb8c8d4041e8265ab823a4b0373b27870 (diff) | |
Pad times with zeros; add Time::rebase().
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_time_test.cc | 12 | ||||
| -rw-r--r-- | test/write_subtitle_test.cc | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index c987517e..3315523b 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (t.s, 34); BOOST_CHECK_EQUAL (t.m, 18); BOOST_CHECK_EQUAL (t.h, 11); - BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73"); + BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:073"); /* Use a tcr of 24 so that the editable event is a frame */ dcp::Time a (3, 2, 3, 4, 24); @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (r.m, 58); BOOST_CHECK_EQUAL (r.s, 58); BOOST_CHECK_EQUAL (r.e, 23); - BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:23"); + BOOST_CHECK_EQUAL (r.to_string(), "00:58:58:023"); /* Different tcr (25) */ a = dcp::Time (1, 58, 56, 2, 25); @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (r.m, 6); BOOST_CHECK_EQUAL (r.s, 8); BOOST_CHECK_EQUAL (r.e, 3); - BOOST_CHECK_EQUAL (r.to_string(), "3:6:8:3"); + BOOST_CHECK_EQUAL (r.to_string(), "03:06:08:003"); /* Another arbitrary tcr (30) */ a = dcp::Time (24, 12, 6, 3, 30); @@ -88,4 +88,10 @@ BOOST_AUTO_TEST_CASE (dcp_time) b = dcp::Time (0, 0, 0, 4, 48); r = a + b; BOOST_CHECK_EQUAL (r, dcp::Time (0, 0, 0, 240, 1152)); + + /* Check rebase() */ + a = dcp::Time (1, 58, 56, 2, 25); + BOOST_CHECK_EQUAL (a.rebase (250), dcp::Time (1, 58, 56, 20, 250)); + b = dcp::Time (9, 12, 41, 17, 99); + BOOST_CHECK_EQUAL (b.rebase (250), dcp::Time (9, 12, 41, 43, 250)); } diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc index 8416abfb..b5daa2b1 100644 --- a/test/write_subtitle_test.cc +++ b/test/write_subtitle_test.cc @@ -77,12 +77,12 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test) " <ReelNumber>1</ReelNumber>\n" " <Language>EN</Language>\n" " <Font Id=\"Frutiger\" Italic=\"no\" Color=\"FFFFFFFF\" Size=\"48\" Effect=\"none\" EffectColor=\"FF000000\" Script=\"normal\" Underlined=\"no\" Weight=\"normal\">\n" - " <Subtitle SpotNumber=\"1\" TimeIn=\"0:4:9:22\" TimeOut=\"0:4:11:22\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n" + " <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:022\" TimeOut=\"00:04:11:022\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n" " <Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n" " </Subtitle>\n" " </Font>\n" " <Font Italic=\"yes\" Color=\"FF800040\" Size=\"91\" Effect=\"border\" EffectColor=\"FF010203\" Script=\"normal\" Underlined=\"no\" Weight=\"normal\">\n" - " <Subtitle SpotNumber=\"2\" TimeIn=\"5:41:0:21\" TimeOut=\"6:12:15:21\" FadeUpTime=\"930790\" FadeDownTime=\"4591830\">\n" + " <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:021\" TimeOut=\"06:12:15:021\" FadeUpTime=\"930790\" FadeDownTime=\"4591830\">\n" " <Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n" " </Subtitle>\n" " </Font>\n" |