projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
test
/
job_test.cc
diff --git
a/test/job_test.cc
b/test/job_test.cc
index 8728b7312137bbbdde15dcb56c2879303c0f93db..7fb240843b884a9ebfa324cb464485cc5db3994d 100644
(file)
--- a/
test/job_test.cc
+++ b/
test/job_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,27
+18,38
@@
*/
*/
+
/** @file test/job_test.cc
/** @file test/job_test.cc
- * @brief Basic tests of Job and JobManager.
+ * @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/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 std::string;
-using boost::shared_ptr;
+
class TestJob : public Job
{
public:
class TestJob : public Job
{
public:
- TestJob (shared_ptr<Film> film)
+
explicit
TestJob (shared_ptr<Film> film)
: Job (film)
{
}
: Job (film)
{
}
+ ~TestJob ()
+ {
+ stop_thread ();
+ }
+
void set_finished_ok () {
set_state (FINISHED_OK);
}
void set_finished_ok () {
set_state (FINISHED_OK);
}
@@
-65,17
+76,18
@@
public:
}
};
}
};
+
BOOST_AUTO_TEST_CASE (job_manager_test)
{
shared_ptr<Film> film;
/* Single job */
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);
JobManager::instance()->add (a);
- dcpomatic_sleep (1);
+ dcpomatic_sleep
_seconds
(1);
BOOST_CHECK_EQUAL (a->running (), true);
a->set_finished_ok ();
BOOST_CHECK_EQUAL (a->running (), true);
a->set_finished_ok ();
- dcpomatic_sleep (2);
+ dcpomatic_sleep
_seconds
(2);
BOOST_CHECK_EQUAL (a->finished_ok(), true);
}
BOOST_CHECK_EQUAL (a->finished_ok(), true);
}