_line should be optional.

[libdcp.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 24aa5e72d6446cf0ef726beafb31497ef534da1d..21a0d7bc64688d0a0f739cc86b41c6f1d4ca5cab 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -38,7 +38,7 @@
 
 using std::ifstream;
 using std::string;
-using std::list;
+using std::vector;
 
 /** Test dcp::base64_decode */
 BOOST_AUTO_TEST_CASE (base64_decode_test)
@@ -143,99 +143,56 @@ BOOST_AUTO_TEST_CASE (day_less_than_or_equal_test)
 {
        {
                /* equal */
-               struct tm a;
-               a.tm_mday = 5;
-               a.tm_mon = 3;
-               a.tm_year = 78;
-
+               dcp::LocalTime a ("1978-04-05T00:00:00");
                dcp::LocalTime b ("1978-04-05T00:00:00");
                BOOST_CHECK (day_less_than_or_equal(a, b));
        }
 
        {
                /* every part of a less than b */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-02-04T00:00:00");
                dcp::LocalTime b ("1985-05-23T00:00:00");
                BOOST_CHECK (day_less_than_or_equal(a, b));
        }
 
        {
                /* years equal, other parts less */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-02T00:00:00");
                dcp::LocalTime b ("1981-05-10T00:00:00");
                BOOST_CHECK (day_less_than_or_equal(a, b));
        }
 
        {
                /* year and month equal, day less */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-09T00:00:00");
                dcp::LocalTime b ("1981-03-12T00:00:00");
                BOOST_CHECK (day_less_than_or_equal(a, b));
        }
 
-       {
-               /* year and month equal, day less */
-               struct tm a;
-               a.tm_mday = 1;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
-               dcp::LocalTime b ("1981-03-04T00:00:00");
-               BOOST_CHECK (day_less_than_or_equal(a, b));
-       }
-
        {
                /* a one day later than b */
-               struct tm a;
-               a.tm_mday = 5;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-05T00:00:00");
                dcp::LocalTime b ("1981-03-04T00:00:00");
                BOOST_CHECK (!day_less_than_or_equal(a, b));
        }
 
        {
                /* year and month same, day much later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-22T00:00:00");
                dcp::LocalTime b ("1981-03-04T00:00:00");
                BOOST_CHECK (!day_less_than_or_equal(a, b));
        }
 
        {
                /* year same, month and day later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 5;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-06-22T00:00:00");
                dcp::LocalTime b ("1981-02-04T00:00:00");
                BOOST_CHECK (!day_less_than_or_equal(a, b));
        }
 
        {
                /* all later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 5;
-               a.tm_year = 99;
-
+               dcp::LocalTime a ("1999-06-22T00:00:00");
                dcp::LocalTime b ("1981-02-04T00:00:00");
                BOOST_CHECK (!day_less_than_or_equal(a, b));
        }
@@ -245,99 +202,63 @@ BOOST_AUTO_TEST_CASE (day_greater_than_or_equal_test)
 {
        {
                /* equal */
-               struct tm a;
-               a.tm_mday = 5;
-               a.tm_mon = 3;
-               a.tm_year = 78;
-
+               dcp::LocalTime a ("1978-04-05T00:00:00");
                dcp::LocalTime b ("1978-04-05T00:00:00");
                BOOST_CHECK (day_greater_than_or_equal(a, b));
        }
 
        {
                /* every part of a less than b */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-04T00:00:00");
                dcp::LocalTime b ("1985-05-23T00:00:00");
                BOOST_CHECK (!day_greater_than_or_equal(a, b));
        }
 
        {
                /* years equal, other parts less */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-02-05T00:00:00");
                dcp::LocalTime b ("1981-05-10T00:00:00");
                BOOST_CHECK (!day_greater_than_or_equal(a, b));
        }
 
        {
                /* year and month equal, day less */
-               struct tm a;
-               a.tm_mday = 4;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-04T00:00:00");
                dcp::LocalTime b ("1981-03-12T00:00:00");
                BOOST_CHECK (!day_greater_than_or_equal(a, b));
        }
 
        {
                /* year and month equal, day less */
-               struct tm a;
-               a.tm_mday = 1;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-01T00:00:00");
                dcp::LocalTime b ("1981-03-04T00:00:00");
                BOOST_CHECK (!day_greater_than_or_equal(a, b));
        }
 
        {
                /* a one day later than b */
-               struct tm a;
-               a.tm_mday = 5;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-05T00:00:00");
                dcp::LocalTime b ("1981-03-04T00:00:00");
                BOOST_CHECK (day_greater_than_or_equal(a, b));
        }
 
        {
                /* year and month same, day much later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 2;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-03-22T00:00:00");
                dcp::LocalTime b ("1981-03-04T00:00:00");
                BOOST_CHECK (day_greater_than_or_equal(a, b));
        }
 
        {
                /* year same, month and day later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 5;
-               a.tm_year = 81;
-
+               dcp::LocalTime a ("1981-05-22T00:00:00");
                dcp::LocalTime b ("1981-02-04T00:00:00");
                BOOST_CHECK (day_greater_than_or_equal(a, b));
        }
 
        {
                /* all later */
-               struct tm a;
-               a.tm_mday = 22;
-               a.tm_mon = 5;
-               a.tm_year = 99;
-
+               dcp::LocalTime a ("1999-06-22T00:00:00");
                dcp::LocalTime b ("1981-02-04T00:00:00");
                BOOST_CHECK (day_greater_than_or_equal(a, b));
        }
@@ -345,7 +266,7 @@ BOOST_AUTO_TEST_CASE (day_greater_than_or_equal_test)
 
 BOOST_AUTO_TEST_CASE (unique_string_test)
 {
-       list<string> existing;
+       vector<string> existing;
        for (int i = 0; i < 16; i++) {
                string s;
                BOOST_CHECK_NO_THROW (s = dcp::unique_string(existing, "foo"));