Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/Sk64Test.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 "SkRandom.h"
 #include <math.h>
 
 struct BoolTable {
     int8_t  zero, pos, neg, toBool, sign;
 };
 
 static void bool_table_test(skiatest::Reporter* reporter,
                             const Sk64& a, const BoolTable& table)
 {
     REPORTER_ASSERT(reporter, a.isZero() != a.nonZero());
 
     REPORTER_ASSERT(reporter, !a.isZero() == !table.zero);
     REPORTER_ASSERT(reporter, !a.isPos() == !table.pos);
     REPORTER_ASSERT(reporter, !a.isNeg() == !table.neg);
     REPORTER_ASSERT(reporter, a.getSign() == table.sign);
 }
 
 #ifdef SkLONGLONG
     static SkLONGLONG asLL(const Sk64& a)
     {
         return ((SkLONGLONG)a.fHi << 32) | a.fLo;
     }
 #endif
 
-static void TestSk64(skiatest::Reporter* reporter) {
+DEF_TEST(Sk64Test, reporter) {
     enum BoolTests {
         kZero_BoolTest,
         kPos_BoolTest,
         kNeg_BoolTest
     };
     static const BoolTable gBoolTable[] = {
         { 1, 0, 0, 0, 0 },
         { 0, 1, 0, 1, 1 },
         { 0, 0, 1, 1, -1 }
     };
@@ skipping 146 matching lines @@
         diff = fixdiv - dfixdiv;
 
         if (SkAbs32(diff) > 1) {
             SkDebugf(" %d === numer %g denom %g div %g xdiv %x fxdiv %x\n",
                      i, dnumer, ddenom, ddiv, dfixdiv, fixdiv);
         }
         REPORTER_ASSERT(reporter, SkAbs32(diff) <= 1);
     }
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Sk64", Sk64TestClass, TestSk64)