From 1fca376d1000500d2450d936b42004ca69b086b6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 May 2022 22:22:22 +0200 Subject: [PATCH] C++11 tidying. --- test/dcpomatic_time_test.cc | 150 ++++++++++++++++++++---------------- test/threed_test.cc | 4 +- 2 files changed, 84 insertions(+), 70 deletions(-) diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc index 5d23f2478..00e28b91a 100644 --- a/test/dcpomatic_time_test.cc +++ b/test/dcpomatic_time_test.cc @@ -18,21 +18,25 @@ */ + /** @file test/dcpomatic_time_test.cc * @brief Test dcpomatic::Time and dcpomatic::TimePeriod classes. * @ingroup selfcontained */ + #include "lib/dcpomatic_time.h" #include "lib/dcpomatic_time_coalesce.h" #include -#include #include +#include + -using std::list; using std::cout; +using std::list; using namespace dcpomatic; + BOOST_AUTO_TEST_CASE (dcpomatic_time_test) { FrameRateChange frc (24, 48); @@ -50,6 +54,7 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_test) } } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_overlaps_test) { /* Taking times as the start of a sampling interval @@ -65,7 +70,7 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_overlaps_test) the period... a and b do not overlap. */ - TimePeriod a (DCPTime (0), DCPTime (4)); + TimePeriod a (DCPTime(0), DCPTime(4)); TimePeriod b (DCPTime (4), DCPTime (8)); BOOST_CHECK (!a.overlap (b)); @@ -85,15 +90,17 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_overlaps_test) BOOST_CHECK (a.overlap(b).get() == DCPTimePeriod(DCPTime(1), DCPTime(9))); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test1) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); - list B; - B.push_back (DCPTimePeriod (DCPTime (0), DCPTime (42))); - B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91))); - B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (106))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(0), DCPTime(42)), + DCPTimePeriod(DCPTime(52), DCPTime(91)), + DCPTimePeriod(DCPTime(94), DCPTime(106)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (42)); BOOST_CHECK (i->to == DCPTime (52)); @@ -105,15 +112,17 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test1) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test2) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); - list B; - B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42))); - B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91))); - B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (106))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(14), DCPTime(42)), + DCPTimePeriod(DCPTime(52), DCPTime(91)), + DCPTimePeriod(DCPTime(94), DCPTime(106)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (0)); BOOST_CHECK (i->to == DCPTime (14)); @@ -129,15 +138,17 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test2) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test3) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); - list B; - B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42))); - B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91))); - B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (99))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(14), DCPTime(42)), + DCPTimePeriod(DCPTime(52), DCPTime(91)), + DCPTimePeriod(DCPTime(94), DCPTime(99)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (0)); BOOST_CHECK (i->to == DCPTime (14)); @@ -157,12 +168,13 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test3) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test4) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); list B; - list r = subtract (A, B); - list::const_iterator i = r.begin (); + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (0)); BOOST_CHECK (i->to == DCPTime (106)); @@ -170,15 +182,17 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test4) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test5) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); - list B; - B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42))); - B.push_back (DCPTimePeriod (DCPTime (42), DCPTime (91))); - B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (99))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(14), DCPTime(42)), + DCPTimePeriod(DCPTime(42), DCPTime(91)), + DCPTimePeriod(DCPTime(94), DCPTime(99)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (0)); BOOST_CHECK (i->to == DCPTime (14)); @@ -194,24 +208,28 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test5) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test6) { DCPTimePeriod A (DCPTime (0), DCPTime (106)); - list B; - B.push_back (DCPTimePeriod (DCPTime (0), DCPTime (42))); - B.push_back (DCPTimePeriod (DCPTime (42), DCPTime (91))); - B.push_back (DCPTimePeriod (DCPTime (91), DCPTime (106))); - list r = subtract (A, B); + list B = { + DCPTimePeriod(DCPTime(0), DCPTime(42)), + DCPTimePeriod(DCPTime(42), DCPTime(91)), + DCPTimePeriod(DCPTime(91), DCPTime(106)) + }; + auto r = subtract (A, B); BOOST_CHECK (r.empty()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test7) { DCPTimePeriod A (DCPTime (228), DCPTime (356)); - list B; - B.push_back (DCPTimePeriod (DCPTime (34), DCPTime (162))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(34), DCPTime(162)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (i->from == DCPTime (228)); BOOST_CHECK (i->to == DCPTime (356)); @@ -219,14 +237,16 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test7) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test8) { DCPTimePeriod A (DCPTime(0), DCPTime(32000)); - list B; - B.push_back (DCPTimePeriod (DCPTime(8000), DCPTime(20000))); - B.push_back (DCPTimePeriod (DCPTime(28000), DCPTime(32000))); - list r = subtract (A, B); - list::const_iterator i = r.begin (); + list B = { + DCPTimePeriod(DCPTime(8000), DCPTime(20000)), + DCPTimePeriod(DCPTime(28000), DCPTime(32000)) + }; + auto r = subtract (A, B); + auto i = r.begin (); BOOST_REQUIRE (i != r.end ()); BOOST_CHECK (*i == DCPTimePeriod(DCPTime(0), DCPTime(8000))); ++i; @@ -236,84 +256,77 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test8) BOOST_REQUIRE (i == r.end ()); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test1) { DCPTimePeriod A (DCPTime(14), DCPTime(29)); DCPTimePeriod B (DCPTime(45), DCPTime(91)); - list p; - p.push_back (A); - p.push_back (B); - list q = coalesce (p); + list p = { A, B }; + auto q = coalesce (p); BOOST_REQUIRE_EQUAL (q.size(), 2U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(29))); BOOST_CHECK (q.back () == DCPTimePeriod(DCPTime(45), DCPTime(91))); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test2) { DCPTimePeriod A (DCPTime(14), DCPTime(29)); DCPTimePeriod B (DCPTime(26), DCPTime(91)); - list p; - p.push_back (A); - p.push_back (B); - list q = coalesce (p); + list p = { A, B }; + auto q = coalesce (p); BOOST_REQUIRE_EQUAL (q.size(), 1U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91))); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test3) { DCPTimePeriod A (DCPTime(14), DCPTime(29)); DCPTimePeriod B (DCPTime(29), DCPTime(91)); - list p; - p.push_back (A); - p.push_back (B); - list q = coalesce (p); + list p = { A, B }; + auto q = coalesce (p); BOOST_REQUIRE_EQUAL (q.size(), 1U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91))); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test4) { DCPTimePeriod A (DCPTime(14), DCPTime(29)); DCPTimePeriod B (DCPTime(20), DCPTime(91)); DCPTimePeriod C (DCPTime(35), DCPTime(106)); - list p; - p.push_back (A); - p.push_back (B); - p.push_back (C); - list q = coalesce (p); + list p = { A, B, C }; + auto q = coalesce (p); BOOST_REQUIRE_EQUAL (q.size(), 1U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(106))); } + BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test5) { DCPTimePeriod A (DCPTime(14), DCPTime(29)); DCPTimePeriod B (DCPTime(20), DCPTime(91)); DCPTimePeriod C (DCPTime(100), DCPTime(106)); - list p; - p.push_back (A); - p.push_back (B); - p.push_back (C); - list q = coalesce (p); + list p = { A, B, C }; + auto q = coalesce (p); BOOST_REQUIRE_EQUAL (q.size(), 2U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91))); BOOST_CHECK (q.back() == DCPTimePeriod(DCPTime(100), DCPTime(106))); } + BOOST_AUTO_TEST_CASE (test_coalesce_with_overlapping_periods) { DCPTimePeriod A (DCPTime(0), DCPTime(10)); DCPTimePeriod B (DCPTime(2), DCPTime(8)); - list p; - p.push_back (A); - p.push_back (B); + list p = { A, B }; auto q = coalesce(p); BOOST_REQUIRE_EQUAL (q.size(), 1U); BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(0), DCPTime(10))); } + /* Straightforward test of DCPTime::ceil */ BOOST_AUTO_TEST_CASE (dcpomatic_time_ceil_test) { @@ -334,6 +347,7 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_ceil_test) BOOST_CHECK_EQUAL (DCPTime(212256039).ceil(23.976).get(), 212256256); } + /* Straightforward test of DCPTime::floor */ BOOST_AUTO_TEST_CASE (dcpomatic_time_floor_test) { diff --git a/test/threed_test.cc b/test/threed_test.cc index 317ca9a61..78316be08 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE (threed_test7) */ BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths) { - shared_ptr film = new_test_film2 ("threed_test3"); + auto film = new_test_film2 ("threed_test3"); auto L = make_shared("test/data/test.mp4"); film->examine_and_add_content (L); auto R = make_shared("test/data/test.mp4"); @@ -247,7 +247,7 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths) */ BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths) { - shared_ptr film = new_test_film2 ("threed_test3"); + auto film = new_test_film2 ("threed_test3"); auto L = make_shared("test/data/test.mp4"); film->examine_and_add_content (L); auto R = make_shared("test/data/test.mp4"); -- 2.30.2