Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 2a66cb855842a22c17f43b84f7813ebbb04b3ad0..9dcd053395a1bc5e39b479bb539bb3b94ea12f9f 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/util.h"
+#include "lib/raw_convert.h"
 #include "lib/exceptions.h"
 
 using std::string;
@@ -44,7 +45,7 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
        p.push_back ("test/data/md5.test2");
        p.push_back ("test/data/md5.test4");
        BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "52ccf111e4e72b58bb7b2aaa6bd45ea5");
-       
+
        p.clear ();
        p.push_back ("foobar");
        BOOST_CHECK_THROW (md5_digest_head_tail (p, 1024), OpenFileError);
@@ -57,7 +58,7 @@ BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
        BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), DCPTime (2));
        BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), DCPTime (2));
        BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), DCPTime (4));
-       
+
        BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), DCPTime (0));
        BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), DCPTime (42));
        BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), DCPTime (42));
@@ -85,3 +86,9 @@ BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }
+
+BOOST_AUTO_TEST_CASE (raw_convert_test)
+{
+       BOOST_CHECK_EQUAL (raw_convert<string> ("foo"), "foo");
+       BOOST_CHECK_EQUAL (raw_convert<string> ("foo bar"), "foo bar");
+}