diff options
author | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
commit | 78e7b4e1b928fa69f672be3c743df6d6c3ecbced (patch) | |
tree | 5bc67e556d8a790498b4700d0aa37495c89bfcd5 /tests/PathOpsCubicIntersectionTest.cpp | |
parent | dab032a4ba4a93bff49adae064912e4bb6583784 (diff) |
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
Diffstat (limited to 'tests/PathOpsCubicIntersectionTest.cpp')
-rw-r--r-- | tests/PathOpsCubicIntersectionTest.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
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) |