Refactor: clean up some unused or mostly-unused API I saw here.
BUG=
R=bungeman@google.com, reed@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/17414003
git-svn-id: http://skia.googlecode.com/svn/trunk@9668 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/Test.cpp b/tests/Test.cpp
index f8f2e62..32c293e 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -31,8 +31,8 @@
this->onStart(test);
}
-void Reporter::report(const char desc[], Result result) {
- this->onReport(desc ? desc : "<no description>", result);
+void Reporter::reportFailed(const SkString& desc) {
+ this->onReportFailed(desc);
}
void Reporter::endTest(Test* test) {
@@ -64,13 +64,11 @@
explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
int failure_size() const { return fFailures.count(); }
- const char* failure(int i) const { return fFailures[i].c_str(); }
+ const SkString& failure(int i) const { return fFailures[i]; }
protected:
- void onReport(const char desc[], Result result) SK_OVERRIDE {
- if (kFailed == result) {
- fFailures.push_back().set(desc);
- }
+ void onReportFailed(const SkString& desc) SK_OVERRIDE {
+ fFailures.push_back(desc);
}
// Proxy down to fReporter. We assume these calls are threadsafe.
@@ -110,7 +108,7 @@
// Now tell fReporter about any failures and wrap up.
for (int i = 0; i < local.failure_size(); i++) {
- fReporter->report(local.failure(i), Reporter::kFailed);
+ fReporter->reportFailed(local.failure(i));
}
fReporter->endTest(this);