X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwriter_test.cc;h=86b60818f18f31fbf3361b8e215877bc104dd869;hb=HEAD;hp=d5cafe1fbfd33aa25f517910e02d50327a2d194f;hpb=b1e22dff981fb86ae04b12bb5a064e61030793a8;p=dcpomatic.git

diff --git a/test/writer_test.cc b/test/writer_test.cc
index d5cafe1fb..86b60818f 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -23,6 +23,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
+#include "lib/dcp_encoder.h"
 #include "lib/film.h"
 #include "lib/job.h"
 #include "lib/video_content.h"
@@ -36,6 +37,7 @@
 
 using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using std::vector;
 
 
@@ -71,7 +73,7 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 	auto image = make_shared<dcp::OpenJPEGImage>(size);
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < (size.width * size.height); ++j) {
-			image->data(i)[j] = rand();
+			image->data(i)[j] = rand() % 4095;
 		}
 	}
 
@@ -103,61 +105,51 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 }
 
 
-BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids1)
+BOOST_AUTO_TEST_CASE(writer_progress_test)
 {
-	auto film = new_test_film2("writer_disambiguate_font_ids1", {});
-	Writer writer(film, {});
-
-	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
-		make_shared<dcpomatic::Font>("a"),
-		make_shared<dcpomatic::Font>("b"),
-		make_shared<dcpomatic::Font>("c")
-	};
-
-	writer.write(fonts);
-
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "b");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "c");
-}
-
-
-BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids2)
-{
-	auto film = new_test_film2("writer_disambiguate_font_ids2", {});
-	Writer writer(film, {});
-
-	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
-		make_shared<dcpomatic::Font>("a"),
-		make_shared<dcpomatic::Font>("a"),
-		make_shared<dcpomatic::Font>("a")
-	};
-
-	writer.write(fonts);
-
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_0");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_1");
-}
-
+	class TestJob : public Job
+	{
+	public:
+		explicit TestJob(shared_ptr<const Film> film)
+			: Job(film)
+		{}
+
+		~TestJob()
+		{
+			stop_thread();
+		}
 
-BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids3)
-{
-	auto film = new_test_film2("writer_disambiguate_font_ids3", {});
-	Writer writer(film, {});
-
-	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
-		make_shared<dcpomatic::Font>("a_2"),
-		make_shared<dcpomatic::Font>("a_1"),
-		make_shared<dcpomatic::Font>("a_1"),
-		make_shared<dcpomatic::Font>("b")
+		std::string name() const override {
+			return "test";
+		}
+		std::string json_name() const override {
+			return "test";
+		}
+		void run() override {};
 	};
 
-	writer.write(fonts);
+	auto picture1 = content_factory("test/data/flat_red.png")[0];
+	auto picture2 = content_factory("test/data/flat_red.png")[0];
+
+	auto film = new_test_film2("writer_progress_test", { picture1, picture2 });
+	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	picture1->video->set_length(240);
+	picture2->video->set_length(240);
+	picture2->set_position(film, dcpomatic::DCPTime::from_seconds(10));
+
+	auto job = std::make_shared<TestJob>(film);
+	job->set_rate_limit_progress(false);
+
+	float last_progress = 0;
+	string last_sub_name;
+	boost::signals2::scoped_connection connection = job->Progress.connect([job, &last_progress, &last_sub_name]() {
+		auto const progress = job->progress().get_value_or(0);
+		BOOST_REQUIRE(job->sub_name() != last_sub_name || progress >= last_progress);
+		last_progress = progress;
+		last_sub_name = job->sub_name();
+	});
 
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_1");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a_2");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_3");
-	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[3]), "b");
+	DCPEncoder encoder(film, job);
+	encoder.go();
 }