From 09eb707ebc71eff523d86b40a37134f2e0a7ddf7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 30 Oct 2013 22:12:31 +0000 Subject: Update and fix tests. --- test/dcp_time_test.cc | 6 +-- .../81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml | 40 +--------------- test/ref/DCP/foo/ASSETMAP.xml | 56 +--------------------- test/ref/DCP/foo/VOLINDEX.xml | 4 +- .../df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml | 30 +----------- 5 files changed, 7 insertions(+), 129 deletions(-) diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 6d22466f..6892711e 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.m, 18); BOOST_CHECK_EQUAL (t.h, 11); BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73"); - BOOST_CHECK_EQUAL (t.to_ticks(), 1017923); + BOOST_CHECK_EQUAL (t.to_ticks(), 10178573); libdcp::Time a (3, 2, 3, 4); libdcp::Time b (2, 3, 4, 5); @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (r.s, 58); BOOST_CHECK_EQUAL (r.t, 249); BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:249"); - BOOST_CHECK_EQUAL (r.to_ticks(), 88699); + BOOST_CHECK_EQUAL (r.to_ticks(), 884749); a = libdcp::Time (1, 58, 56, 240); b = libdcp::Time (1, 7, 12, 120); @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (r.s, 9); BOOST_CHECK_EQUAL (r.t, 110); BOOST_CHECK_EQUAL (r.to_string(), "3:6:9:110"); - BOOST_CHECK_EQUAL (r.to_ticks(), 279335); + BOOST_CHECK_EQUAL (r.to_ticks(), 2792360); a = libdcp::Time (24, 12, 6, 3); b = libdcp::Time (16, 8, 4, 2); diff --git a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml b/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml index b1c33a9b..d2d2d5ff 100644 --- a/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml +++ b/test/ref/DCP/foo/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml @@ -1,40 +1,2 @@ - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610 - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - video.mxf - 24 1 - 24 - 0 - 24 - 24 1 - 32 32 - - - urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 - audio.mxf - 24 1 - 24 - 0 - 24 - - - - - +urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:379fa64c-ad71-46cf-bef7-b45624006610urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf24 12402424 132 32urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf24 124024 diff --git a/test/ref/DCP/foo/ASSETMAP.xml b/test/ref/DCP/foo/ASSETMAP.xml index ac285835..d7de236a 100644 --- a/test/ref/DCP/foo/ASSETMAP.xml +++ b/test/ref/DCP/foo/ASSETMAP.xml @@ -1,56 +1,2 @@ - - urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bf - Created by OpenDCP 0.0.25 - OpenDCP 0.0.25 - 1 - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - - - urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb - true - - - df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml - 1 - 0 - 1049 - - - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - - - 81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml - 1 - 0 - 1560 - - - - - urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 - - - audio.mxf - 1 - 0 - 305326 - - - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - - - video.mxf - 1 - 0 - 26080 - - - - - +urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bfCreated by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbtruedf0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml10899urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml101292urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf10305326urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxf1026080 diff --git a/test/ref/DCP/foo/VOLINDEX.xml b/test/ref/DCP/foo/VOLINDEX.xml index f66c004a..021685e9 100644 --- a/test/ref/DCP/foo/VOLINDEX.xml +++ b/test/ref/DCP/foo/VOLINDEX.xml @@ -1,4 +1,2 @@ - - 1 - +1 diff --git a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml b/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml index 22a4c3e8..f17c4179 100644 --- a/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml +++ b/test/ref/DCP/foo/df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb_pkl.xml @@ -1,30 +1,2 @@ - - urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bb - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7 - audio.mxf - +qImGHkt/XouNaJ1V/+7BtcB4VU= - 305326 - application/mxf - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - video.mxf - E2vhyxdJQhEzSQZdp31w84ZZpfk= - 26080 - application/mxf - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - Lq1tBajxiCifEsxAjuNV0VgG1bA= - 1560 - text/xml - - - +urn:uuid:df0e4141-13c3-4a7a-bef8-b5a04fcbc4bbA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:c38bdd62-ce03-4988-8603-195f134207c7audio.mxf+qImGHkt/XouNaJ1V/+7BtcB4VU=305326application/mxfurn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71video.mxfE2vhyxdJQhEzSQZdp31w84ZZpfk=26080application/mxfurn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bfd/4cs9kXW7PyDSmJdXb4NkC2qU=1292text/xml -- cgit v1.2.3