Fix typos in operator=

[dcpomatic.git] / test / test.h

diff --git a/test/test.h b/test/test.h
index 44ca706f69ca560d3e55d0f7260678ffc303b22c..5a2246894992da9cfa71d0f6b9e575a24f8b8969 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,7 @@
 
 
 #include "lib/warnings.h"
+#include "lib/types.h"
 #include <boost/filesystem.hpp>
 
 
@@ -35,10 +36,27 @@ public:
        static boost::filesystem::path xsd();
 };
 
+
+class Cleanup
+{
+public:
+       void add (boost::filesystem::path path);
+
+       /* Remove everything passed to add().  We don't do this
+        * in a destructor so that results of failed tests aren't
+        * deleted.
+        */
+       void run ();
+
+private:
+       std::vector<boost::filesystem::path> _paths;
+};
+
+
 extern bool wait_for_jobs ();
 extern void setup_test_config ();
 extern std::shared_ptr<Film> new_test_film (std::string);
-extern std::shared_ptr<Film> new_test_film2 (std::string);
+extern std::shared_ptr<Film> new_test_film2 (std::string, Cleanup* cleanup = nullptr);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
 extern void check_dcp (boost::filesystem::path, std::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
@@ -56,6 +74,7 @@ void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesys
 extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
 
+
 class LogSwitcher
 {
 public:
@@ -66,3 +85,12 @@ private:
        std::shared_ptr<Log> _old;
 };
 
+
+namespace dcp {
+
+std::ostream& operator<< (std::ostream& s, dcp::Size i);
+std::ostream& operator<< (std::ostream& s, dcp::Standard t);
+
+}
+
+std::ostream& operator<< (std::ostream& s, VideoFrameType f);