X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fjob_test.cc;h=7fb240843b884a9ebfa324cb464485cc5db3994d;hb=5e74e417e8b3d4e9773d0fad97cf11a5c4eeeccf;hp=fa48904703b8ced194cc34a11c42f70039b66694;hpb=c6871fe8617b3de03662b7630355059393bf8043;p=dcpomatic.git

diff --git a/test/job_test.cc b/test/job_test.cc
index fa4890470..7fb240843 100644
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,18 +18,23 @@
 
 */
 
+
 /** @file  test/job_test.cc
  *  @brief Test Job and JobManager.
  *  @ingroup selfcontained
  */
 
-#include <boost/test/unit_test.hpp>
+
+#include "lib/cross.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
-#include "lib/cross.h"
+#include <boost/test/unit_test.hpp>
 
+
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
-using boost::shared_ptr;
+
 
 class TestJob : public Job
 {
@@ -40,6 +45,11 @@ public:
 
 	}
 
+	~TestJob ()
+	{
+		stop_thread ();
+	}
+
 	void set_finished_ok () {
 		set_state (FINISHED_OK);
 	}
@@ -66,17 +76,18 @@ public:
 	}
 };
 
+
 BOOST_AUTO_TEST_CASE (job_manager_test)
 {
 	shared_ptr<Film> film;
 
 	/* Single job */
-	shared_ptr<TestJob> a (new TestJob (film));
+	auto a = make_shared<TestJob>(film);
 
 	JobManager::instance()->add (a);
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 	BOOST_CHECK_EQUAL (a->running (), true);
 	a->set_finished_ok ();
-	dcpomatic_sleep (2);
+	dcpomatic_sleep_seconds (2);
 	BOOST_CHECK_EQUAL (a->finished_ok(), true);
 }