X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=1e13efa82f456959d4cf538c70dd809fbf7c657f;hb=11efa93e15b694b8ea6f0a2bc68c87503cc570bb;hp=9dcd053395a1bc5e39b479bb539bb3b94ea12f9f;hpb=ab3db3166a2217eb9616fea068a952330a9e64a2;p=dcpomatic.git diff --git a/test/util_test.cc b/test/util_test.cc index 9dcd05339..1e13efa82 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -1,71 +1,57 @@ /* 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/raw_convert.h" +#include "lib/cross.h" #include "lib/exceptions.h" +#include +#include 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 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); -} - -/* 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)); - - /* Check that rounding up to non-integer frame rates works */ - BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045)); + BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError); } BOOST_AUTO_TEST_CASE (timecode_test) @@ -84,11 +70,61 @@ BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test) 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 (2 * 3600), "2h"); + BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 3600 - 1), "2h"); BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h"); } -BOOST_AUTO_TEST_CASE (raw_convert_test) +BOOST_AUTO_TEST_CASE (time_to_hmsf_test) +{ + BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_frames(12, 24), 24), "0:00:00.12"); + BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_frames(24, 24), 24), "0:00:01.0"); + BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_frames(32, 24), 24), "0:00:01.8"); + BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_seconds(92), 24), "0:01:32.0"); + BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_seconds(2 * 60 * 60 + 92), 24), "2:01:32.0"); +} + +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ï"); +} + +BOOST_AUTO_TEST_CASE (utf8_strlen_test) +{ + BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11); + BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11); + BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11); +} + +#ifdef DCPOMATIC_VARIANT_SWAROOP +BOOST_AUTO_TEST_CASE (swaroop_chain_test) +{ + shared_ptr cc ( + new dcp::CertificateChain ( + openssl_path(), + "dcpomatic.com", + "dcpomatic.com", + ".dcpomatic.smpte-430-2.ROOT", + ".dcpomatic.smpte-430-2.INTERMEDIATE", + "CS.dcpomatic.smpte-430-2.LEAF" + ) + ); + + write_swaroop_chain (cc, "build/test/swaroop_chain"); + shared_ptr back = read_swaroop_chain ("build/test/swaroop_chain"); + + BOOST_CHECK (cc->root_to_leaf() == back->root_to_leaf()); +} +#endif + +BOOST_AUTO_TEST_CASE (careful_string_filter_test) { - BOOST_CHECK_EQUAL (raw_convert ("foo"), "foo"); - BOOST_CHECK_EQUAL (raw_convert ("foo bar"), "foo bar"); + BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("hello_world")); + BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("héllo_world")); + BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("héllo_wörld")); + BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("héllo_wörld")); + BOOST_CHECK_EQUAL ("hello_world_a", careful_string_filter("héllo_wörld_à")); }