projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 1.0
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index 1d8041656cf05e2acaf76081e327c00f7621661b..4466b74cb32d77212766b84302df0e4a03456daf 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-47,7
+47,7
@@
using std::cerr;
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
-boost::filesystem::path private_data = boost::filesystem::path ("
test") / boost::filesystem::path ("
private");
+boost::filesystem::path private_data = boost::filesystem::path ("
..") / boost::filesystem::path ("dcpomatic-test-
private");
class TestUISignaller : public UISignaller
{
class TestUISignaller : public UISignaller
{
@@
-113,7
+113,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
{
uintmax_t N = boost::filesystem::file_size (ref);
BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
{
uintmax_t N = boost::filesystem::file_size (ref);
BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
- FILE* ref_file = fopen
(ref.c_str()
, "rb");
+ FILE* ref_file = fopen
_boost (ref
, "rb");
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
BOOST_CHECK (ref_file);
FILE* check_file = fopen_boost (check, "rb");
BOOST_CHECK (check_file);
@@
-143,7
+143,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
static void
note (dcp::NoteType t, string n)
{
static void
note (dcp::NoteType t, string n)
{
- if (t == dcp::ERROR) {
+ if (t == dcp::
DCP_
ERROR) {
cerr << n << "\n";
}
}
cerr << n << "\n";
}
}
@@
-182,7
+182,7
@@
check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
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 ();
- while (k != ref_children.end ()) {
+ while (k != ref_children.end ()
&& l != test_children.end ()
) {
/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
@@
-211,6
+211,9
@@
check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
++k;
++l;
}
++k;
++l;
}
+
+ BOOST_CHECK (k == ref_children.end ());
+ BOOST_CHECK (l == test_children.end ());
}
void
}
void