AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added static method to convert arbitrary ErrorID to a string. 

Updated tests to print ErrorID and bool values as strings.
This commit is contained in:
kezenator 2016-11-26 13:54:42 +10:00
parent f80d78d938
commit 5a70071241
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tinyxml2.cpp
View File

@ -2226,14 +2226,19 @@ void XMLDocument::SetError( XMLError error, const char* str1, const char* str2 )
_errorStr2.SetStr(str2); _errorStr2.SetStr(str2);
} }
const char* XMLDocument::ErrorName() const const char* XMLDocument::ErrorName(XMLError errorID)
{ {
TIXMLASSERT( _errorID >= 0 && _errorID < XML_ERROR_COUNT ); TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT );
const char* errorName = _errorNames[_errorID]; const char* errorName = _errorNames[errorID];
TIXMLASSERT( errorName && errorName[0] ); TIXMLASSERT( errorName && errorName[0] );
return errorName; return errorName;
} }
const char* XMLDocument::ErrorName() const
{
return ErrorName(_errorID);
}
void XMLDocument::PrintError() const void XMLDocument::PrintError() const
{ {
if ( Error() ) { if ( Error() ) {

1
tinyxml2.h
View File

@ -1749,6 +1749,7 @@ public:
return _errorID; return _errorID;
} }
const char* ErrorName() const; const char* ErrorName() const;
static const char* ErrorName(XMLError errorID);
/// Return a possibly helpful diagnostic location or string. /// Return a possibly helpful diagnostic location or string.
const char* GetErrorStr1() const { const char* GetErrorStr1() const {

9
xmltest.cpp
View File

@ -63,6 +63,15 @@ bool XMLTest (const char* testString, const char* expected, const char* found, b
return pass; return pass;
} }
bool XMLTest(const char* testString, XMLError expected, XMLError found, bool echo = true, bool extraNL = false)
{
return XMLTest(testString, XMLDocument::ErrorName(expected), XMLDocument::ErrorName(found), echo, extraNL);
}
bool XMLTest(const char* testString, bool expected, bool found, bool echo = true, bool extraNL = false)
{
return XMLTest(testString, expected ? "true" : "false", found ? "true" : "false", echo, extraNL);
}
template< class T > bool XMLTest( const char* testString, T expected, T found, bool echo=true ) template< class T > bool XMLTest( const char* testString, T expected, T found, bool echo=true )
{ {