X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=f05c7ad83fa0483b57f250be68a512389bd090ad;hb=e193babcec6a26bc1ee83d99d009bd5a3751a5bc;hp=5aed18c523043512729a14533c85fbb9ccc56350;hpb=4488ca79635bda37e034b888d1c43618f5e4285e;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 5aed18c52..f05c7ad83 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -37,12 +37,17 @@
 #include "cross.h"
 #include "job.h"
 #include "subtitle.h"
+#include "scaler.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dvdomatic_test
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::stringstream;
+using std::vector;
+using boost::shared_ptr;
+using boost::thread;
 
 void
 setup_test_config ()
@@ -54,61 +59,73 @@ setup_test_config ()
 	Config::instance()->set_server_port (61920);
 }
 
+shared_ptr<Film>
+new_test_film (string name)
+{
+	string const d = String::compose ("build/test/%1", name);
+	if (boost::filesystem::exists (d)) {
+		boost::filesystem::remove_all (d);
+	}
+	return shared_ptr<Film> (new Film (d, false));
+}
+
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
 	dvdomatic_setup ();
 	setup_test_config ();
-	
-	string const test_film = "build/test/film";
+
+	string const test_film = "build/test/film_metadata_test";
 	
 	if (boost::filesystem::exists (test_film)) {
 		boost::filesystem::remove_all (test_film);
 	}
 
-	BOOST_CHECK_THROW (new Film ("build/test/film", true), OpenFileError);
+	BOOST_CHECK_THROW (new Film (test_film, true), OpenFileError);
 	
-	Film f (test_film, false);
-	BOOST_CHECK (f.format() == 0);
-	BOOST_CHECK (f.dcp_content_type() == 0);
-	BOOST_CHECK (f.filters ().empty());
-
-	f.set_name ("fred");
-	BOOST_CHECK_THROW (f.set_content ("jim"), OpenFileError);
-	f.set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f.set_format (Format::from_nickname ("Flat"));
-	f.set_left_crop (1);
-	f.set_right_crop (2);
-	f.set_top_crop (3);
-	f.set_bottom_crop (4);
+	shared_ptr<Film> f (new Film (test_film, false));
+	BOOST_CHECK (f->format() == 0);
+	BOOST_CHECK (f->dcp_content_type() == 0);
+	BOOST_CHECK (f->filters ().empty());
+
+	f->set_name ("fred");
+	BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError);
+	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+	f->set_format (Format::from_nickname ("Flat"));
+	f->set_left_crop (1);
+	f->set_right_crop (2);
+	f->set_top_crop (3);
+	f->set_bottom_crop (4);
 	vector<Filter const *> f_filters;
 	f_filters.push_back (Filter::from_id ("pphb"));
 	f_filters.push_back (Filter::from_id ("unsharp"));
-	f.set_filters (f_filters);
-	f.set_dcp_frames (42);
-	f.set_dcp_ab (true);
-	f.write_metadata ();
+	f->set_filters (f_filters);
+	f->set_dcp_trim_start (42);
+	f->set_dcp_trim_start (99);
+	f->set_dcp_ab (true);
+	f->write_metadata ();
 
 	stringstream s;
 	s << "diff -u test/metadata.ref " << test_film << "/metadata";
 	BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
 
-	Film g (test_film, true);
+	shared_ptr<Film> g (new Film (test_film, true));
 
