Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / job_test.cc

diff --git a/test/job_test.cc b/test/job_test.cc
index 247d4f75665895d09f243cd7c6c76a73d6ed848b..c1b66d4e01f38f36127c49087c79473cbdb20739 100644 (file)
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,18 @@
 
 */
 
+/** @file  test/job_test.cc
+ *  @brief Basic tests of Job and JobManager.
+ */
+
+#include <boost/test/unit_test.hpp>
+#include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/cross.h"
+
+using std::string;
+using boost::shared_ptr;
+
 class TestJob : public Job
 {
 public:
@@ -36,7 +48,7 @@ public:
 
        void run ()
        {
-               while (1) {
+               while (true) {
                        if (finished ()) {
                                return;
                        }
@@ -46,6 +58,10 @@ public:
        string name () const {
                return "";
        }
+
+       string json_name () const {
+               return "";
+       }
 };
 
 BOOST_AUTO_TEST_CASE (job_manager_test)
@@ -56,9 +72,9 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
        shared_ptr<TestJob> a (new TestJob (f));
 
        JobManager::instance()->add (a);
-       dvdomatic_sleep (1);
+       dcpomatic_sleep (1);
        BOOST_CHECK_EQUAL (a->running (), true);
        a->set_finished_ok ();
-       dvdomatic_sleep (2);
+       dcpomatic_sleep (2);
        BOOST_CHECK_EQUAL (a->finished_ok(), true);
 }