Fix assertion failure on making a VF, in certain circumstances.

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index a605c3548cc5ff3a8b2d6c49e860b3a3ab9276e3..709bb082757d5bc44e7d11c65ed891bb94d81f2a 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -24,12 +24,15 @@
  */
 
 #include "lib/util.h"
+#include "lib/cross.h"
 #include "lib/exceptions.h"
+#include <dcp/certificate_chain.h>
 #include <boost/test/unit_test.hpp>
 
 using std::string;
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
@@ -52,40 +55,6 @@ BOOST_AUTO_TEST_CASE (digest_head_tail_test)
        BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError);
 }
 
-/* Straightforward test of DCPTime::ceil */
-BOOST_AUTO_TEST_CASE (dcptime_ceil_test)
-{
-       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).ceil(29.976).get(), 48038);
-}
-
-/* Straightforward test of DCPTime::floor */
-BOOST_AUTO_TEST_CASE (dcptime_floor_test)
-{
-       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)
 {
        DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
@@ -102,6 +71,8 @@ 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");
 }
 
@@ -121,3 +92,40 @@ BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
        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<dcp::CertificateChain> 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<dcp::CertificateChain> 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"));
+       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_à"));
+}