pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a few mistakes from XML logger.

Browse source
This commit is contained in:
Markus Kauppila 2011-06-28 23:15:43 +03:00
parent c843c7e815
commit e991b0266b
2 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/test-automation/xml.c
View file

@ -197,6 +197,9 @@ XMLOpenDocument(const char *rootTag)
{ {
const char *doctype = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"; const char *doctype = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
//! \todo make this optional (and let the user supply the filename?)
const char *style = "<?xml-stylesheet type=\"text/xsl\" href=\"style.xsl\"?>\n";
memset(buffer, 0, bufferSize); memset(buffer, 0, bufferSize);
snprintf(buffer, bufferSize, "<%s>", rootTag); snprintf(buffer, bufferSize, "<%s>", rootTag);
@ -205,16 +208,18 @@ XMLOpenDocument(const char *rootTag)
root = rootTag; // it's fine, as long as rootTag points to static memory? root = rootTag; // it's fine, as long as rootTag points to static memory?
const int doctypeSize = SDL_strlen(doctype); const int doctypeSize = SDL_strlen(doctype);
const int styleSize = SDL_strlen(style);
const int tagSize = SDL_strlen(buffer); const int tagSize = SDL_strlen(buffer);
const int size = doctypeSize + tagSize + 1; // extra byte for '\0' const int size = doctypeSize + styleSize + tagSize + 1; // extra byte for '\0'
char *ret = SDL_malloc(size); char *retBuf = SDL_malloc(size);
// copy doctype
strncpy(ret, doctype, doctypeSize); // fill in the previous allocated retBuf
// copy tag strcat(retBuf, doctype);
strncpy(ret + doctypeSize, buffer, tagSize); strcat(retBuf, style);
ret[size] = '\0'; strcat(retBuf, buffer);
return ret;
return retBuf;
} }
char * char *

33
test/test-automation/xml_logger.c
View file

@ -52,7 +52,7 @@ const char *assertElementName = "assert";
const char *messageElementName = "message"; const char *messageElementName = "message";
const char *timeElementName = "time"; const char *timeElementName = "time";
const char *assertSummaryElementName = "assertSummary"; const char *assertSummaryElementName = "assertSummary";
const char *assertCountElementName = "assertName"; const char *assertCountElementName = "assertCount";
const char *assertsPassedElementName = "assertsPassed"; const char *assertsPassedElementName = "assertsPassed";
const char *assertsFailedElementName = "assertsFailed"; const char *assertsFailedElementName = "assertsFailed";
const char *logElementName = "log"; const char *logElementName = "log";
@ -214,6 +214,15 @@ XMLSuiteStarted(const char *suiteName, time_t eventTime)
char *output = XMLOpenElement(suiteElementName); char *output = XMLOpenElement(suiteElementName);
XMLOutputter(indentLevel++, YES, output); XMLOutputter(indentLevel++, YES, output);
output = XMLOpenElement(nameElementName);
XMLOutputter(indentLevel++, NO, output);
output = XMLAddContent(suiteName);
XMLOutputter(indentLevel, NO, output);
output = XMLCloseElement(nameElementName);
XMLOutputter(--indentLevel, YES, output);
output = XMLOpenElement(startTimeElementName); output = XMLOpenElement(startTimeElementName);
XMLOutputter(indentLevel++, NO, output); XMLOutputter(indentLevel++, NO, output);
@ -373,6 +382,17 @@ XMLAssert(const char *assertName, int assertResult, const char *assertMessage,
char *output = XMLOpenElement(assertElementName); char *output = XMLOpenElement(assertElementName);
XMLOutputter(indentLevel++, YES, output); XMLOutputter(indentLevel++, YES, output);
// log assert name
output = XMLOpenElement(nameElementName);
XMLOutputter(indentLevel++, NO, output);
output = XMLAddContent(assertName);
XMLOutputter(indentLevel, NO, output);
output = XMLCloseElement(nameElementName);
XMLOutputter(--indentLevel, YES, output);
// log assert result // log assert result
output = XMLOpenElement(resultElementName); output = XMLOpenElement(resultElementName);
XMLOutputter(indentLevel++, NO, output); XMLOutputter(indentLevel++, NO, output);
@ -414,6 +434,17 @@ XMLAssertWithValues(const char *assertName, int assertResult, const char *assert
char *output = XMLOpenElement(assertElementName); char *output = XMLOpenElement(assertElementName);
XMLOutputter(indentLevel++, YES, output); XMLOutputter(indentLevel++, YES, output);
// log assert name
output = XMLOpenElement(nameElementName);
XMLOutputter(indentLevel++, NO, output);
output = XMLAddContent(assertName);
XMLOutputter(indentLevel, NO, output);
output = XMLCloseElement(nameElementName);
XMLOutputter(--indentLevel, YES, output);
// log assert result // log assert result
output = XMLOpenElement(resultElementName); output = XMLOpenElement(resultElementName);
XMLOutputter(indentLevel++, NO, output); XMLOutputter(indentLevel++, NO, output);