| Index: tests/WArrayTest.cpp
|
| diff --git a/tests/WArrayTest.cpp b/tests/WArrayTest.cpp
|
| index 48be9526371d6424f348caa988edfd9d58b0918c..40128fa2b4dd47c1e62c1a5dc5f0d8ce606928bf 100644
|
| --- a/tests/WArrayTest.cpp
|
| +++ b/tests/WArrayTest.cpp
|
| @@ -141,7 +141,7 @@ class TestWData {
|
| , fSubset(subset)
|
| , fSubsetLen(subsetLen)
|
| , fExpected(expected) {
|
| - REPORTER_ASSERT(reporter, RunTest());
|
| + this->runTest(reporter);
|
| }
|
|
|
| private:
|
| @@ -160,16 +160,14 @@ class TestWData {
|
| return false;
|
| }
|
|
|
| - bool RunTest() {
|
| + void runTest(skiatest::Reporter* reporter) {
|
| SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<int16_t> > result;
|
| result.reset(getAdvanceData((void*)this, fAdvancesLen, fSubset, fSubsetLen, getAdvance));
|
|
|
| SkString stringResult = stringify_advance_data(result);
|
| if (!stringResult.equals(fExpected)) {
|
| - SkDebugf("Expected: %s\n Result: %s\n", fExpected, stringResult.c_str());
|
| - return false;
|
| + ERRORF(reporter, "Expected: %s\n Result: %s\n", fExpected, stringResult.c_str());
|
| }
|
| - return true;
|
| }
|
| };
|
|
|
|
|