X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=9b2fa989c7b08ebb3657f65c48465a06374a363c;hb=81e40e7b915a55f8e5aa2db34ad809552b1534e3;hp=d8cb61fdc30677d2208e52ca232554f60bd1762b;hpb=95f4db0a8bb5bbf742a0195fbbe17d304fb99507;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index d8cb61fdc..9b2fa989c 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,11 +26,14 @@
 #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;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
@@ -119,3 +122,33 @@ 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");
+	}
+}