added tests

Author: runette

source/pdal/pdalc_pointview.cpp

@@ -209,8 +209,12 @@ extern "C"
 
     uint64_t PDALGetMeshSize(PDALPointViewPtr view)
     {
-        pdal::capi::PointView* wrapper = reinterpret_cast<pdal::capi::PointView *>(view);
-        pdal::TriangularMesh* mesh=(*wrapper)->mesh();
+        pdal::capi::PointView *wrapper = reinterpret_cast<pdal::capi::PointView *>(view);
+        pdal::TriangularMesh* mesh = nullptr;
+
+        if (wrapper && *wrapper) {
+            mesh=(*wrapper)->mesh();
+        }
 
         return mesh ? static_cast<uint64_t>((*mesh).size()) : 0;
     }

tests/data/simple-reproject.json.in

@@ -7,6 +7,9 @@
     {
       "type": "filters.reprojection",
       "out_srs": "EPSG:4326"
+    },
+    {
+      "type": "filters.delaunay"
     }
   ]
 }

tests/pdal/test_pdalc_pointview.c.in

@@ -172,7 +172,8 @@ TEST testPDALGetPointViewSize(void)
 
 TEST testPDALGetMeshSize(void)
 {
-    ASSERT_EQ(0, PDALGetMeshSize(NULL));
+    uint64_t size = PDALGetMeshSize(NULL);
+    ASSERT(size == 0);
 
     PDALResetPointViewIterator(gPointViewIterator);
     bool hasNext = PDALHasNextPointView(gPointViewIterator);
@@ -184,9 +185,9 @@ TEST testPDALGetMeshSize(void)
     // Dispose view before assertion to avoid CWE-404
     // See http://cwe.mitre.org/data/definitions/404.html
     // See https://scan4.coverity.com/doc/en/cov_checker_ref.html#static_checker_RESOURCE_LEAK
-    size_t size = PDALGetMeshSize(view);
+    size = PDALGetMeshSize(view);
     PDALDisposePointView(view);
-    ASSERT(size == 0);
+    ASSERT(size == 2114);
 
 
     PASS();
@@ -675,20 +676,55 @@ TEST testPDALGetAllPackedPoints(void)
     PASS();
 }
 
+TEST testPDALGetAllTriangles(void)
+{
+    PDALResetPointViewIterator(gPointViewIterator);
+    bool hasNext = PDALHasNextPointView(gPointViewIterator);
+    ASSERT(hasNext);
+
+    PDALPointViewPtr view = PDALGetNextPointView(gPointViewIterator);
+    ASSERT(view);
+
+    uint64_t numPoints = PDALGetMeshSize(view);
+
+    if (numPoints == 0)
+    {
+        PDALDisposePointView(view);
+        FAILm("PDALGetMeshSize returned tri size of zero for a valid view");
+    }
+
+    char *actualPoints = calloc(numPoints, 12);
+
+    if (!actualPoints)
+    {
+        PDALDisposePointView(view);
+        FAILm("Could not allocate packed point list buffer");
+    }
+
+    uint64_t actualSize = PDALGetAllTriangles(view, actualPoints);
+    ASSERT_EQ(actualSize, 25368);
+
+    free(actualPoints);
+    PDALDisposePointView(view);
+    PASS();
+}
+
 GREATEST_SUITE(test_pdalc_pointview)
 {
     SET_SETUP(setup_test_pdalc_pointview, NULL);
     SET_TEARDOWN(teardown_test_pdalc_pointview, NULL);
 
     RUN_TEST(testPDALGetPointViewId);
     RUN_TEST(testPDALGetPointViewSize);
+    RUN_TEST(testPDALGetMeshSize);
     RUN_TEST(testPDALIsPointViewEmpty);
     RUN_TEST(testPDALClonePointView);
     RUN_TEST(testPDALGetPointViewProj4);
     RUN_TEST(testPDALGetPointViewWkt);
     RUN_TEST(testPDALGetPointViewLayout);
     RUN_TEST(testPDALGetPackedPoint);
     RUN_TEST(testPDALGetAllPackedPoints);
+    RUN_TEST(testPDALGetAllTriangles);
 
     SET_SETUP(NULL, NULL);
     SET_TEARDOWN(NULL, NULL);