Test coverage for one more error, excluding unreachable block from co…

…verage
uber · Nov 25, 2023 · f0f1b45 · f0f1b45
1 parent a2adc04
commit f0f1b45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/apps/testapps/testPolyfillInternal.c b/src/apps/testapps/testPolyfillInternal.c
@@ -89,6 +89,21 @@ SUITE(polyfillInternal) {
         H3_SET_BASE_CELL(cell, 123);
         iter.cell = cell;
 
+        iterStepPolygonCompact(&iter);
+        t_assert(iter.error == E_CELL_INVALID,
+                 "Got expected error for invalid cell");
+        t_assert(iter.cell == H3_NULL,
+                 "Got null output for invalid cell at res");
+
+        iter = iterInitPolygonCompact(&sfGeoPolygon, 9, CONTAINMENT_FULL);
+        t_assertSuccess(iter.error);
+
+        // Give the iterator a cell with a bad base cell, at the target res
+        // (full containment)
+        cell = 0x89283470003ffff;
+        H3_SET_BASE_CELL(cell, 123);
+        iter.cell = cell;
+
         iterStepPolygonCompact(&iter);
         t_assert(iter.error == E_CELL_INVALID,
                  "Got expected error for invalid cell");

diff --git a/src/h3lib/lib/polyfill.c b/src/h3lib/lib/polyfill.c
@@ -457,7 +457,9 @@ void iterStepPolygonCompact(IterCellsPolygonCompact *iter) {
                 }
                 BBox bbox;
                 H3Error bboxErr = cellToBBox(cell, &bbox, false);
-                if (bboxErr) {
+                if (NEVER(bboxErr != E_SUCCESS)) {
+                    // Should be unreachable - invalid cells would be caught in
+                    // the previous boundaryErr
                     iterErrorPolygonCompact(iter, bboxErr);
                     return;
                 }