Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removed logger output for XML token node tests

Browse Source 
This was SVN commit r11360.
This commit is contained in:
vts 2012-03-17 23:03:02 +00:00
parent b68d770c89
commit d7128572ae
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/simulation2/system/ParamNode.cpp
View File

@ -128,7 +128,7 @@ void CParamNode::ApplyLayer(const XMBFile& xmb, const XMBElement& element)
if (tokenIt != tokens.end())
tokens.erase(tokenIt);
else
LOGWARNING(L"[ParamNode] Could not remove token '%ls' from node '%ls'; not present in list nor inherited (possible typo?)",
LOGWARNING(L"[ParamNode] Could not remove token '%ls' from node '%hs'; not present in list nor inherited (possible typo?)",
newTokens[i].substr(1).c_str(), name.c_str());
}
else

3
source/simulation2/tests/test_ParamNode.h
View File

@ -19,6 +19,7 @@
#include "simulation2/system/ParamNode.h"
#include "ps/CLogger.h"
#include "ps/XML/Xeromyces.h"
class TestParamNode : public CxxTest::TestSuite
@ -120,6 +121,7 @@ public:
void test_overlay_remove_nonexistent_token()
{
// regression test; this used to cause a crash because of a failure to check whether the token being removed was present
TestLogger nolog;
CParamNode node;
TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a datatype='tokens'>-nonexistenttoken X</a></test>"), PSRETURN_OK);
TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a datatype=\"tokens\">X</a></test>");
@ -127,6 +129,7 @@ public:
void test_overlay_remove_empty_token()
{
TestLogger nolog;
CParamNode node;
TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a datatype='tokens'> Y - X </a></test>"), PSRETURN_OK);
TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a datatype=\"tokens\">Y X</a></test>");