X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Futil_test.cc;h=a45c144b1c5056fe48e466b36ba1d04b6f89aff4;hp=709bb082757d5bc44e7d11c65ed891bb94d81f2a;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566

diff --git a/test/util_test.cc b/test/util_test.cc
index 709bb0827..a45c144b1 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,32 @@
 
 */
 
+
 /** @file  test/util_test.cc
  *  @brief Test various utility methods.
  *  @ingroup selfcontained
  */
 
+
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
+#include "test.h"
 #include <dcp/certificate_chain.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/bind/bind.hpp>
+
 
+using std::list;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
 	vector<boost::filesystem::path> p;
@@ -55,27 +65,30 @@ BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 	BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError);
 }
 
+
 BOOST_AUTO_TEST_CASE (timecode_test)
 {
-	DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
+	auto t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
 	BOOST_CHECK_EQUAL (t.timecode (24), "02:04:31:19");
 }
 
+
 BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
 {
-	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 (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_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(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 (time_to_hmsf_test)
 {
 	BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_frames(12, 24), 24), "0:00:00.12");
@@ -85,6 +98,7 @@ BOOST_AUTO_TEST_CASE (time_to_hmsf_test)
 	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");
@@ -93,33 +107,14 @@ BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 	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);
+	BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11U);
+	BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11U);
+	BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11U);
 }
 
-#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)
 {
@@ -128,4 +123,28 @@ BOOST_AUTO_TEST_CASE (careful_string_filter_test)
 	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_à"));
+	BOOST_CHECK_EQUAL ("hello_world_CcGgIOoSsUuLl", careful_string_filter("hello_world_ÇçĞğİÖöŞşÜüŁł"));
+}
+
+
+static list<float> progress_values;
+
+static void
+progress (float p)
+{
+	progress_values.push_back (p);
+}
+
+
+BOOST_AUTO_TEST_CASE (copy_in_bits_test)
+{
+	for (int i = 0; i < 32; ++i) {
+		make_random_file ("build/test/random.dat", std::max(1, rand() % (256 * 1024 * 1024)));
+
+		progress_values.clear ();
+		copy_in_bits ("build/test/random.dat", "build/test/random.dat2", boost::bind(&progress, _1));
+		BOOST_CHECK (!progress_values.empty());
+
+		check_file ("build/test/random.dat", "build/test/random.dat2");
+	}
 }