Index: tests/PathOpsCubicLineIntersectionTest.cpp |
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp |
index 520ba97e277373ba6d7047b5b3b74250526f8b25..a021454cb647552f58a65731d46dd7011b207863 100644 |
--- a/tests/PathOpsCubicLineIntersectionTest.cpp |
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp |
@@ -10,6 +10,7 @@ |
#include "SkPathOpsLine.h" |
#include "SkReduceOrder.h" |
#include "Test.h" |
+#include "TestClassDef.h" |
static struct lineCubic { |
SkDCubic cubic; |
@@ -76,7 +77,7 @@ static void testOne(skiatest::Reporter* reporter, int iIndex) { |
} |
} |
-static void PathOpsCubicLineIntersectionTest(skiatest::Reporter* reporter) { |
+DEF_TEST(PathOpsCubicLineIntersection, reporter) { |
for (size_t index = 0; index < lineCubicTests_count; ++index) { |
int iIndex = static_cast<int>(index); |
testOne(reporter, iIndex); |
@@ -84,7 +85,7 @@ static void PathOpsCubicLineIntersectionTest(skiatest::Reporter* reporter) { |
} |
} |
-static void PathOpsCubicLineIntersectionOneOffTest(skiatest::Reporter* reporter) { |
+DEF_TEST(PathOpsCubicLineIntersectionOneOff, reporter) { |
int iIndex = 0; |
testOne(reporter, iIndex); |
const SkDCubic& cubic = lineCubicTests[iIndex].cubic; |
@@ -108,8 +109,3 @@ static void PathOpsCubicLineIntersectionOneOffTest(skiatest::Reporter* reporter) |
sect.distance(i.pt(0)), cubic[3].distance(prevL)); |
#endif |
} |
- |
-#include "TestClassDef.h" |
-DEFINE_TESTCLASS_SHORT(PathOpsCubicLineIntersectionTest) |
- |
-DEFINE_TESTCLASS_SHORT(PathOpsCubicLineIntersectionOneOffTest) |