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

diff --git a/test/util_test.cc b/test/util_test.cc
index 709bb0827..c1d11b761 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,18 @@
 #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;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
@@ -95,9 +101,9 @@ BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 
 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
@@ -129,3 +135,24 @@ 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_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");
+	}
+}