Get rid of DEFINE_TESTCLASS_SHORT() macro.

tests/PathOpsAngleTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsTestCommon.h"
 #include "SkOpSegment.h"
 #include "SkTArray.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static const SkPoint cubics[][4] = {
 /* 0 */    {{0, 1}, {2, 6}, {4, 2}, {5, 3}},
 /* 1 */    {{10, 234}, {10, 229.581726f}, {13.5817204f, 226}, {18, 226}},
 /* 2 */    {{132, 11419}, {130.89543151855469f, 11419}, {130, 11418.1044921875f}, {130, 11417}},
 /* 3 */    {{130.04275512695312f, 11417.4130859375f}, {130.23307800292969f, 11418.3193359375f},
                     {131.03709411621094f, 11419}, {132, 11419}},
 /* 4 */    {{0,1}, {0,5}, {4,1}, {6,4}},
 /* 5 */    {{1,5}, {4,6}, {1,0}, {4,0}},
 /* 6 */    {{0,1}, {0,4}, {5,1}, {6,4}},
@@ skipping 363 matching lines @@
                     SkDebugf("%s test[%s]:  second[%d] > first[%d]\n", __FUNCTION__,
                             test.name,  idxL,  idxG);
                     compare = second < first;
                 }
                 REPORTER_ASSERT(reporter, compare);
             }
         }
     }
 }
 
-static void PathOpsAngleTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsAngle, reporter) {
     for (size_t index = 0; index < SK_ARRAY_COUNT(tests); ++index) {
         const SortSetTests& test = tests[index];
         testOne(reporter, test);
         reporter->bumpTestCount();
     }
 }
 
-static void PathOpsAngleTestOne(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsAngleTestOne, reporter) {
     size_t index = 0;
     const SortSetTests& test = tests[index];
     testOne(reporter, test);
 }
 
 #if 0
 static int find_slop(double x, double y, double rx, double ry) {
     int slopBits = 0;
     bool less1, less2;
     double absX = fabs(x);
@@ skipping 31 matching lines @@
         return (x < 0 ? 2-y/(-x-y) : 3+x/(x-y));
 }
 
 static const double slopTests[][4] = {
    // x                      y                       rx                      ry
     {-0.058554756452593892, -0.18804585843827226, -0.018568569646021160, -0.059615294434479438},
     {-0.0013717412948608398, 0.0041152238845825195, -0.00045837944195925573, 0.0013753175735478074},
     {-2.1033774145221198, -1.4046019261273715e-008, -0.70062688352066704, -1.2706324683777995e-008},
 };
 
-static void PathOpsAngleFindSlop(skiatest::Reporter* reporter) {
+/*DEF_TEST(PathOpsAngleFindSlop, reporter) {
     for (size_t index = 0; index < SK_ARRAY_COUNT(slopTests); ++index) {
         const double* slopTest = slopTests[index];
         double x = slopTest[0];
         double y = slopTest[1];
         double rx = slopTest[2];
         double ry = slopTest[3];
         SkDebugf("%s  xy %d=%d\n", __FUNCTION__, (int) index, find_slop(x, y, rx, ry));
         SkDebugf("%s rxy %d=%d\n", __FUNCTION__, (int) index, find_slop(rx, ry, x, y));
         double angle = diamond_angle(y, x);
         double rAngle = diamond_angle(ry, rx);
         double diff = fabs(angle - rAngle);
         SkDebugf("%s diamond xy=%1.9g rxy=%1.9g diff=%1.9g factor=%d\n", __FUNCTION__,
                 angle, rAngle, diff, (int) (diff / FLT_EPSILON));
 
     }
-}
+}*/
 #endif
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsAngleTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsAngleTestOne)
-
-// DEFINE_TESTCLASS_SHORT(PathOpsAngleFindSlop)