diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 21:45:03 +0000 |
| commit | 78e7b4e1b928fa69f672be3c743df6d6c3ecbced (patch) | |
| tree | 5bc67e556d8a790498b4700d0aa37495c89bfcd5 /tests/PathOpsCubicToQuadsTest.cpp | |
| parent | dab032a4ba4a93bff49adae064912e4bb6583784 (diff) | |
Get rid of DEFINE_TESTCLASS_SHORT() macro.
Instead tests should be written using DEF_TEST() macro, which is much
nicer and simplifies the process of setting up an unit test.
BUG=None
TEST=skpskgr_test, pathops_unittest
R=mtklein@google.com
Review URL: https://codereview.chromium.org/117863005
git-svn-id: http://skia.googlecode.com/svn/trunk@12870 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathOpsCubicToQuadsTest.cpp')
| -rw-r--r-- | tests/PathOpsCubicToQuadsTest.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/PathOpsCubicToQuadsTest.cpp b/tests/PathOpsCubicToQuadsTest.cpp index 60def6dbfe..4c0f414ad7 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) |