Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsSkpClipTest.cpp

 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPathOpsDebug.h"
 #include "SkPicture.h"
 #include "SkRTConf.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
     #define IN_DIR "D:\\9-30-13\\"
     #define OUT_DIR "D:\\opSkpClip\\1\\"
 #else
     #define PATH_SLASH "/"
     #ifdef SK_BUILD_FOR_MAC
         #define IN_DIR "/Volumes/tera/9-30-13/skp"
         #define OUT_DIR "/Volumes/tera/out/9-30-13/1/"
@@ skipping 574 matching lines @@
             SkDebugf("%d %s %d\n", state.fDirsFound[index], state.fFilesFound[index],
                      state.fError[index]);
         }
     }
     for (int index = 0; index < state.fFoundCount; ++index) {
         TestResult::Test(state.fDirsFound[index], state.fFilesFound[index], kEncodeFiles);
         if (state.fReporter->verbose()) SkDebugf("+");
     }
 }
 
-static void PathOpsSkpClipTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClip, reporter) {
     if (!initTest()) {
         return;
     }
     SkTArray<TestResult, true> errors;
     TestState state;
     state.init(0, reporter);
     for (int dirNo = 1; dirNo <= 100; ++dirNo) {
         if (reporter->verbose()) {
             SkDebugf("dirNo=%d\n", dirNo);
         }
         state.fResult.fDirNo = dirNo;
         if (!doOneDir(&state)) {
             break;
         }
     }
     encodeFound(reporter, state);
 }
 
 static void testSkpClipMain(TestState* data) {
         (void) doOneDir(data);
 }
 
-static void PathOpsSkpClipThreadedTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClipThreaded, reporter) {
     if (!initTest()) {
         return;
     }
     int threadCount = reporter->allowThreaded() ? SkThreadPool::kThreadPerCore : 1;
     TestRunner testRunner(reporter, threadCount);
     for (int dirNo = 1; dirNo <= 100; ++dirNo) {
         *testRunner.fRunnables.append() = SkNEW_ARGS(TestRunnable,
                 (&testSkpClipMain, dirNo, &testRunner));
     }
     testRunner.render();
     TestState state;
     state.init(0, reporter);
     for (int dirNo = 1; dirNo <= 100; ++dirNo) {
         TestState& testState = testRunner.fRunnables[dirNo - 1]->fState;
         for (int inner = 0; inner < testState.fFoundCount; ++inner) {
             TestResult& testResult = testState.fResult;
             SkASSERT(testResult.fDirNo == dirNo);
             testResult.fPixelError = testState.fError[inner];
             strcpy(testResult.fFilename, testState.fFilesFound[inner]);
             addError(&state, testResult);
         }
     }
     encodeFound(reporter, state);
 }
 
-static void PathOpsSkpClipOneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClipOneOff, reporter) {
     if (!initTest()) {
         return;
     }
     const int testIndex = 43 - 41;
     int dirNo = skipOverSept[testIndex].directory;
     SkAssertResult(make_in_dir_name(dirNo).size());
     SkString filename(skipOverSept[testIndex].filename);
     TestResult state;
     state.test(dirNo, filename);
     if (reporter->verbose()) {
         SkDebugf("%s", state.status().c_str());
     }
     state.fTestStep = kEncodeFiles;
     state.testOne();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipOneOffTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipThreadedTest)