82065d667f
SkSafeRef() and SkSafeUnref().
This is basically a bug waiting to happen. An optimizing compiler can remove
checks for null on "this" if it chooses. However, SkRefCnt::safeRef() relies on
precisely this check...
void SkRefCnt::safeRef() {
if (this) {
this->ref();
}
}
Since a compiler might skip the if-clause, it breaks the intention of this
method, hence its removal.
static inline void SkSafeRef(SkRefCnt* obj) {
if (obj) {
obj->ref();
}
}
This form is not ignored by an optimizing compile, so we use it instead.
git-svn-id: http://skia.googlecode.com/svn/trunk@762 2bbb7eff-a529-9590-31e7-b0007b416f81
66 lines
1.3 KiB
C++
66 lines
1.3 KiB
C++
#include "Test.h"
|
|
|
|
using namespace skiatest;
|
|
|
|
Reporter::Reporter() {
|
|
this->resetReporting();
|
|
}
|
|
|
|
void Reporter::resetReporting() {
|
|
fCurrTest = NULL;
|
|
fTestCount = 0;
|
|
sk_bzero(fResultCount, sizeof(fResultCount));
|
|
}
|
|
|
|
void Reporter::startTest(Test* test) {
|
|
SkASSERT(NULL == fCurrTest);
|
|
fCurrTest = test;
|
|
this->onStart(test);
|
|
fTestCount += 1;
|
|
fCurrTestSuccess = true; // we're optimistic
|
|
}
|
|
|
|
void Reporter::report(const char desc[], Result result) {
|
|
if (NULL == desc) {
|
|
desc = "<no description>";
|
|
}
|
|
this->onReport(desc, result);
|
|
fResultCount[result] += 1;
|
|
if (kFailed == result) {
|
|
fCurrTestSuccess = false;
|
|
}
|
|
}
|
|
|
|
void Reporter::endTest(Test* test) {
|
|
SkASSERT(test == fCurrTest);
|
|
this->onEnd(test);
|
|
fCurrTest = NULL;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Test::Test() : fReporter(NULL) {}
|
|
|
|
Test::~Test() {
|
|
SkSafeUnref(fReporter);
|
|
}
|
|
|
|
void Test::setReporter(Reporter* r) {
|
|
SkRefCnt_SafeAssign(fReporter, r);
|
|
}
|
|
|
|
const char* Test::getName() {
|
|
if (fName.size() == 0) {
|
|
this->onGetName(&fName);
|
|
}
|
|
return fName.c_str();
|
|
}
|
|
|
|
bool Test::run() {
|
|
fReporter->startTest(this);
|
|
this->onRun(fReporter);
|
|
fReporter->endTest(this);
|
|
return fReporter->getCurrSuccess();
|
|
}
|
|
|