diff options
Diffstat (limited to 'tests/PathOpsBoundsTest.cpp')
-rw-r--r-- | tests/PathOpsBoundsTest.cpp | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/tests/PathOpsBoundsTest.cpp b/tests/PathOpsBoundsTest.cpp index 0c74b69b12..573a0cecf9 100644 --- a/tests/PathOpsBoundsTest.cpp +++ b/tests/PathOpsBoundsTest.cpp @@ -29,24 +29,6 @@ static const SkRect noSectTests[][2] = { static const size_t noSectTestsCount = SK_ARRAY_COUNT(noSectTests); -static const SkRect reallyEmpty[] = { - {0, 0, 0, 0}, - {1, 1, 1, 0}, - {1, 1, 0, 1}, - {1, 1, 0, 0}, - {1, 2, 3, SK_ScalarNaN}, -}; - -static const size_t emptyTestsCount = SK_ARRAY_COUNT(reallyEmpty); - -static const SkRect notReallyEmpty[] = { - {0, 0, 1, 0}, - {0, 0, 0, 1}, - {0, 0, 1, 1}, -}; - -static const size_t notEmptyTestsCount = SK_ARRAY_COUNT(notReallyEmpty); - DEF_TEST(PathOpsBounds, reporter) { for (size_t index = 0; index < sectTestsCount; ++index) { const SkPathOpsBounds& bounds1 = static_cast<const SkPathOpsBounds&>(sectTests[index][0]); @@ -75,41 +57,18 @@ DEF_TEST(PathOpsBounds, reporter) { ordinal.set(1, 2, 3, 4); bounds.add(ordinal); REPORTER_ASSERT(reporter, bounds == expected); - SkDPoint topLeft = {0, 0}; - bounds.setPointBounds(topLeft); + bounds.setEmpty(); SkDPoint botRight = {3, 4}; bounds.add(botRight); REPORTER_ASSERT(reporter, bounds == expected); - for (size_t index = 0; index < emptyTestsCount; ++index) { - const SkPathOpsBounds& bounds = static_cast<const SkPathOpsBounds&>(reallyEmpty[index]); - // SkASSERT(ValidBounds(bounds)); // don't check because test may contain nan - bool empty = bounds.isReallyEmpty(); - REPORTER_ASSERT(reporter, empty); - } - for (size_t index = 0; index < notEmptyTestsCount; ++index) { - const SkPathOpsBounds& bounds = static_cast<const SkPathOpsBounds&>(notReallyEmpty[index]); - SkASSERT(ValidBounds(bounds)); - bool empty = bounds.isReallyEmpty(); - REPORTER_ASSERT(reporter, !empty); - } const SkPoint curvePts[] = {{0, 0}, {1, 2}, {3, 4}, {5, 6}}; SkDCurve curve; - curve.fLine.set(curvePts); - curve.setLineBounds(curvePts, 1, 0, 1, &bounds); - expected.set(0, 0, 1, 2); - REPORTER_ASSERT(reporter, bounds == expected); - (curve.*SetBounds[SkPath::kLine_Verb])(curvePts, 1, 0, 1, &bounds); - REPORTER_ASSERT(reporter, bounds == expected); curve.fQuad.set(curvePts); curve.setQuadBounds(curvePts, 1, 0, 1, &bounds); expected.set(0, 0, 3, 4); REPORTER_ASSERT(reporter, bounds == expected); - (curve.*SetBounds[SkPath::kQuad_Verb])(curvePts, 1, 0, 1, &bounds); - REPORTER_ASSERT(reporter, bounds == expected); curve.fCubic.set(curvePts); curve.setCubicBounds(curvePts, 1, 0, 1, &bounds); expected.set(0, 0, 5, 6); REPORTER_ASSERT(reporter, bounds == expected); - (curve.*SetBounds[SkPath::kCubic_Verb])(curvePts, 1, 0, 1, &bounds); - REPORTER_ASSERT(reporter, bounds == expected); } |