More logging and make it go to the right place.

[dcpomatic.git] / test / test.h

diff --git a/test/test.h b/test/test.h
index 3a11effa101b1628efc1022012d9ff944b1bb265..dd919b4087da3bcdaa6a42c9cf05493d11b19c04 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -20,17 +20,26 @@
 
 #include <Magick++.h>
 #include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
 
 class Film;
 class Image;
+class Log;
 
-extern boost::filesystem::path private_data;
+
+class TestPaths
+{
+public:
+       static boost::filesystem::path private_data;
+       static boost::filesystem::path xsd;
+};
 
 extern bool wait_for_jobs ();
 extern void setup_test_config ();
 extern boost::shared_ptr<Film> new_test_film (std::string);
 extern boost::shared_ptr<Film> new_test_film2 (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
+extern void check_dcp (boost::filesystem::path, boost::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
@@ -44,3 +53,14 @@ boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::strin
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
 extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
+
+class LogSwitcher
+{
+public:
+       LogSwitcher (boost::shared_ptr<Log> log);
+       ~LogSwitcher ();
+
+private:
+       boost::shared_ptr<Log> _old;
+};
+