Index: tests/PathOpsDQuadTest.cpp |
diff --git a/tests/PathOpsDQuadTest.cpp b/tests/PathOpsDQuadTest.cpp |
index e6f1deb72f1688d1f0c48c80c65b66569a1570ef..80d81e81296497cf83f569049dcbdaa2767429ce 100644 |
--- a/tests/PathOpsDQuadTest.cpp |
+++ b/tests/PathOpsDQuadTest.cpp |
@@ -9,6 +9,7 @@ |
#include "SkPathOpsQuad.h" |
#include "SkRRect.h" |
#include "Test.h" |
+#include "TestClassDef.h" |
static const SkDQuad tests[] = { |
{{{1, 1}, {2, 1}, {0, 2}}}, |
@@ -36,7 +37,7 @@ static const SkDPoint outPoint[]= { |
static const size_t tests_count = SK_ARRAY_COUNT(tests); |
-static void PathOpsDQuadTest(skiatest::Reporter* reporter) { |
+DEF_TEST(PathOpsDQuad, reporter) { |
for (size_t index = 0; index < tests_count; ++index) { |
const SkDQuad& quad = tests[index]; |
SkASSERT(ValidQuad(quad)); |
@@ -53,7 +54,7 @@ static void PathOpsDQuadTest(skiatest::Reporter* reporter) { |
} |
} |
-static void PathOpsRRectTest(skiatest::Reporter* reporter) { |
+DEF_TEST(PathOpsRRect, reporter) { |
SkPath path; |
SkRRect rRect; |
SkRect rect = {135, 143, 250, 177}; |
@@ -61,8 +62,3 @@ static void PathOpsRRectTest(skiatest::Reporter* reporter) { |
rRect.setRectRadii(rect, radii); |
path.addRRect(rRect); |
} |
- |
-#include "TestClassDef.h" |
-DEFINE_TESTCLASS_SHORT(PathOpsDQuadTest) |
- |
-DEFINE_TESTCLASS_SHORT(PathOpsRRectTest) |