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/PathOpsCubicIntersectionTest.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'tests/PathOpsCubicIntersectionTest.cpp') diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp index 8eb1756a14..974d426e6a 100644 --- a/tests/PathOpsCubicIntersectionTest.cpp +++ b/tests/PathOpsCubicIntersectionTest.cpp @@ -10,6 +10,7 @@ #include "SkPathOpsRect.h" #include "SkReduceOrder.h" #include "Test.h" +#include "TestClassDef.h" const int firstCubicIntersectionTest = 9; @@ -618,19 +619,19 @@ static void cubicIntersectionCoinTest(skiatest::Reporter* reporter) { } } -static void PathOpsCubicCoinOneOffTest(skiatest::Reporter* reporter) { +DEF_TEST(PathOpsCubicCoinOneOff, reporter) { coinOneOff(reporter, 0); } -static void PathOpsCubicIntersectionOneOffTest(skiatest::Reporter* reporter) { +DEF_TEST(PathOpsCubicIntersectionOneOff, reporter) { newOneOff(reporter, 0, 1); } -static void PathOpsCubicSelfOneOffTest(skiatest::Reporter* reporter) { +DEF_TEST(PathOpsCubicSelfOneOff, reporter) { selfOneOff(reporter, 0); } -static void PathOpsCubicIntersectionTest(skiatest::Reporter* reporter) { +DEF_TEST(PathOpsCubicIntersection, reporter) { oneOffTests(reporter); cubicIntersectionSelfTest(reporter); cubicIntersectionCoinTest(reporter); @@ -638,12 +639,3 @@ static void PathOpsCubicIntersectionTest(skiatest::Reporter* reporter) { if (false) CubicIntersection_IntersectionFinder(); if (false) CubicIntersection_RandTest(reporter); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionTest) - -DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionOneOffTest) - -DEFINE_TESTCLASS_SHORT(PathOpsCubicSelfOneOffTest) - -DEFINE_TESTCLASS_SHORT(PathOpsCubicCoinOneOffTest) -- cgit v1.2.3