Read UTF8 string lengths correctly when checking closed captions (part of #1446).

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 0cbb5acd36ad8d9d535ae4f38bf4b07080ce48f0..d8cb61fdc30677d2208e52ca232554f60bd1762b 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -20,18 +20,20 @@
 
 /** @file  test/util_test.cc
  *  @brief Test various utility methods.
+ *  @ingroup selfcontained
  */
 
-#include <boost/test/unit_test.hpp>
 #include "lib/util.h"
-#include "lib/raw_convert.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;
 
-BOOST_AUTO_TEST_CASE (digest_test)
+BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
        vector<boost::filesystem::path> p;
        p.push_back ("test/data/digest.test");
@@ -52,23 +54,6 @@ BOOST_AUTO_TEST_CASE (digest_test)
        BOOST_CHECK_THROW (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_AUTO_TEST_CASE (timecode_test)
 {
        DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
@@ -85,11 +70,52 @@ 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)
 {
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo"), "foo");
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo bar"), "foo bar");
+       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