| Index: tests/PathOpsDTriangleTest.cpp
|
| diff --git a/tests/PathOpsDTriangleTest.cpp b/tests/PathOpsDTriangleTest.cpp
|
| index 6ee05847e5d262414f75c29f65e4eca8da03d8fc..1a06287c2f7e05b54f4be299337b59abb159066e 100644
|
| --- a/tests/PathOpsDTriangleTest.cpp
|
| +++ b/tests/PathOpsDTriangleTest.cpp
|
| @@ -7,6 +7,7 @@
|
| #include "PathOpsTestCommon.h"
|
| #include "SkPathOpsTriangle.h"
|
| #include "Test.h"
|
| +#include "TestClassDef.h"
|
|
|
| static const SkDTriangle tests[] = {
|
| {{{2, 0}, {3, 1}, {2, 2}}},
|
| @@ -28,7 +29,7 @@ static const SkDPoint outPoint[] = {
|
|
|
| static const size_t tests_count = SK_ARRAY_COUNT(tests);
|
|
|
| -static void PathOpsTriangleUtilitiesTest(skiatest::Reporter* reporter) {
|
| +DEF_TEST(PathOpsTriangleUtilities, reporter) {
|
| for (size_t index = 0; index < tests_count; ++index) {
|
| const SkDTriangle& triangle = tests[index];
|
| SkASSERT(ValidTriangle(triangle));
|
| @@ -55,7 +56,7 @@ static const SkDTriangle oneOff[] = {
|
|
|
| static const size_t oneOff_count = SK_ARRAY_COUNT(oneOff);
|
|
|
| -static void PathOpsTriangleOneOffTest(skiatest::Reporter* reporter) {
|
| +DEF_TEST(PathOpsTriangleOneOff, reporter) {
|
| for (size_t index = 0; index < oneOff_count; ++index) {
|
| const SkDTriangle& triangle = oneOff[index];
|
| SkASSERT(ValidTriangle(triangle));
|
| @@ -68,8 +69,3 @@ static void PathOpsTriangleOneOffTest(skiatest::Reporter* reporter) {
|
| }
|
| }
|
| }
|
| -
|
| -#include "TestClassDef.h"
|
| -DEFINE_TESTCLASS_SHORT(PathOpsTriangleUtilitiesTest)
|
| -
|
| -DEFINE_TESTCLASS_SHORT(PathOpsTriangleOneOffTest)
|
|
|