Remove unused members and methods from QTestLogger.
QTestLogger was counting various test outputs, but was only using three of the counters internally and the rest were not used at all. This commit removes the unused counters and all of the getter methods. Change-Id: I447183dcaf3e6cc335bbf58656e25b1d32ba810a Reviewed-on: http://codereview.qt.nokia.com/3437 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
a541bd9662
commit
043914bd97
@ -54,15 +54,16 @@
|
|||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QTestLogger::QTestLogger(int fm)
|
QTestLogger::QTestLogger(int fm)
|
||||||
:listOfTestcases(0), currentLogElement(0), errorLogElement(0),
|
: listOfTestcases(0)
|
||||||
logFormatter(0), format( (TestLoggerFormat)fm ),
|
, currentLogElement(0)
|
||||||
testCounter(0), passCounter(0),
|
, errorLogElement(0)
|
||||||
failureCounter(0), errorCounter(0),
|
, logFormatter(0)
|
||||||
warningCounter(0), skipCounter(0),
|
, format( (TestLoggerFormat)fm )
|
||||||
systemCounter(0), qdebugCounter(0),
|
, testCounter(0)
|
||||||
qwarnCounter(0), qfatalCounter(0),
|
, failureCounter(0)
|
||||||
infoCounter(0), randomSeed_(0),
|
, errorCounter(0)
|
||||||
hasRandomSeed_(false)
|
, randomSeed_(0)
|
||||||
|
, hasRandomSeed_(false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -182,11 +183,9 @@ void QTestLogger::addIncident(IncidentTypes type, const char *description,
|
|||||||
typeBuf = "xpass";
|
typeBuf = "xpass";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::Pass:
|
case QAbstractTestLogger::Pass:
|
||||||
++passCounter;
|
|
||||||
typeBuf = "pass";
|
typeBuf = "pass";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::XFail:
|
case QAbstractTestLogger::XFail:
|
||||||
++passCounter;
|
|
||||||
typeBuf = "xfail";
|
typeBuf = "xfail";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::Fail:
|
case QAbstractTestLogger::Fail:
|
||||||
@ -302,31 +301,24 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char
|
|||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case QAbstractTestLogger::Warn:
|
case QAbstractTestLogger::Warn:
|
||||||
++warningCounter;
|
|
||||||
typeBuf = "warn";
|
typeBuf = "warn";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::QSystem:
|
case QAbstractTestLogger::QSystem:
|
||||||
++systemCounter;
|
|
||||||
typeBuf = "system";
|
typeBuf = "system";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::QDebug:
|
case QAbstractTestLogger::QDebug:
|
||||||
++qdebugCounter;
|
|
||||||
typeBuf = "qdebug";
|
typeBuf = "qdebug";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::QWarning:
|
case QAbstractTestLogger::QWarning:
|
||||||
++qwarnCounter;
|
|
||||||
typeBuf = "qwarn";
|
typeBuf = "qwarn";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::QFatal:
|
case QAbstractTestLogger::QFatal:
|
||||||
++qfatalCounter;
|
|
||||||
typeBuf = "qfatal";
|
typeBuf = "qfatal";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::Skip:
|
case QAbstractTestLogger::Skip:
|
||||||
++skipCounter;
|
|
||||||
typeBuf = "skip";
|
typeBuf = "skip";
|
||||||
break;
|
break;
|
||||||
case QAbstractTestLogger::Info:
|
case QAbstractTestLogger::Info:
|
||||||
++infoCounter;
|
|
||||||
typeBuf = "info";
|
typeBuf = "info";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -358,56 +350,6 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int QTestLogger::passCount() const
|
|
||||||
{
|
|
||||||
return passCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::failureCount() const
|
|
||||||
{
|
|
||||||
return failureCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::errorCount() const
|
|
||||||
{
|
|
||||||
return errorCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::warningCount() const
|
|
||||||
{
|
|
||||||
return warningCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::skipCount() const
|
|
||||||
{
|
|
||||||
return skipCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::systemCount() const
|
|
||||||
{
|
|
||||||
return systemCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::qdebugCount() const
|
|
||||||
{
|
|
||||||
return qdebugCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::qwarnCount() const
|
|
||||||
{
|
|
||||||
return qwarnCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::qfatalCount() const
|
|
||||||
{
|
|
||||||
return qfatalCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
int QTestLogger::infoCount() const
|
|
||||||
{
|
|
||||||
return infoCounter;
|
|
||||||
}
|
|
||||||
|
|
||||||
void QTestLogger::registerRandomSeed(unsigned int seed)
|
void QTestLogger::registerRandomSeed(unsigned int seed)
|
||||||
{
|
{
|
||||||
randomSeed_ = seed;
|
randomSeed_ = seed;
|
||||||
|
@ -87,16 +87,6 @@ class QTestLogger : public QAbstractTestLogger
|
|||||||
void addMessage(MessageTypes type, const char *message,
|
void addMessage(MessageTypes type, const char *message,
|
||||||
const char *file = 0, int line = 0);
|
const char *file = 0, int line = 0);
|
||||||
|
|
||||||
int passCount() const;
|
|
||||||
int failureCount() const;
|
|
||||||
int errorCount() const;
|
|
||||||
int warningCount() const;
|
|
||||||
int skipCount() const;
|
|
||||||
int systemCount() const;
|
|
||||||
int qdebugCount() const;
|
|
||||||
int qwarnCount() const;
|
|
||||||
int qfatalCount() const;
|
|
||||||
int infoCount() const;
|
|
||||||
void registerRandomSeed(unsigned int seed);
|
void registerRandomSeed(unsigned int seed);
|
||||||
unsigned int randomSeed() const;
|
unsigned int randomSeed() const;
|
||||||
bool hasRandomSeed() const;
|
bool hasRandomSeed() const;
|
||||||
@ -109,16 +99,8 @@ class QTestLogger : public QAbstractTestLogger
|
|||||||
TestLoggerFormat format;
|
TestLoggerFormat format;
|
||||||
|
|
||||||
int testCounter;
|
int testCounter;
|
||||||
int passCounter;
|
|
||||||
int failureCounter;
|
int failureCounter;
|
||||||
int errorCounter;
|
int errorCounter;
|
||||||
int warningCounter;
|
|
||||||
int skipCounter;
|
|
||||||
int systemCounter;
|
|
||||||
int qdebugCounter;
|
|
||||||
int qwarnCounter;
|
|
||||||
int qfatalCounter;
|
|
||||||
int infoCounter;
|
|
||||||
unsigned int randomSeed_;
|
unsigned int randomSeed_;
|
||||||
bool hasRandomSeed_;
|
bool hasRandomSeed_;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user