Logging system added to harness. Logging system doesn't
yet utilize all the given parameters.
This commit is contained in:
parent
e2799bbbb3
commit
2e8932b12e
11 changed files with 268 additions and 71 deletions
|
@ -18,6 +18,9 @@
|
|||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <SDL/SDL.h>
|
||||
|
||||
#include "xml.h"
|
||||
|
@ -32,19 +35,19 @@ XMLRunStarted(LogOutputFp outputFn, const char *runnerParameters, time_t eventTi
|
|||
{
|
||||
logger = outputFn;
|
||||
|
||||
char *output = XMLOpenDocument("teSTtlog");
|
||||
char *output = XMLOpenDocument("testlog");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("paRameters");
|
||||
output = XMLOpenElement("parameters");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLAddContent(runnerParameters);
|
||||
output = XMLAddContent("Add: runner parameter");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLCloseElement("Parameters");
|
||||
output = XMLCloseElement("parameters");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
}
|
||||
|
@ -53,7 +56,7 @@ void
|
|||
XMLRunEnded(int testCount, int suiteCount, int testPassCount, int testFailCount,
|
||||
time_t endTime, time_t totalRuntime)
|
||||
{
|
||||
char *output = XMLCloseDocument("testlOg");
|
||||
char *output = XMLCloseDocument("testlog");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
}
|
||||
|
@ -65,12 +68,12 @@ XMLSuiteStarted(const char *suiteName, time_t eventTime)
|
|||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("EVENTTime");
|
||||
output = XMLOpenElement("eventtime");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
//XMLAddContent(evenTime);
|
||||
output = XMLCloseElement("eventTIME");
|
||||
output = XMLCloseElement("eventtime");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
}
|
||||
|
@ -130,9 +133,31 @@ XMLTestStarted(const char *testName, const char *suiteName, const char *testDesc
|
|||
|
||||
void
|
||||
XMLTestEnded(const char *testName, const char *suiteName,
|
||||
int testResult, int numAsserts, time_t endTime, time_t totalRuntime)
|
||||
int testResult, time_t endTime, time_t totalRuntime)
|
||||
{
|
||||
char *output = XMLCloseElement("test");
|
||||
char *output = XMLOpenElement("result");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
if(testResult) {
|
||||
if(testResult == 2) {
|
||||
output = XMLAddContent("failed -> no assert");
|
||||
} else {
|
||||
output = XMLAddContent("failed");
|
||||
}
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
} else {
|
||||
output = XMLAddContent("passed");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
}
|
||||
output = XMLCloseElement("result");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLCloseElement("test");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
}
|
||||
|
@ -153,7 +178,7 @@ XMLAssert(const char *assertName, int assertResult, const char *assertMessage,
|
|||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("result");
|
||||
output = XMLCloseElement("result");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
|
@ -162,6 +187,57 @@ XMLAssert(const char *assertName, int assertResult, const char *assertMessage,
|
|||
SDL_free(output);
|
||||
}
|
||||
|
||||
void
|
||||
XMLAssertSummary(int numAsserts, int numAssertsFailed, int numAssertsPass)
|
||||
{
|
||||
char *output = XMLOpenElement("assertSummary");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("assertCount");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
//XMLAddContent() \todo add string conversion
|
||||
|
||||
output = XMLCloseElement("assertCount");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("assertsPassed");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
const int bufferSize = sizeof(int) * 8 + 1;
|
||||
//char buffer[bufferSize];
|
||||
char *buffer = SDL_malloc(bufferSize);
|
||||
memset(buffer, 'a', bufferSize);
|
||||
|
||||
//SDL_vsnprintf(buffer, bufferSize, "%d", numAssertsPass);
|
||||
snprintf(buffer, sizeof(buffer), "%d", numAssertsPass);
|
||||
buffer[3] = 'a';
|
||||
//printf("DEBUG |Ê%s == %d of size %d", buffer, numAssertsPass, bufferSize);
|
||||
XMLAddContent(buffer);
|
||||
|
||||
output = XMLCloseElement("assertsPassed");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLOpenElement("assertsFailed");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
//XMLAddContent() \todo add string conversion
|
||||
|
||||
output = XMLCloseElement("assertsFailed");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
|
||||
output = XMLCloseElement("assertSummary");
|
||||
logger(output);
|
||||
SDL_free(output);
|
||||
}
|
||||
|
||||
void
|
||||
XMLLog(const char *logMessage, time_t eventTime)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue