From 60d39b758dc9308d6ce7464875b3a17f26be3d79 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 27 Apr 2012 13:50:37 +0200 Subject: add tolerance to chart regression test Change-Id: I5e7694571815df48e54488a33435bb7d022e6889 --- test/source/diff/diff.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test/source') diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx index 8587fd799eb0..574805dc9c68 100644 --- a/test/source/diff/diff.cxx +++ b/test/source/diff/diff.cxx @@ -56,10 +56,14 @@ XMLDiff::XMLDiff(const std::string& file1, const std::string& file2) xmlFile2 = xmlParseFile(file2.c_str()); } -XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size) +XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size, const char* pToleranceFile) { xmlFile1 = xmlParseFile(pFileName); xmlFile2 = xmlParseMemory(pContent, size); + + xmlDocPtr xmlToleranceFile = xmlParseFile(pToleranceFile); + loadToleranceFile(xmlToleranceFile); + xmlFreeDoc(xmlToleranceFile); } XMLDiff::~XMLDiff() @@ -84,7 +88,9 @@ void readAttributesForTolerance(xmlNodePtr node, tolerance& tol) tol.value = val; xmlChar* relative = xmlGetProp(node, BAD_CAST("relative")); - bool rel = xmlXPathCastStringToBoolean(relative); + bool rel = false; + if(xmlStrEqual(relative, BAD_CAST("true"))) + rel = true; xmlFree(relative); tol.relative = rel; } -- cgit