X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.h;h=2b01db294286743dbca0a2631ff72c6f8174be5a;hp=8ccebb5feb8c5bed0f56ce3c6d539e0b23ead499;hb=e1555a8837da05f135a3705112469206fc17ec80;hpb=5ff6b15ef3c58a046fb9eec0273c5e7322988a14

diff --git a/test/test.h b/test/test.h
index 8ccebb5fe..2b01db294 100644
--- 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.
 
@@ -18,35 +18,90 @@
 
 */
 
-#include <Magick++.h>
+
+#include "lib/warnings.h"
+#include "lib/types.h"
+#include <dcp/verify.h>
 #include <boost/filesystem.hpp>
+#include <vector>
+
 
 class Film;
 class Image;
+class Log;
 
 
 class TestPaths
 {
 public:
-	static boost::filesystem::path private_data;
-	static boost::filesystem::path xsd;
+	static boost::filesystem::path private_data();
+	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 boost::shared_ptr<Film> new_test_film (std::string);
-extern boost::shared_ptr<Film> new_test_film2 (std::string);
+extern std::shared_ptr<Film> new_test_film (std::string);
+extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, 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);
+extern void check_text_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);
+extern bool mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose = false);
 extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::list<std::string>);
-extern void check_file (boost::filesystem::path, boost::filesystem::path);
 extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
-extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 0.01);
+extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
-extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format, MagickCore::StorageType pixel_type = MagickCore::CharPixel);
-boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix);
+extern void write_image (std::shared_ptr<const Image> image, boost::filesystem::path file);
+boost::filesystem::path dcp_file (std::shared_ptr<const Film> film, std::string prefix);
 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 boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
+extern void make_and_verify_dcp (std::shared_ptr<Film> film, std::vector<dcp::VerificationNote::Code> ignore = {});
+extern void check_int_close (int a, int b, int d);
+extern void check_int_close (std::pair<int, int>, std::pair<int, int>, int d);
+
+
+class LogSwitcher
+{
+public:
+	LogSwitcher (std::shared_ptr<Log> log);
+	~LogSwitcher ();
+
+private:
+	std::shared_ptr<Log> _old;
+};
+
+
+class ConfigRestorer
+{
+public:
+	~ConfigRestorer();
+};
+
+
+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);