-	BOOST_CHECK_EQUAL (g.name(), "fred");
-	BOOST_CHECK_EQUAL (g.dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
-	BOOST_CHECK_EQUAL (g.format(), Format::from_nickname ("Flat"));
-	BOOST_CHECK_EQUAL (g.crop().left, 1);
-	BOOST_CHECK_EQUAL (g.crop().right, 2);
-	BOOST_CHECK_EQUAL (g.crop().top, 3);
-	BOOST_CHECK_EQUAL (g.crop().bottom, 4);
-	vector<Filter const *> g_filters = g.filters ();
+	BOOST_CHECK_EQUAL (g->name(), "fred");
+	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
+	BOOST_CHECK_EQUAL (g->format(), Format::from_nickname ("Flat"));
+	BOOST_CHECK_EQUAL (g->crop().left, 1);
+	BOOST_CHECK_EQUAL (g->crop().right, 2);
+	BOOST_CHECK_EQUAL (g->crop().top, 3);
+	BOOST_CHECK_EQUAL (g->crop().bottom, 4);
+	vector<Filter const *> g_filters = g->filters ();
 	BOOST_CHECK_EQUAL (g_filters.size(), 2);
 	BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb"));
 	BOOST_CHECK_EQUAL (g_filters.back(), Filter::from_id ("unsharp"));
-	BOOST_CHECK_EQUAL (g.dcp_frames(), 42);
-	BOOST_CHECK_EQUAL (g.dcp_ab(), true);
+	BOOST_CHECK_EQUAL (g->dcp_trim_start(), 42);
+	BOOST_CHECK_EQUAL (g->dcp_trim_end(), 99);
+	BOOST_CHECK_EQUAL (g->dcp_ab(), true);
 	
-	g.write_metadata ();
+	g->write_metadata ();
 	BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
 }
 
@@ -118,11 +135,11 @@ BOOST_AUTO_TEST_CASE (format_test)
 	
 	Format const * f = Format::from_nickname ("Flat");
 	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->ratio_as_integer(0), 185);
+	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 185);
 	
 	f = Format::from_nickname ("Scope");
 	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->ratio_as_integer(0), 239);
+	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 239);
 }
 
 BOOST_AUTO_TEST_CASE (util_test)
