Refactor: clean up some unused or mostly-unused API I saw here.

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkString.h"
 #include "SkTRegistry.h"
 #include "SkThread.h"
 #include "SkTypes.h"
 
 class GrContextFactory;
 
 namespace skiatest {
 
     class Test;
 
     class Reporter : public SkRefCnt {
     public:
         SK_DECLARE_INST_COUNT(Reporter)
         Reporter();
 
         enum Result {

[bungeman-skia, 2013/06/18 19:52:33]

This enum doesn't appear to be used anymore, it should probably be removed.

This also means removing result2string from skia_test.cpp and changing the
onReport signature.

[mtklein, 2013/06/18 20:02:47]

Done.

             kPassed,    // must begin with 0
             kFailed,
             /////
             kLastResult = kFailed
         };
 
         int countTests() const { return fTestCount; }
 
         void startTest(Test*);
-        void report(const char testDesc[], Result);
+        void reportFailed(const SkString& desc);
         void endTest(Test*);
 
         virtual bool allowExtendedTest() const { return false; }
         virtual bool allowThreaded() const { return false; }
         virtual void bumpTestCount() { sk_atomic_inc(&fTestCount); }
 
-        // helpers for tests
-        void reportFailed(const char desc[]) {
-            this->report(desc, kFailed);
-        }
-        void reportFailed(const SkString& desc) {
-            this->report(desc.c_str(), kFailed);
-        }
-
-
     protected:
         virtual void onStart(Test*) {}
         virtual void onReport(const char desc[], Result) {}

[bungeman-skia, 2013/06/18 19:52:33]

Since we might be mucking with onReport anyway, it should also take const
SkString& if report does. There appear to be only two existing implementations.
The DebugfReporter can just c_str() and the LocalReporter can use
push_back(desc) instead of push_back().set(desc) for better performance. Since
Result is abandoned, this it might as well be renamed onReportFailed while we're
at it.

[mtklein, 2013/06/18 20:02:47]

Done.

         virtual void onEnd(Test*) {}
 
     private:
         int32_t fTestCount;
 
         typedef SkRefCnt INHERITED;
     };
 
     class Test {
     public:
@@ skipping 50 matching lines @@
     do {                                                                     \
         if (!(cond)) {                                                       \
             SkString desc;                                                   \
             desc.printf("%s %s:%d: %s", message, __FILE__, __LINE__, #cond); \
             r->reportFailed(desc);                                           \
         }                                                                    \
     } while(0)
 
 
 #endif