Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/RegionTest.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 "SkRegion.h"
 #include "SkRandom.h"
 
 static void Union(SkRegion* rgn, const SkIRect& rect) {
     rgn->op(rect, SkRegion::kUnion_Op);
 }
 
 #define TEST_NO_INTERSECT(rgn, rect)    REPORTER_ASSERT(reporter, !rgn.intersects(rect))
 #define TEST_INTERSECT(rgn, rect)       REPORTER_ASSERT(reporter, rgn.intersects(rect))
 #define TEST_NO_CONTAINS(rgn, rect)     REPORTER_ASSERT(reporter, !rgn.contains(rect))
@@ skipping 196 matching lines @@
             SkDebugf(" { %d, %d, %d, %d },\n",
                      rect[i].fLeft, rect[i].fTop,
                      rect[i].fRight, rect[i].fBottom);
         }
         SkDebugf("\n");
         return false;
     }
     return true;
 }
 
-static void TestRegion(skiatest::Reporter* reporter) {
+DEF_TEST(Region, reporter) {
     const SkIRect r2[] = {
         { 0, 0, 1, 1 },
         { 2, 2, 3, 3 },
     };
     REPORTER_ASSERT(reporter, test_rects(r2, SK_ARRAY_COUNT(r2)));
 
     const SkIRect rects[] = {
         { 0, 0, 1, 2 },
         { 2, 1, 3, 3 },
         { 4, 0, 5, 1 },
@@ skipping 11 matching lines @@
             rand_rect(&rect[j], rand);
         }
         REPORTER_ASSERT(reporter, test_rects(rect, N));
     }
 
     test_proc(reporter, contains_proc);
     test_proc(reporter, intersects_proc);
     test_empties(reporter);
     test_fromchrome(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Region", RegionTestClass, TestRegion)