mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xml diff - report what attribute values actually differ

Browse Source 
Change-Id: I16bc122e3f2cce94a5eb8454b528bf484210a4ae
Reviewed-on: https://gerrit.libreoffice.org/53369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2018-04-23 21:50:52 +09:00
committed by Tomaž Vajngerl
parent 4fb0817048
commit 8ecf34e823
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/source/diff/diff.cxx
View File

@@ -357,8 +357,36 @@ bool XMLDiff::compareAttributes(xmlNodePtr node1, xmlNodePtr node2)
// unequal number of attributes // unequal number of attributes
#ifdef CPPUNIT_ASSERT #ifdef CPPUNIT_ASSERT
CPPUNIT_ASSERT(!attr1); std::stringstream failStream("Unequal number of attributes ");
CPPUNIT_ASSERT(!attr2);
bool bAttr1 = attr1;
if (bAttr1)
{
failStream << "Attr1: ";
while (attr1 != nullptr)
{
xmlChar* val1 = xmlGetProp(node1, attr1->name);
failStream << BAD_CAST(attr1->name) << "=" << BAD_CAST(val1) << ", ";
xmlFree(val1);
attr1 = attr1->next;
}
}
CPPUNIT_ASSERT_MESSAGE(failStream.str(), !bAttr1);
bool bAttr2 = attr2;
if (bAttr2)
{
failStream << "Attr2: ";
while (attr2 != nullptr)
{
xmlChar* val2 = xmlGetProp(node2, attr2->name);
failStream << BAD_CAST(attr2->name) << "=" << BAD_CAST(val2) << ", ";
xmlFree(val2);
attr2 = attr2->next;
}
}
CPPUNIT_ASSERT_MESSAGE(failStream.str(), !bAttr2);
#else #else
if (attr1 || attr2) if (attr1 || attr2)
return false; return false;