X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;h=6d8938ca4b55ab514933c4fa7ea7facffc74c35a;hb=34b40f12d7eec52862999da9e4417fc8f6e0f9af;hp=86bcc5a6939889bcfec87387c682256ad23f4cb6;hpb=9314d6bdf8857bc6cd29b0596158f2d0ff787513;p=dcpomatic.git diff --git a/test/stream_test.cc b/test/stream_test.cc index 86bcc5a69..6d8938ca4 100644 --- a/test/stream_test.cc +++ b/test/stream_test.cc @@ -69,25 +69,12 @@ BOOST_AUTO_TEST_CASE (stream_test) BOOST_CHECK_EQUAL (a.channels, 2); BOOST_CHECK_EQUAL (a.name, "hello there world"); BOOST_CHECK_EQUAL (a.mapping.content_channels(), 2); - BOOST_CHECK_EQUAL (a.mapping.content_to_dcp().size(), 4); - list > m = a.mapping.content_to_dcp (); - list >::iterator i = m.begin(); - - BOOST_CHECK_EQUAL (i->first, 0); - BOOST_CHECK_EQUAL (i->second, libdcp::LEFT); - ++i; - - BOOST_CHECK_EQUAL (i->first, 0); - BOOST_CHECK_EQUAL (i->second, libdcp::CENTRE); - ++i; - - BOOST_CHECK_EQUAL (i->first, 1); - BOOST_CHECK_EQUAL (i->second, libdcp::RIGHT); - ++i; - - BOOST_CHECK_EQUAL (i->first, 1); - BOOST_CHECK_EQUAL (i->second, libdcp::CENTRE); - ++i; + BOOST_CHECK_EQUAL (a.mapping.get (0, libdcp::LEFT), 1); + BOOST_CHECK_EQUAL (a.mapping.get (0, libdcp::RIGHT), 0); + BOOST_CHECK_EQUAL (a.mapping.get (0, libdcp::CENTRE), 1); + BOOST_CHECK_EQUAL (a.mapping.get (1, libdcp::LEFT), 0); + BOOST_CHECK_EQUAL (a.mapping.get (1, libdcp::RIGHT), 1); + BOOST_CHECK_EQUAL (a.mapping.get (1, libdcp::CENTRE), 1); }