projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly better test report.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index d3180434d082307896f4c0e201d3eaa9336fdd64..3858dff11af091cc248d09eeb82a28dd3661e23d 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-40,7
+40,6
@@
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE dcpomatic_test
#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
#include <list>
#include <vector>
#include <iostream>
#include <list>
#include <vector>
#include <iostream>
@@
-54,7
+53,6
@@
using std::list;
using std::abs;
using boost::shared_ptr;
using boost::scoped_array;
using std::abs;
using boost::shared_ptr;
using boost::scoped_array;
-using boost::make_shared;
boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
@@
-81,9
+79,10
@@
struct TestConfig
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
Config::instance()->set_default_audio_delay (0);
Config::instance()->set_default_j2k_bandwidth (100000000);
+ Config::instance()->set_default_interop (false);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
- EncodeServerFinder::instance()->
disable
();
+ EncodeServerFinder::instance()->
stop
();
signal_manager = new TestSignalManager ();
}
signal_manager = new TestSignalManager ();
}
@@
-114,7
+113,7
@@
new_test_film (string name)
boost::filesystem::remove_all (p);
}
boost::filesystem::remove_all (p);
}
- shared_ptr<Film> film =
boost::make_shared<Film> (p.string(
));
+ shared_ptr<Film> film =
shared_ptr<Film> (new Film (p
));
film->write_metadata ();
return film;
}
film->write_metadata ();
return film;
}
@@
-176,8
+175,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- SafeStringStream error;
- error << "File " << check.string() << " differs from reference " << ref.string();
+ string error = "File " + check.string() + " differs from reference " + ref.string();
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
@@
-186,7
+184,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
- BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error
.str ()
);
+ BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
@@
-241,7
+239,10
@@
check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
xmlpp::Element::NodeList ref_children = ref->get_children ();
xmlpp::Element::NodeList test_children = test->get_children ();
xmlpp::Element::NodeList ref_children = ref->get_children ();
xmlpp::Element::NodeList test_children = test->get_children ();
- BOOST_CHECK_EQUAL (ref_children.size (), test_children.size ());
+ BOOST_CHECK_MESSAGE (
+ ref_children.size() == test_children.size(),
+ ref->get_name() << " has " << ref_children.size() << " or " << test_children.size() << " children"
+ );
xmlpp::Element::NodeList::iterator k = ref_children.begin ();
xmlpp::Element::NodeList::iterator l = test_children.begin ();
xmlpp::Element::NodeList::iterator k = ref_children.begin ();
xmlpp::Element::NodeList::iterator l = test_children.begin ();
@@
-293,7
+294,7
@@
check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
check_xml (ref_root, test_root, ignore);
}
check_xml (ref_root, test_root, ignore);
}
-void
+bool
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
@@
-324,7
+325,10
@@
wait_for_jobs ()
if (jm->errors ()) {
JobManager::drop ();
if (jm->errors ()) {
JobManager::drop ();
+ return true;
}
}
+
+ return false;
}
void
}
void