projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do less logging during tests, but also log some details of what test is
[dcpomatic.git]
/
test
/
job_test.cc
diff --git
a/test/job_test.cc
b/test/job_test.cc
index 97a23b946a765eb7c758c41678960d3f0d69ea81..c834ec12e4cdbcc1755cafc66384a60c0de8b75f 100644
(file)
--- a/
test/job_test.cc
+++ b/
test/job_test.cc
@@
-1,24
+1,26
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
/** @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 <boost/test/unit_test.hpp>
@@
-27,17
+29,22
@@
#include "lib/cross.h"
using std::string;
#include "lib/cross.h"
using std::string;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
class TestJob : public Job
{
public:
class TestJob : public Job
{
public:
-
TestJob (shared_ptr<Film> f
)
- : Job (f)
+
explicit TestJob (shared_ptr<Film> film
)
+ : Job (f
ilm
)
{
}
{
}
+ ~TestJob ()
+ {
+ stop_thread ();
+ }
+
void set_finished_ok () {
set_state (FINISHED_OK);
}
void set_finished_ok () {
set_state (FINISHED_OK);
}
@@
-58,19
+65,23
@@
public:
string name () const {
return "";
}
string name () const {
return "";
}
+
+ string json_name () const {
+ return "";
+ }
};
BOOST_AUTO_TEST_CASE (job_manager_test)
{
};
BOOST_AUTO_TEST_CASE (job_manager_test)
{
- shared_ptr<Film> f;
+ shared_ptr<Film> f
ilm
;
/* Single job */
/* Single job */
- shared_ptr<TestJob> a (new TestJob (f));
+ shared_ptr<TestJob> a (new TestJob (f
ilm
));
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);
}