add asserts to point<-->verb helpers

tests/PathTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 452 matching lines @@
                 firstTime = false;
                 break;
             case SkPath::kLine_Verb:
                 REPORTER_ASSERT(reporter, !firstTime);
                 REPORTER_ASSERT(reporter, pts[1] == srcPts[0]);
                 srcPts++;
                 break;
             case SkPath::kQuad_Verb:
                 REPORTER_ASSERT(reporter, !"unexpected quad verb");
                 break;
+            case SkPath::kConic_Verb:
+                REPORTER_ASSERT(reporter, !"unexpected conic verb");
+                break;
             case SkPath::kCubic_Verb:
                 REPORTER_ASSERT(reporter, !"unexpected cubic verb");
                 break;
             case SkPath::kClose_Verb:
                 REPORTER_ASSERT(reporter, !firstTime);
                 REPORTER_ASSERT(reporter, !foundClose);
                 REPORTER_ASSERT(reporter, expectClose);
                 foundClose = true;
                 break;
             case SkPath::kDone_Verb:
@@ skipping 1479 matching lines @@
                         expectedPts[numPoints++] = lastMoveToPt;
                         expectedVerbs[numIterVerbs++] = SkPath::kMove_Verb;
                         haveMoveTo = true;
                     }
                     expectedPts[numPoints] = randomPts[(rand.nextU() >> 16) % 25];
                     expectedPts[numPoints + 1] = randomPts[(rand.nextU() >> 16) % 25];
                     p.quadTo(expectedPts[numPoints], expectedPts[numPoints + 1]);
                     numPoints += 2;
                     lastWasClose = false;
                     break;
+                case SkPath::kConic_Verb:
+                    if (!haveMoveTo) {
+                        expectedPts[numPoints++] = lastMoveToPt;
+                        expectedVerbs[numIterVerbs++] = SkPath::kMove_Verb;
+                        haveMoveTo = true;
+                    }
+                    expectedPts[numPoints] = randomPts[(rand.nextU() >> 16) % 25];
+                    expectedPts[numPoints + 1] = randomPts[(rand.nextU() >> 16) % 25];
+                    p.conicTo(expectedPts[numPoints], expectedPts[numPoints + 1],
+                              rand.nextUScalar1() * 4);
+                    numPoints += 2;
+                    lastWasClose = false;
+                    break;
                 case SkPath::kCubic_Verb:
                     if (!haveMoveTo) {
                         expectedPts[numPoints++] = lastMoveToPt;
                         expectedVerbs[numIterVerbs++] = SkPath::kMove_Verb;
                         haveMoveTo = true;
                     }
                     expectedPts[numPoints] = randomPts[(rand.nextU() >> 16) % 25];
                     expectedPts[numPoints + 1] = randomPts[(rand.nextU() >> 16) % 25];
                     expectedPts[numPoints + 2] = randomPts[(rand.nextU() >> 16) % 25];
                     p.cubicTo(expectedPts[numPoints], expectedPts[numPoints + 1],
                               expectedPts[numPoints + 2]);
                     numPoints += 3;
                     lastWasClose = false;
                     break;
                 case SkPath::kClose_Verb:
                     p.close();
                     haveMoveTo = false;
                     lastWasClose = true;
                     break;
-                default:;
+                default:
+                    SkASSERT(!"unexpected verb");
             }
             expectedVerbs[numIterVerbs++] = nextVerb;
         }
 
         iter.setPath(p);
         numVerbs = numIterVerbs;
         numIterVerbs = 0;
         int numIterPts = 0;
         SkPoint lastMoveTo;
         SkPoint lastPt;
@@ skipping 10 matching lines @@
                     numIterPts += 1;
                     break;
                 case SkPath::kLine_Verb:
                     REPORTER_ASSERT(reporter, numIterPts < numPoints + 1);
                     REPORTER_ASSERT(reporter, pts[0] == lastPt);
                     REPORTER_ASSERT(reporter, pts[1] == expectedPts[numIterPts]);
                     lastPt = pts[1];
                     numIterPts += 1;
                     break;
                 case SkPath::kQuad_Verb:
+                case SkPath::kConic_Verb:
                     REPORTER_ASSERT(reporter, numIterPts < numPoints + 2);
                     REPORTER_ASSERT(reporter, pts[0] == lastPt);
                     REPORTER_ASSERT(reporter, pts[1] == expectedPts[numIterPts]);
                     REPORTER_ASSERT(reporter, pts[2] == expectedPts[numIterPts + 1]);
                     lastPt = pts[2];
                     numIterPts += 2;
                     break;
                 case SkPath::kCubic_Verb:
                     REPORTER_ASSERT(reporter, numIterPts < numPoints + 3);
                     REPORTER_ASSERT(reporter, pts[0] == lastPt);
                     REPORTER_ASSERT(reporter, pts[1] == expectedPts[numIterPts]);
                     REPORTER_ASSERT(reporter, pts[2] == expectedPts[numIterPts + 1]);
                     REPORTER_ASSERT(reporter, pts[3] == expectedPts[numIterPts + 2]);
                     lastPt = pts[3];
                     numIterPts += 3;
                     break;
                 case SkPath::kClose_Verb:
                     REPORTER_ASSERT(reporter, pts[0] == lastMoveTo);
                     lastPt = lastMoveTo;
                     break;
-                default:;
+                default:
+                    SkASSERT(!"unexpected verb");
             }
         }
         REPORTER_ASSERT(reporter, numIterPts == numPoints);
         REPORTER_ASSERT(reporter, numIterVerbs == numVerbs);
     }
 }
 
 static void check_for_circle(skiatest::Reporter* reporter,
                              const SkPath& path,
                              bool expectedCircle,
@@ skipping 357 matching lines @@
     test_addrect_isfinite(reporter);
     test_tricky_cubic();
     test_clipped_cubic();
     test_crbug_170666();
     test_bad_cubic_crbug229478();
     test_bad_cubic_crbug234190();
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Path", PathTestClass, TestPath)