projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4bc4cd0
)
fix "expected" <> "actual" semantics in test-util
author
Robin Gareus
<robin@gareus.org>
Fri, 5 Dec 2014 17:17:21 +0000
(18:17 +0100)
committer
Robin Gareus
<robin@gareus.org>
Fri, 5 Dec 2014 17:32:16 +0000
(18:32 +0100)
libs/ardour/test/test_util.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/test/test_util.cc
b/libs/ardour/test/test_util.cc
index 2bb2db5adef2e13ea83c8ca09223d345e43ff3a5..d60ee569e13b70c59c7d10fee7676c0237444ffe 100644
(file)
--- a/
libs/ardour/test/test_util.cc
+++ b/
libs/ardour/test/test_util.cc
@@
-40,23
+40,23
@@
using namespace PBD;
static void
check_nodes (XMLNode const * p, XMLNode const * q, list<string> const & ignore_properties)
{
static void
check_nodes (XMLNode const * p, XMLNode const * q, list<string> const & ignore_properties)
{
- CPPUNIT_ASSERT_EQUAL (
p->is_content(), q
->is_content());
+ CPPUNIT_ASSERT_EQUAL (
q->is_content(), p
->is_content());
if (!p->is_content()) {
if (!p->is_content()) {
- CPPUNIT_ASSERT_EQUAL (
p->name(), q
->name());
+ CPPUNIT_ASSERT_EQUAL (
q->name(), p
->name());
} else {
} else {
- CPPUNIT_ASSERT_EQUAL (
p->content(), q
->content());
+ CPPUNIT_ASSERT_EQUAL (
q->content(), p
->content());
}
XMLPropertyList const & pp = p->properties ();
XMLPropertyList const & qp = q->properties ();
}
XMLPropertyList const & pp = p->properties ();
XMLPropertyList const & qp = q->properties ();
- CPPUNIT_ASSERT_EQUAL (
pp.size(), q
p.size());
+ CPPUNIT_ASSERT_EQUAL (
qp.size(), p
p.size());
XMLPropertyList::const_iterator i = pp.begin ();
XMLPropertyList::const_iterator j = qp.begin ();
while (i != pp.end ()) {
XMLPropertyList::const_iterator i = pp.begin ();
XMLPropertyList::const_iterator j = qp.begin ();
while (i != pp.end ()) {
- CPPUNIT_ASSERT_EQUAL ((*
i)->name(), (*j
)->name());
+ CPPUNIT_ASSERT_EQUAL ((*
j)->name(), (*i
)->name());
if (find (ignore_properties.begin(), ignore_properties.end(), (*i)->name ()) == ignore_properties.end ()) {
if (find (ignore_properties.begin(), ignore_properties.end(), (*i)->name ()) == ignore_properties.end ()) {
- CPPUNIT_ASSERT_EQUAL_MESSAGE ((*
i)->name(), (*i)->value(), (*j
)->value());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE ((*
j)->name(), (*i)->value(), (*i
)->value());
}
++i;
++j;
}
++i;
++j;
@@
-65,7
+65,7
@@
check_nodes (XMLNode const * p, XMLNode const * q, list<string> const & ignore_p
XMLNodeList const & pc = p->children ();
XMLNodeList const & qc = q->children ();
XMLNodeList const & pc = p->children ();
XMLNodeList const & qc = q->children ();
- CPPUNIT_ASSERT_EQUAL (
pc.size(), q
c.size());
+ CPPUNIT_ASSERT_EQUAL (
qc.size(), p
c.size());
XMLNodeList::const_iterator k = pc.begin ();
XMLNodeList::const_iterator l = qc.begin ();
XMLNodeList::const_iterator k = pc.begin ();
XMLNodeList::const_iterator l = qc.begin ();