diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /test | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'test')
| -rw-r--r-- | test/film_metadata_test.cc | 2 | ||||
| -rw-r--r-- | test/job_test.cc | 4 | ||||
| -rw-r--r-- | test/util_test.cc | 13 |
3 files changed, 13 insertions, 6 deletions
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 7440e4338..c9f4a2c38 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -17,7 +17,6 @@ */ -#include <sstream> #include <boost/test/unit_test.hpp> #include <boost/filesystem.hpp> #include <boost/date_time.hpp> @@ -27,7 +26,6 @@ #include "test.h" using std::string; -using std::stringstream; using std::list; using boost::shared_ptr; diff --git a/test/job_test.cc b/test/job_test.cc index a77bc949c..7d2911c4e 100644 --- a/test/job_test.cc +++ b/test/job_test.cc @@ -54,10 +54,6 @@ public: string name () const { return ""; } - - string json_name () const { - return ""; - } }; BOOST_AUTO_TEST_CASE (job_manager_test) diff --git a/test/util_test.cc b/test/util_test.cc index 750023d9f..40a2835f1 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -66,3 +66,16 @@ BOOST_AUTO_TEST_CASE (divide_with_round_test) 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"); +} |