Get rid of DEFINE_TESTCLASS_SHORT() macro.

Instead tests should be written using DEF_TEST() macro, which is much
nicer and simplifies the process of setting up an unit test.

BUG=None
TEST=skpskgr_test, pathops_unittest
R=mtklein@google.com

Review URL: https://codereview.chromium.org/117863005

git-svn-id: http://skia.googlecode.com/svn/trunk@12870 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 4 insertions, 10 deletions

diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index 93c9de5718..bd39151a85 100755
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/tests/PathOpsSkpClipTest.cpp
@@ -18,6 +18,7 @@
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define PATH_SLASH "\\"
@@ -612,7 +613,7 @@ static void encodeFound(skiatest::Reporter* reporter, TestState& state) {
     }
 }
 
-static void PathOpsSkpClipTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClip, reporter) {
     if (!initTest()) {
         return;
     }
@@ -635,7 +636,7 @@ static void testSkpClipMain(TestState* data) {
         (void) doOneDir(data);
 }
 
-static void PathOpsSkpClipThreadedTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClipThreaded, reporter) {
     if (!initTest()) {
         return;
     }
@@ -661,7 +662,7 @@ static void PathOpsSkpClipThreadedTest(skiatest::Reporter* reporter) {
     encodeFound(reporter, state);
 }
 
-static void PathOpsSkpClipOneOffTest(skiatest::Reporter* reporter) {
+DEF_TEST(PathOpsSkpClipOneOff, reporter) {
     if (!initTest()) {
         return;
     }
@@ -677,10 +678,3 @@ static void PathOpsSkpClipOneOffTest(skiatest::Reporter* reporter) {
     state.fTestStep = kEncodeFiles;
     state.testOne();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipOneOffTest)
-
-DEFINE_TESTCLASS_SHORT(PathOpsSkpClipThreadedTest)