From cf3faf1b42037b8c545926a4949e206ae01ee682 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 5 Dec 2014 18:17:21 +0100 Subject: fix "expected" <> "actual" semantics in test-util --- libs/ardour/test/test_util.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/ardour/test') diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc index 2bb2db5ade..d60ee569e1 100644 --- 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 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()) { - CPPUNIT_ASSERT_EQUAL (p->name(), q->name()); + CPPUNIT_ASSERT_EQUAL (q->name(), p->name()); } 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 (); - CPPUNIT_ASSERT_EQUAL (pp.size(), qp.size()); + CPPUNIT_ASSERT_EQUAL (qp.size(), pp.size()); 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 ()) { - CPPUNIT_ASSERT_EQUAL_MESSAGE ((*i)->name(), (*i)->value(), (*j)->value()); + CPPUNIT_ASSERT_EQUAL_MESSAGE ((*j)->name(), (*i)->value(), (*i)->value()); } ++i; ++j; @@ -65,7 +65,7 @@ check_nodes (XMLNode const * p, XMLNode const * q, list const & ignore_p XMLNodeList const & pc = p->children (); XMLNodeList const & qc = q->children (); - CPPUNIT_ASSERT_EQUAL (pc.size(), qc.size()); + CPPUNIT_ASSERT_EQUAL (qc.size(), pc.size()); XMLNodeList::const_iterator k = pc.begin (); XMLNodeList::const_iterator l = qc.begin (); -- cgit v1.2.3