From 78e7b4e1b928fa69f672be3c743df6d6c3ecbced Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 2 Jan 2014 21:45:03 +0000 Subject: 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 --- tests/PathOpsOpCubicThreadedTest.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tests/PathOpsOpCubicThreadedTest.cpp') diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp index 99e68daae6..cf10bb5ef1 100644 --- a/tests/PathOpsOpCubicThreadedTest.cpp +++ b/tests/PathOpsOpCubicThreadedTest.cpp @@ -6,9 +6,9 @@ */ #include "PathOpsExtendedTest.h" #include "PathOpsThreadedCommon.h" +#include "TestClassDef.h" -static void testOpCubicsMain(PathOpsThreadState* data) -{ +static void testOpCubicsMain(PathOpsThreadState* data) { #if DEBUG_SHOW_TEST_NAME strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH); #endif @@ -67,8 +67,7 @@ static void testOpCubicsMain(PathOpsThreadState* data) } } -static void PathOpsOpCubicsThreadedTest(skiatest::Reporter* reporter) -{ +DEF_TEST(PathOpsOpCubicsThreaded, reporter) { int threadCount = initializeTests(reporter, "cubicOp"); PathOpsThreadedTestRunner testRunner(reporter, threadCount); for (int a = 0; a < 6; ++a) { // outermost @@ -85,6 +84,3 @@ static void PathOpsOpCubicsThreadedTest(skiatest::Reporter* reporter) finish: testRunner.render(); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS_SHORT(PathOpsOpCubicsThreadedTest) -- cgit v1.2.3