projects / libdcp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix strange Windows build error introduced in 6c37cc1979b2a01205a888c4c98f3334685ee8dd
[libdcp.git] / test / util_test.cc
diff --git a/test/util_test.cc b/test/util_test.cc
index d85b9b565993d6717a0ab8bd36cf88aa5f021d3b..8ca7df44f4cf2d6ddb70e4feb14325d10471a9dd 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -33,11 +33,13 @@
 
 #include "util.h"
 #include "local_time.h"
+#include "stream_operators.h"
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
 using std::ifstream;
 using std::string;
+using std::vector;
 
 /** Test dcp::base64_decode */
 BOOST_AUTO_TEST_CASE (base64_decode_test)
@@ -74,18 +76,18 @@ BOOST_AUTO_TEST_CASE (base64_decode_test)
 /** Test dcp::content_kind_from_string */
 BOOST_AUTO_TEST_CASE (content_kind_test)
 {
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::FEATURE);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::FEATURE);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::FEATURE);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::SHORT);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::TRAILER);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::TEST);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::TRANSITIONAL);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::RATING);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::TEASER);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::POLICY);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT);
-       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ADVERTISEMENT);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::ContentKind::FEATURE);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::ContentKind::FEATURE);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::ContentKind::FEATURE);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::ContentKind::SHORT);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::ContentKind::TRAILER);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::ContentKind::TEST);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::ContentKind::TRANSITIONAL);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::ContentKind::RATING);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::ContentKind::TEASER);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::ContentKind::POLICY);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT);
+       BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ContentKind::ADVERTISEMENT);
 }
 
 /** Test dcp::relative_to_root */
@@ -142,99 +144,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));
        }
@@ -244,100 +203,75 @@ 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));
        }
 }
+
+BOOST_AUTO_TEST_CASE (unique_string_test)
+{
+       vector<string> existing;
+       for (int i = 0; i < 16; i++) {
+               string s;
+               BOOST_CHECK_NO_THROW (s = dcp::unique_string(existing, "foo"));
+               BOOST_CHECK (find(existing.begin(), existing.end(), s) == existing.end());
+               existing.push_back (s);
+       }
+}
C++ library for handling digital cinema packages (DCPs).