X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=40a2835f1515f68a47ba5b9981a812778ad10295;hb=0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6;hp=a5e671f238d9e4e9ba856bd9c015215b9620c9db;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index a5e671f23..40a2835f1 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -23,8 +23,9 @@
 
 using std::string;
 using std::vector;
+using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (util_test)
+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);
@@ -43,8 +44,38 @@ BOOST_AUTO_TEST_CASE (util_test)
 
 BOOST_AUTO_TEST_CASE (md5_digest_test)
 {
-	string const t = md5_digest ("test/data/md5.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_THROW (md5_digest ("foobar"), OpenFileError);
+	p.clear ();
+	p.push_back ("foobar");
+	BOOST_CHECK_THROW (md5_digest (p, shared_ptr<Job> ()), std::runtime_error);
+}
+
+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 (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");
 }