Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/GeometryTest.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkGeometry.h"
 
 static bool nearly_equal(const SkPoint& a, const SkPoint& b) {
     return SkScalarNearlyEqual(a.fX, b.fX) && SkScalarNearlyEqual(a.fY, b.fY);
 }
 
 static void testChopCubic(skiatest::Reporter* reporter) {
     /*
         Inspired by this test, which used to assert that the tValues had dups
 
         <path stroke="#202020" d="M0,0 C0,0 1,1 2190,5130 C2190,5070 2220,5010 2205,4980" />
      */
     const SkPoint src[] = {
         { SkIntToScalar(2190), SkIntToScalar(5130) },
         { SkIntToScalar(2190), SkIntToScalar(5070) },
         { SkIntToScalar(2220), SkIntToScalar(5010) },
         { SkIntToScalar(2205), SkIntToScalar(4980) },
     };
     SkPoint dst[13];
     SkScalar tValues[3];
     // make sure we don't assert internally
     int count = SkChopCubicAtMaxCurvature(src, dst, tValues);
     if (false) { // avoid bit rot, suppress warning
         REPORTER_ASSERT(reporter, count);
     }
 }
 
-
-static void TestGeometry(skiatest::Reporter* reporter) {
+DEF_TEST(Geometry, reporter) {
     SkPoint pts[3], dst[5];
 
     pts[0].set(0, 0);
     pts[1].set(100, 50);
     pts[2].set(0, 100);
 
     int count = SkChopQuadAtMaxCurvature(pts, dst);
     REPORTER_ASSERT(reporter, count == 1 || count == 2);
 
     pts[0].set(0, 0);
     pts[1].set(SkIntToScalar(3), 0);
     pts[2].set(SkIntToScalar(3), SkIntToScalar(3));
     SkConvertQuadToCubic(pts, dst);
     const SkPoint cubic[] = {
         { 0, 0, },
         { SkIntToScalar(2), 0, },
         { SkIntToScalar(3), SkIntToScalar(1), },
         { SkIntToScalar(3), SkIntToScalar(3) },
     };
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, nearly_equal(cubic[i], dst[i]));
     }
 
     testChopCubic(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Geometry", GeometryTestClass, TestGeometry)