star-enclosures-3d

commit f67cf71a7c737b94255788e81d37e5a9bb794685
parent fdf566d0605cb2e9f5a64e3f82de93a195ba1fe6
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 19 Aug 2020 18:58:20 +0200

Change asserts to checks that remain effective in release

Diffstat:
M
src/test_senc3d_cube_behind_cube.c
 | 
4
++--
M
src/test_senc3d_cube_in_cube.c
 | 
12
++++++------
M
src/test_senc3d_cube_on_cube.c
 | 
11
++++++++---

3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/test_senc3d_cube_behind_cube.c b/src/test_senc3d_cube_behind_cube.c
@@ -266,7 +266,7 @@ main(int argc, char** argv)
     struct senc3d_enclosure_header header;
     OK(senc3d_scene_get_enclosure(scn, i, &enclosure));
     OK(senc3d_enclosure_get_header(enclosure, &header));
-    ASSERT(header.enclosed_media_count == 1);
+    CHK(header.enclosed_media_count == 1);
     OK(senc3d_enclosure_ref_put(enclosure));
   }
 
@@ -294,7 +294,7 @@ main(int argc, char** argv)
     OK(senc3d_scene_get_enclosure(scn, i, &enclosure));
     OK(senc3d_enclosure_get_header(enclosure, &header));
     /* Inside enclosures contain 1 single media */
-    ASSERT(header.enclosed_media_count == (header.is_infinite ? 2u : 1u));
+    CHK(header.enclosed_media_count == (header.is_infinite ? 2u : 1u));
     OK(senc3d_enclosure_ref_put(enclosure));
   }
 
diff --git a/src/test_senc3d_cube_in_cube.c b/src/test_senc3d_cube_in_cube.c
@@ -258,10 +258,10 @@ main(int argc, char** argv)
     unsigned m;
     OK(senc3d_scene_get_enclosure(scn, e, &enclosure));
     OK(senc3d_enclosure_get_header(enclosure, &header));
-    ASSERT(header.enclosed_media_count == 1);
+    CHK(header.enclosed_media_count == 1);
     OK(senc3d_enclosure_get_medium(enclosure, 0, &m));
-    ASSERT(m <= 1);
-    ASSERT((m == 0) == (header.primitives_count == cube_in_cube_2_triangles_count));
+    CHK(m <= 1);
+    CHK((m == 0) == (header.primitives_count == cube_in_cube_2_triangles_count));
     OK(senc3d_enclosure_ref_put(enclosure));
   }
 
@@ -291,11 +291,11 @@ main(int argc, char** argv)
     struct senc3d_enclosure_header header;
     OK(senc3d_scene_get_enclosure(scn, e, &enclosure));
     OK(senc3d_enclosure_get_header(enclosure, &header));
-    ASSERT(header.enclosed_media_count <= 2);
+    CHK(header.enclosed_media_count <= 2);
     if(header.enclosed_media_count == 2) {
       /* A single internal enclosure has 2 media */
-      ASSERT(!header.is_infinite);
-      ASSERT(e2 == ecount); (void)e2;
+      CHK(!header.is_infinite);
+      CHK(e2 == ecount);
       e2 = e;
     }
     OK(senc3d_enclosure_ref_put(enclosure));
diff --git a/src/test_senc3d_cube_on_cube.c b/src/test_senc3d_cube_on_cube.c
@@ -185,9 +185,14 @@ main(int argc, char** argv)
     OK(senc3d_enclosure_get_header(enclosure, &header));
     CHK(header.enclosed_media_count == 1);
     OK(senc3d_enclosure_get_medium(enclosure, 0, &m));
-    if(header.is_infinite) ASSERT(m == 2); /* External */
-    else if(header.primitives_count == 12) ASSERT(m == 0); /* Internal */
-    else  ASSERT(m == 1); /* In between */
+    if(header.is_infinite) {
+      CHK(m == 2); /* External */
+    }
+    else if(header.primitives_count == 12) {
+      CHK(m == 0); /* Internal */
+    } else {
+      CHK(m == 1); /* In between */
+    }
     OK(senc3d_enclosure_ref_put(enclosure));
 #ifdef DUMP_ENCLOSURES
     snprintf(name, sizeof(name), "test_cube_on_cube_%u.obj", e);