@@ -257,17 +274,17 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
 
 BOOST_AUTO_TEST_CASE (paths_test)
 {
-	FilmState s;
-	s.set_directory ("build/test/a/b/c/d/e");
+	shared_ptr<Film> f = new_test_film ("paths_test");
+	f->set_directory ("build/test/a/b/c/d/e");
 	vector<int> thumbs;
 	thumbs.push_back (42);
-	s.set_thumbs (thumbs);
-	BOOST_CHECK_EQUAL (s.thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.png");
+	f->set_thumbs (thumbs);
+	BOOST_CHECK_EQUAL (f->thumb_file (0), "build/test/a/b/c/d/e/thumbs/00000042.png");
 
-	s._content = "/foo/bar/baz";
-	BOOST_CHECK_EQUAL (s.content_path(), "/foo/bar/baz");
-	s._content = "foo/bar/baz";
-	BOOST_CHECK_EQUAL (s.content_path(), "build/test/a/b/c/d/e/foo/bar/baz");
+	f->_content = "/foo/bar/baz";
+	BOOST_CHECK_EQUAL (f->content_path(), "/foo/bar/baz");
+	f->_content = "foo/bar/baz";
+	BOOST_CHECK_EQUAL (f->content_path(), "build/test/a/b/c/d/e/foo/bar/baz");
 }
 
 void
@@ -355,19 +372,12 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 
 BOOST_AUTO_TEST_CASE (make_dcp_test)
 {
-	string const test_film = "build/test/film2";
-	
-	if (boost::filesystem::exists (test_film)) {
-		boost::filesystem::remove_all (test_film);
-	}
-	
-	Film film (test_film, false);
-	film.set_name ("test_film");
-	film.set_content ("../../../test/test.mp4");
-	film.examine_content ();
-	film.set_format (Format::from_nickname ("Flat"));
-	film.set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film.make_dcp (true);
+	shared_ptr<Film> film = new_test_film ("make_dcp_test");
+	film->set_name ("test_film2");
+	film->set_content ("../../../test/test.mp4");
+	film->set_format (Format::from_nickname ("Flat"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->make_dcp (true);
 
 	while (JobManager::instance()->work_to_do ()) {
 		dvdomatic_sleep (1);
@@ -378,20 +388,14 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 
 BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 {
-	string const test_film = "build/test/film3";
-	
-	if (boost::filesystem::exists (test_film)) {
-		boost::filesystem::remove_all (test_film);
-	}
-	
-	Film film (test_film, false);
-	film.set_name ("test_film");
-	film.set_content ("../../../test/test.mp4");
-	film.examine_content ();
-	film.set_format (Format::from_nickname ("Flat"));
-	film.set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film.set_dcp_frames (42);
-	film.make_dcp (true);
+	shared_ptr<Film> film = new_test_film ("make_dcp_with_range_test");
+	film->set_name ("test_film3");
+	film->set_content ("../../../test/test.mp4");
+	film->examine_content ();
+	film->set_format (Format::from_nickname ("Flat"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_trim_end (42);
+	film->make_dcp (true);
 
 	while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
 		dvdomatic_sleep (1);
@@ -402,32 +406,32 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 
 BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
-	FilmState fs;
-	fs.set_frames_per_second (24);
+	shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test");
+	f->set_frames_per_second (24);
 
-	fs.set_audio_sample_rate (48000);
-	BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000);
+	f->set_audio_sample_rate (48000);
+	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
-	fs.set_audio_sample_rate (44100);
-	BOOST_CHECK_EQUAL (fs.target_sample_rate(), 48000);
+	f->set_audio_sample_rate (44100);
+	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
-	fs.set_audio_sample_rate (80000);
-	BOOST_CHECK_EQUAL (fs.target_sample_rate(), 96000);
+	f->set_audio_sample_rate (80000);
+	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
 
-	fs.set_frames_per_second (23.976);
-	fs.set_audio_sample_rate (48000);
-	BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952);
+	f->set_frames_per_second (23.976);
+	f->set_audio_sample_rate (48000);
+	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
-	fs.set_frames_per_second (29.97);
-	fs.set_audio_sample_rate (48000);
-	BOOST_CHECK_EQUAL (fs.target_sample_rate(), 47952);
+	f->set_frames_per_second (29.97);
+	f->set_audio_sample_rate (48000);
+	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 }
 
 class TestJob : public Job
 {
 public:
-	TestJob (shared_ptr<const FilmState> s, Log* l, shared_ptr<Job> req)
-		: Job (s, l, req)
+	TestJob (shared_ptr<Film> f, shared_ptr<Job> req)
+		: Job (f, req)
 	{
 
 	}
@@ -456,11 +460,10 @@ public:
 
 BOOST_AUTO_TEST_CASE (job_manager_test)
 {
-	shared_ptr<const FilmState> s;
-	FileLog log ("build/test/job_manager_test.log");
+	shared_ptr<Film> f;
 
 	/* Single job, no dependency */
-	shared_ptr<TestJob> a (new TestJob (s, &log, shared_ptr<Job> ()));
+	shared_ptr<TestJob> a (new TestJob (f, shared_ptr<Job> ()));
 
 	JobManager::instance()->add (a);
 	dvdomatic_sleep (1);
@@ -470,8 +473,8 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
 	BOOST_CHECK_EQUAL (a->finished_ok(), true);
 
 	/* Two jobs, dependency */
-	a.reset (new TestJob (s, &log, shared_ptr<Job> ()));
-	shared_ptr<TestJob> b (new TestJob (s, &log, a));
+	a.reset (new TestJob (f, shared_ptr<Job> ()));
+	shared_ptr<TestJob> b (new TestJob (f, a));
 
 	JobManager::instance()->add (a);
 	JobManager::instance()->add (b);
@@ -487,8 +490,8 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
 	BOOST_CHECK_EQUAL (b->finished_ok(), true);
 
 	/* Two jobs, dependency, first fails */
-	a.reset (new TestJob (s, &log, shared_ptr<Job> ()));
-	b.reset (new TestJob (s, &log, a));
+	a.reset (new TestJob (f, shared_ptr<Job> ()));
+	b.reset (new TestJob (f, a));
 
 	JobManager::instance()->add (a);
 	JobManager::instance()->add (b);