Merge master and multifarious hackery.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 91c876412f74b15af3f6f37eea5fc932cb7d1293..cbbd0443dc8eae7df4a64b4194bf843a1f7fdc5e 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -39,9 +39,10 @@
 #include "scaler.h"
 #include "ffmpeg_decoder.h"
 #include "sndfile_decoder.h"
-#include "trimmer.h"
+#include "dcp_content_type.h"
+#include "container.h"
 #define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE dvdomatic_test
+#define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
 
 using std::string;
@@ -56,7 +57,7 @@ struct TestConfig
 {
        TestConfig()
        {
-               dvdomatic_setup();
+               dcpomatic_setup();
 
                Config::instance()->set_num_local_encoding_threads (1);
                Config::instance()->set_servers (vector<ServerDescription*> ());
@@ -85,17 +86,17 @@ new_test_film (string name)
                boost::filesystem::remove_all (p);
        }
        
-       return shared_ptr<Film> (new Film (p.string(), false));
+       shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
+       f->write_metadata ();
+       return f;
 }
 
 #include "pixel_formats_test.cc"
 #include "make_black_test.cc"
-#include "trimmer_test.cc"
 #include "film_metadata_test.cc"
 #include "stream_test.cc"
 #include "format_test.cc"
 #include "util_test.cc"
-#include "film_test.cc"
 #include "dcp_test.cc"
 #include "frame_rate_test.cc"
 #include "job_test.cc"