Remove unnamed namespace usage from tests/
Skia preference is to use 'static' keyword rather than use unnamed
namespace.
BUG=None
TEST=tests
R=robertphillips@google.com, bsalomon@google.com
Review URL: https://codereview.chromium.org/132403008
git-svn-id: http://skia.googlecode.com/svn/trunk@13138 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/Test.cpp b/tests/Test.cpp
index fe0f7c4..994a342 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -56,41 +56,39 @@
return fName.c_str();
}
-namespace {
- class LocalReporter : public Reporter {
- public:
- explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
+class LocalReporter : public Reporter {
+public:
+ explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
- int failure_size() const { return fFailures.count(); }
- const SkString& failure(int i) const { return fFailures[i]; }
+ int numFailures() const { return fFailures.count(); }
+ const SkString& failure(int i) const { return fFailures[i]; }
- protected:
- void onReportFailed(const SkString& desc) SK_OVERRIDE {
- fFailures.push_back(desc);
- }
+protected:
+ virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
+ fFailures.push_back(desc);
+ }
- // Proxy down to fReporter. We assume these calls are threadsafe.
- virtual bool allowExtendedTest() const SK_OVERRIDE {
- return fReporter->allowExtendedTest();
- }
+ // Proxy down to fReporter. We assume these calls are threadsafe.
+ virtual bool allowExtendedTest() const SK_OVERRIDE {
+ return fReporter->allowExtendedTest();
+ }
- virtual bool allowThreaded() const SK_OVERRIDE {
- return fReporter->allowThreaded();
- }
+ virtual bool allowThreaded() const SK_OVERRIDE {
+ return fReporter->allowThreaded();
+ }
- virtual void bumpTestCount() SK_OVERRIDE {
- fReporter->bumpTestCount();
- }
+ virtual void bumpTestCount() SK_OVERRIDE {
+ fReporter->bumpTestCount();
+ }
- virtual bool verbose() const SK_OVERRIDE {
- return fReporter->verbose();
- }
+ virtual bool verbose() const SK_OVERRIDE {
+ return fReporter->verbose();
+ }
- private:
- Reporter* fReporter; // Unowned.
- SkTArray<SkString> fFailures;
- };
-} // namespace
+private:
+ Reporter* fReporter; // Unowned.
+ SkTArray<SkString> fFailures;
+};
void Test::run() {
// Clear the Skia error callback before running any test, to ensure that tests
@@ -105,11 +103,11 @@
// from other tests that might share fReporter.
LocalReporter local(fReporter);
this->onRun(&local);
- fPassed = local.failure_size() == 0;
+ fPassed = local.numFailures() == 0;
fElapsed = SkTime::GetMSecs() - start;
// Now tell fReporter about any failures and wrap up.
- for (int i = 0; i < local.failure_size(); i++) {
+ for (int i = 0; i < local.numFailures(); i++) {
fReporter->reportFailed(local.failure(i));
}
fReporter->endTest(this);