diff options
| author |  djsollen <djsollen@google.com> | 2016-01-22 06:04:55 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-22 06:04:55 -0800 |
| commit | 4c5cd7d527ed29aabfa72aa47b23a4496eeda357 (patch) | |
| tree | 49959934e26882dd38d3bb1939f7c9b60d70f10d /tests/PathOpsCubicLineIntersectionIdeas.cpp | |
| parent | 6d3cef930ad19b0f55543ca40f7a07030f4fe508 (diff) | |
Consolidate SK_CRASH and sk_throw into SK_ABORT
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1610823002
Review URL: https://codereview.chromium.org/1610823002
Diffstat (limited to 'tests/PathOpsCubicLineIntersectionIdeas.cpp')
| -rw-r--r-- | tests/PathOpsCubicLineIntersectionIdeas.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/PathOpsCubicLineIntersectionIdeas.cpp b/tests/PathOpsCubicLineIntersectionIdeas.cpp index 6aec8b148a..b23dd0ceaf 100644 --- a/tests/PathOpsCubicLineIntersectionIdeas.cpp +++ b/tests/PathOpsCubicLineIntersectionIdeas.cpp @@ -194,13 +194,13 @@ DEF_TEST(PathOpsCubicLineRoots, reporter) { if (realRoots == 3) { smallest = SkTMin(smallest, allRoots[2]); } - SK_ALWAYSBREAK(smallest < 0); - SK_ALWAYSBREAK(smallest >= -1); + SkASSERT_RELEASE(smallest < 0); + SkASSERT_RELEASE(smallest >= -1); largeBits = 0; } else { frexp(largest, &largeBits); - SK_ALWAYSBREAK(largeBits >= 0); - SK_ALWAYSBREAK(largeBits < 256); + SkASSERT_RELEASE(largeBits >= 0); + SkASSERT_RELEASE(largeBits < 256); } double step = 1e-6; if (largeBits > 21) { @@ -222,7 +222,7 @@ DEF_TEST(PathOpsCubicLineRoots, reporter) { break; } step *= 1.5; - SK_ALWAYSBREAK(step < 1); + SkASSERT_RELEASE(step < 1); } while (true); worstStep[largeBits] = SkTMax(worstStep[largeBits], diff); #if 0 @@ -256,11 +256,11 @@ static double testOneFailure(const CubicLineFailures& failure) { double allRoots[3] = {0}, validRoots[3] = {0}; int realRoots = SkDCubic::RootsReal(A, B, C, D, allRoots); int valid = SkDQuad::AddValidTs(allRoots, realRoots, validRoots); - SK_ALWAYSBREAK(valid == 1); - SK_ALWAYSBREAK(realRoots != 1); + SkASSERT_RELEASE(valid == 1); + SkASSERT_RELEASE(realRoots != 1); double t = validRoots[0]; SkDPoint calcPt = cubic.ptAtT(t); - SK_ALWAYSBREAK(!calcPt.approximatelyEqual(pt)); + SkASSERT_RELEASE(!calcPt.approximatelyEqual(pt)); int iters = 0; double newT = binary_search(cubic, 0.1, pt, t, &iters); return newT; @@ -271,7 +271,7 @@ DEF_TEST(PathOpsCubicLineFailures, reporter) { for (int index = 0; index < cubicLineFailuresCount; ++index) { const CubicLineFailures& failure = cubicLineFailures[index]; double newT = testOneFailure(failure); - SK_ALWAYSBREAK(newT >= 0); + SkASSERT_RELEASE(newT >= 0); } } @@ -279,5 +279,5 @@ DEF_TEST(PathOpsCubicLineOneFailure, reporter) { return; // disable for now const CubicLineFailures& failure = cubicLineFailures[1]; double newT = testOneFailure(failure); - SK_ALWAYSBREAK(newT >= 0); + SkASSERT_RELEASE(newT >= 0); } |