X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Futil_test.cc;h=1f894d329537b0998600a8cb3b8211a8aa2a50c7;hp=2a66cb855842a22c17f43b84f7813ebbb04b3ad0;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=59e769023c392c332331567a1aea94660002c463

diff --git a/test/util_test.cc b/test/util_test.cc
index 2a66cb855..1f894d329 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,48 +24,49 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/util.h"
+#include "lib/raw_convert.h"
 #include "lib/exceptions.h"
 
 using std::string;
 using std::vector;
 using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (md5_digest_test)
+BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
 	vector<boost::filesystem::path> p;
-	p.push_back ("test/data/md5.test");
-	BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912");
+	p.push_back ("test/data/digest.test");
+	BOOST_CHECK_EQUAL (digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912");
 
-	p.push_back ("test/data/md5.test2");
-	BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "5a3a89857b931755ae728a518224a05c");
+	p.push_back ("test/data/digest.test2");
+	BOOST_CHECK_EQUAL (digest_head_tail (p, 1024), "5a3a89857b931755ae728a518224a05c");
 
 	p.clear ();
-	p.push_back ("test/data/md5.test3");
-	p.push_back ("test/data/md5.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.push_back ("test/data/digest.test3");
+	p.push_back ("test/data/digest.test");
+	p.push_back ("test/data/digest.test2");
+	p.push_back ("test/data/digest.test4");
+	BOOST_CHECK_EQUAL (digest_head_tail (p, 1024), "52ccf111e4e72b58bb7b2aaa6bd45ea5");
+
 	p.clear ();
 	p.push_back ("foobar");
-	BOOST_CHECK_THROW (md5_digest_head_tail (p, 1024), OpenFileError);
+	BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError);
 }
 
 /* Straightforward test of DCPTime::round_up */
 BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 {
-	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 2), DCPTime (0));
-	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));
-	BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), DCPTime (84));
+	BOOST_CHECK_EQUAL (DCPTime(0).round_up(DCPTime::HZ / 2).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 2).get(), 2);
+	BOOST_CHECK_EQUAL (DCPTime(2).round_up(DCPTime::HZ / 2).get(), 2);
+	BOOST_CHECK_EQUAL (DCPTime(3).round_up(DCPTime::HZ / 2).get(), 4);
+
+	BOOST_CHECK_EQUAL (DCPTime(0).round_up(DCPTime::HZ / 42).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 42).get(), 42);
+	BOOST_CHECK_EQUAL (DCPTime(42).round_up(DCPTime::HZ / 42).get(), 42);
+	BOOST_CHECK_EQUAL (DCPTime(43).round_up(DCPTime::HZ / 42).get(), 84);
 
 	/* Check that rounding up to non-integer frame rates works */
-	BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045));
+	BOOST_CHECK_EQUAL (DCPTime(45312).round_up(29.976).get(), 48045);
 }
 
 BOOST_AUTO_TEST_CASE (timecode_test)
@@ -85,3 +87,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");
+}