Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Custom map compare function for better debug logging 

When running mpd unit tests, add --logging -v=2 to see verbose logs and -v=3
for more verbose logs

Change-Id: I5484f3fd9be4c9e7527d86fa71205e8f025d102a
This commit is contained in:
Rintaro Kuroiwa 2014-06-25 18:40:40 -07:00 committed by Gerrit Code Review
parent 5d5750b405
commit b2a10d478d
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mpd/test/xml_compare.cc
View File

@ -3,6 +3,7 @@
#include <algorithm>
#include <map>
#include <string>
#include <utility>
#include "base/logging.h"
#include "mpd/base/xml/scoped_xml_ptr.h"
@ -20,6 +21,8 @@ xml::ScopedXmlPtr<xmlDoc>::type GetDocFromString(const std::string& xml_str) {
// Make a map from attributes of the node.
std::map<std::string, std::string> GetMapOfAttributes(xmlNodePtr node) {
DVLOG(2) << "Getting attributes for node "
<< reinterpret_cast<const char*>(node->name);
std::map<std::string, std::string> attribute_map;
for (xmlAttr* attribute = node->properties;
attribute && attribute->name && attribute->children;
@ -29,7 +32,7 @@ std::map<std::string, std::string> GetMapOfAttributes(xmlNodePtr node) {
xmlNodeListGetString(node->doc, attribute->children, 1));
attribute_map[name] = reinterpret_cast<const char*>(value.get());
DLOG(INFO) << "In node " << reinterpret_cast<const char*>(node->name)
DVLOG(3) << "In node " << reinterpret_cast<const char*>(node->name)
<< " found attribute " << name << " with value "
<< reinterpret_cast<const char*>(value.get());
}
@ -37,10 +40,25 @@ std::map<std::string, std::string> GetMapOfAttributes(xmlNodePtr node) {
return attribute_map;
}
bool MapCompareFunc(std::pair<std::string, std::string> a,
std::pair<std::string, std::string> b) {
if (a.first != b.first) {
DLOG(INFO) << "Attribute mismatch " << a.first << " and " << b.first;
return false;
}
if (a.second != b.second) {
DLOG(INFO) << "Value mismatch for " << a.first << std::endl << "Values are "
<< a.second << " and " << b.second;
return false;
}
return true;
}
bool MapsEqual(const std::map<std::string, std::string>& map1,
const std::map<std::string, std::string>& map2) {
return map1.size() == map2.size() &&
std::equal(map1.begin(), map1.end(), map2.begin());
std::equal(map1.begin(), map1.end(), map2.begin(), MapCompareFunc);
}
// Return true if the nodes have the same attributes.
@ -50,7 +68,7 @@ bool CompareAttributes(xmlNodePtr node1, xmlNodePtr node2) {
// Return true if the name of the nodes match.
bool CompareNames(xmlNodePtr node1, xmlNodePtr node2) {
DLOG(INFO) << "Comparing " << reinterpret_cast<const char*>(node1->name)
DVLOG(2) << "Comparing " << reinterpret_cast<const char*>(node1->name)
<< " and " << reinterpret_cast<const char*>(node2->name);
return xmlStrcmp(node1->name, node2->name) == 0;
}