Replace std::list with std::vector in the API.

[libdcp.git] / test / round_trip_test.cc

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index f2d16333eedee196d8a322ce05eae19855b16b7a..f730485bc65adb72783ebd4d572282b7d3578753 100644 (file)
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -46,7 +46,6 @@
 #include "mono_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
-#include "file.h"
 #include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
@@ -57,7 +56,7 @@
 using std::list;
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
 
 /** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */
@@ -70,7 +69,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
        shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
        shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", false);
-       dcp::File j2c ("test/data/32x32_red_square.j2c");
+       dcp::ArrayData j2c ("test/data/flat_red.j2c");
        for (int i = 0; i < 24; ++i) {
                writer->write (j2c.data (), j2c.size ());
        }
@@ -85,12 +84,17 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
        reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (asset_A, 0)));
        cpl->add (reel);
 
+       dcp::LocalTime start;
+       start.set_year (start.year() + 1);
+       dcp::LocalTime end;
+       end.set_year (end.year() + 2);
+
        /* A KDM using our certificate chain's leaf key pair */
        dcp::DecryptedKDM kdm_A (
                cpl,
                key,
-               dcp::LocalTime ("2013-01-01T00:00:00+00:00"),
-               dcp::LocalTime ("2013-01-08T00:00:00+00:00"),
+               start,
+               end,
                "libdcp",
                "test",
                "2012-07-17T04:45:18+00:00"
@@ -105,10 +109,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
        /* Check that the decrypted KDMKeys are the same as the ones we started with */
        BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size());
-       list<dcp::DecryptedKDMKey> keys_A = kdm_A.keys ();
-       list<dcp::DecryptedKDMKey> keys_B = kdm_B.keys ();
-       list<dcp::DecryptedKDMKey>::const_iterator i = keys_A.begin();
-       list<dcp::DecryptedKDMKey>::const_iterator j = keys_B.begin();
+       auto keys_A = kdm_A.keys ();
+       auto keys_B = kdm_B.keys ();
+       auto i = keys_A.begin();
+       auto j = keys_B.begin();
        while (i != keys_A.end ()) {
                BOOST_CHECK (*i == *j);
                ++i;