X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Futil_test.cc;h=b071708b3043d55ad1a42c2e8fd257af82dc9808;hp=f5bf94c011464265754e59aeddde65dc44e09dc9;hb=6996f3e291aec986adb1589808a54d09b8647520;hpb=1f82930e73679d6aec5223caa255f564339a1a2a diff --git a/test/util_test.cc b/test/util_test.cc index f5bf94c01..b071708b3 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -1,92 +1,89 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - 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 . */ /** @file test/util_test.cc * @brief Test various utility methods. + * @ingroup selfcontained */ -#include #include "lib/util.h" #include "lib/exceptions.h" +#include 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 b = split_at_spaces_considering_quotes (t); - vector::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) +BOOST_AUTO_TEST_CASE (digest_head_tail_test) { vector p; - p.push_back ("test/data/md5.test"); - string const t = md5_digest (p, shared_ptr ()); - BOOST_CHECK_EQUAL (t, "15058685ba99decdc4398c7634796eb0"); + p.push_back ("test/data/digest.test"); + BOOST_CHECK_EQUAL (digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912"); + + p.push_back ("test/data/digest.test2"); + BOOST_CHECK_EQUAL (digest_head_tail (p, 1024), "5a3a89857b931755ae728a518224a05c"); + + p.clear (); + 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 (p, shared_ptr ()), std::runtime_error); + BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError); } -/* Straightforward test of DCPTime::round_up */ -BOOST_AUTO_TEST_CASE (dcptime_round_up_test) +/* Straightforward test of DCPTime::ceil */ +BOOST_AUTO_TEST_CASE (dcptime_ceil_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).ceil(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(2).ceil(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(3).ceil(DCPTime::HZ / 2).get(), 4); + + BOOST_CHECK_EQUAL (DCPTime(0).ceil(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 42).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(42).ceil(DCPTime::HZ / 42).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(43).ceil(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).ceil(29.976).get(), 48038); } - -BOOST_AUTO_TEST_CASE (divide_with_round_test) +/* Straightforward test of DCPTime::floor */ +BOOST_AUTO_TEST_CASE (dcptime_floor_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_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(2).floor(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(3).floor(DCPTime::HZ / 2).get(), 2); + + BOOST_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(42).floor(DCPTime::HZ / 42.0).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(43).floor(DCPTime::HZ / 42.0).get(), 42); + + /* Check that rounding down to non-integer frame rates works */ + BOOST_CHECK_EQUAL (DCPTime(45312).floor(29.976).get(), 44836); } BOOST_AUTO_TEST_CASE (timecode_test) @@ -97,13 +94,21 @@ 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"); +} + +BOOST_AUTO_TEST_CASE (tidy_for_filename_test) +{ + BOOST_CHECK_EQUAL (tidy_for_filename ("fish\\chips"), "fish_chips"); + BOOST_CHECK_EQUAL (tidy_for_filename ("fish:chips\\"), "fish_chips_"); + BOOST_CHECK_EQUAL (tidy_for_filename ("fish/chips\\"), "fish_chips_"); + BOOST_CHECK_EQUAL (tidy_for_filename ("abcdefghï"), "abcdefghï"); }