X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=2a66cb855842a22c17f43b84f7813ebbb04b3ad0;hb=b7504915924b8eda7546f02ab976a4572fd56f5b;hp=f5bf94c011464265754e59aeddde65dc44e09dc9;hpb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index f5bf94c01..2a66cb855 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -29,33 +29,25 @@ using std::string;
 using std::vector;
 using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (split_at_spaces_considering_quotes_test)
-{
-	string t = "Hello this is a string \"with quotes\" and indeed without them";
-	vector<string> b = split_at_spaces_considering_quotes (t);
-	vector<string>::iterator i = b.begin ();
-	BOOST_CHECK_EQUAL (*i++, "Hello");
-	BOOST_CHECK_EQUAL (*i++, "this");
-	BOOST_CHECK_EQUAL (*i++, "is");
-	BOOST_CHECK_EQUAL (*i++, "a");
-	BOOST_CHECK_EQUAL (*i++, "string");
-	BOOST_CHECK_EQUAL (*i++, "with quotes");
-	BOOST_CHECK_EQUAL (*i++, "and");
-	BOOST_CHECK_EQUAL (*i++, "indeed");
-	BOOST_CHECK_EQUAL (*i++, "without");
-	BOOST_CHECK_EQUAL (*i++, "them");
-}
-
 BOOST_AUTO_TEST_CASE (md5_digest_test)
 {
 	vector<boost::filesystem::path> p;
 	p.push_back ("test/data/md5.test");
-	string const t = md5_digest (p, shared_ptr<Job> ());
-	BOOST_CHECK_EQUAL (t, "15058685ba99decdc4398c7634796eb0");
+	BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912");
 
+	p.push_back ("test/data/md5.test2");
+	BOOST_CHECK_EQUAL (md5_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.clear ();
 	p.push_back ("foobar");
-	BOOST_CHECK_THROW (md5_digest (p, shared_ptr<Job> ()), std::runtime_error);
+	BOOST_CHECK_THROW (md5_digest_head_tail (p, 1024), OpenFileError);
 }
 
 /* Straightforward test of DCPTime::round_up */
@@ -75,20 +67,6 @@ BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 	BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045));
 }
 
-
-BOOST_AUTO_TEST_CASE (divide_with_round_test)
-{
-	BOOST_CHECK_EQUAL (divide_with_round (0, 4), 0);
-	BOOST_CHECK_EQUAL (divide_with_round (1, 4), 0);
-	BOOST_CHECK_EQUAL (divide_with_round (2, 4), 1);
-	BOOST_CHECK_EQUAL (divide_with_round (3, 4), 1);
-	BOOST_CHECK_EQUAL (divide_with_round (4, 4), 1);
-	BOOST_CHECK_EQUAL (divide_with_round (5, 4), 1);
-	BOOST_CHECK_EQUAL (divide_with_round (6, 4), 2);
-
-	BOOST_CHECK_EQUAL (divide_with_round (1000, 500), 2);
-}
-
 BOOST_AUTO_TEST_CASE (timecode_test)
 {
 	DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
@@ -97,13 +75,13 @@ BOOST_AUTO_TEST_CASE (timecode_test)
 
 BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
 {
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1), "1 second");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2), "2 seconds");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (60), "1 minute");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1.5 * 60), "1 minute 30 seconds");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 60), "2 minutes");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (17 * 60 + 20), "17 minutes");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1 * 3600), "1 hour");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1 hour 40 minutes");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14 hours");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1), "1s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2), "2s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (60), "1m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1.5 * 60), "1m 30s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 60), "2m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (17 * 60 + 20), "17m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1 * 3600), "1h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }