Chromium Code Reviews| Index: tests/PathOpsAngleTest.cpp |
| diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp |
| index e1fb038a24bddc40ac561c05017045fd0f5e48cb..f33c24dfa13e8eaa4fc88d6269b9d92c364edf76 100644 |
| --- a/tests/PathOpsAngleTest.cpp |
| +++ b/tests/PathOpsAngleTest.cpp |
| @@ -8,6 +8,7 @@ |
| #include "SkOpSegment.h" |
| #include "SkTArray.h" |
| #include "Test.h" |
| +#include "TestClassDef.h" |
| static const SkPoint cubics[][4] = { |
| /* 0 */ {{0, 1}, {2, 6}, {4, 2}, {5, 3}}, |
| @@ -391,7 +392,7 @@ static void testOne(skiatest::Reporter* reporter, const SortSetTests& test) { |
| } |
| } |
| -static void PathOpsAngleTest(skiatest::Reporter* reporter) { |
| +DEF_TEST(PathOpsAngle, reporter) { |
| for (size_t index = 0; index < SK_ARRAY_COUNT(tests); ++index) { |
| const SortSetTests& test = tests[index]; |
| testOne(reporter, test); |
| @@ -399,7 +400,7 @@ static void PathOpsAngleTest(skiatest::Reporter* reporter) { |
| } |
| } |
| -static void PathOpsAngleTestOne(skiatest::Reporter* reporter) { |
| +DEF_TEST(PathOpsAngleTestOne, reporter) { |
| size_t index = 0; |
| const SortSetTests& test = tests[index]; |
| testOne(reporter, test); |
| @@ -451,7 +452,7 @@ static const double slopTests[][4] = { |
| {-2.1033774145221198, -1.4046019261273715e-008, -0.70062688352066704, -1.2706324683777995e-008}, |
| }; |
| -static void PathOpsAngleFindSlop(skiatest::Reporter* reporter) { |
| +DEF_TEST(PathOpsAngleFindSlop, reporter) { |
|
mtklein
2014/01/02 17:51:07
Can you block-comment this one out? I'm not clear
tfarina
2014/01/02 21:09:08
Done.
|
| for (size_t index = 0; index < SK_ARRAY_COUNT(slopTests); ++index) { |
| const double* slopTest = slopTests[index]; |
| double x = slopTest[0]; |
| @@ -469,10 +470,3 @@ static void PathOpsAngleFindSlop(skiatest::Reporter* reporter) { |
| } |
| } |
| #endif |
| - |
| -#include "TestClassDef.h" |
| -DEFINE_TESTCLASS_SHORT(PathOpsAngleTest) |
| - |
| -DEFINE_TESTCLASS_SHORT(PathOpsAngleTestOne) |
| - |
| -// DEFINE_TESTCLASS_SHORT(PathOpsAngleFindSlop) |