X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=9f03b6a4714a6120827ced463daa8af740dc5cde;hb=bd7f4bbde17d2087ba4c4bddf6439b3df869b1db;hp=610555ad687a0ce2dc8400846acdd996d823fc95;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;p=dcpomatic.git diff --git a/test/util_test.cc b/test/util_test.cc index 610555ad6..9f03b6a47 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -29,12 +29,15 @@ #include "test.h" #include #include -#include +#include using std::string; using std::vector; using std::list; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; BOOST_AUTO_TEST_CASE (digest_head_tail_test) @@ -103,27 +106,6 @@ BOOST_AUTO_TEST_CASE (utf8_strlen_test) BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11U); } -#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 ("hello_world", careful_string_filter("hello_world"));