X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=1c1091f28fb0e8d983ef7984b874cdeb9c899237;hb=f37e6b5a0f320d4352b87b97f78afae762512b93;hp=ba33b42c50ae9152cd53ad88c811dd39a19d6b47;hpb=9da0bac018e0e7dcad0c1aafaa7f6be6d434da96;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index ba33b42c5..1c1091f28 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-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,12 +26,16 @@
 #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.hpp>
 
 using std::string;
 using std::vector;
+using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
@@ -92,6 +96,13 @@ 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);
+}
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 BOOST_AUTO_TEST_CASE (swaroop_chain_test)
 {
@@ -111,5 +122,34 @@ BOOST_AUTO_TEST_CASE (swaroop_chain_test)
 
 	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_à"));
+}
+
+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", 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");
+	}
+}