| Index: tests/PathOpsCubicToQuadsTest.cpp
|
| diff --git a/tests/PathOpsCubicToQuadsTest.cpp b/tests/PathOpsCubicToQuadsTest.cpp
|
| index 60def6dbfeca3c82a4a0f619ee1d79886098054a..4c0f414ad77ab286b79c053d9e2204ff66d43cae 100644
|
| --- a/tests/PathOpsCubicToQuadsTest.cpp
|
| +++ b/tests/PathOpsCubicToQuadsTest.cpp
|
| @@ -12,6 +12,7 @@
|
| #include "SkPathOpsRect.h"
|
| #include "SkReduceOrder.h"
|
| #include "Test.h"
|
| +#include "TestClassDef.h"
|
|
|
| static void test(skiatest::Reporter* reporter, const SkDCubic* cubics, const char* name,
|
| int firstTest, size_t testCount) {
|
| @@ -93,7 +94,7 @@ static void testC(skiatest::Reporter* reporter, const SkDCubic(* cubics)[2], con
|
| }
|
| }
|
|
|
| -static void CubicToQuads_Test(skiatest::Reporter* reporter) {
|
| +DEF_TEST(CubicToQuads, reporter) {
|
| enum {
|
| RunAll,
|
| RunPointDegenerates,
|
| @@ -187,21 +188,12 @@ static void oneOff(skiatest::Reporter* reporter, size_t x) {
|
| if (false) SkDebugf("%s quads=%d\n", __FUNCTION__, quads.count());
|
| }
|
|
|
| -static void CubicsToQuadratics_OneOffTests(skiatest::Reporter* reporter) {
|
| +DEF_TEST(CubicsToQuadratics_OneOff_Loop, reporter) {
|
| for (size_t x = 0; x < localsCount; ++x) {
|
| oneOff(reporter, x);
|
| }
|
| }
|
|
|
| -static void CubicsToQuadratics_OneOffTest(skiatest::Reporter* reporter) {
|
| +DEF_TEST(CubicsToQuadratics_OneOff_Single, reporter) {
|
| oneOff(reporter, 0);
|
| }
|
| -
|
| -static void PathOpsCubicToQuadsTest(skiatest::Reporter* reporter) {
|
| - CubicToQuads_Test(reporter);
|
| - CubicsToQuadratics_OneOffTest(reporter);
|
| - CubicsToQuadratics_OneOffTests(reporter);
|
| -}
|
| -
|
| -#include "TestClassDef.h"
|
| -DEFINE_TESTCLASS_SHORT(PathOpsCubicToQuadsTest)
|
|
|