star-cad

commit b0747383f216360d9c1045ac9e0b9a579aa3192f
parent 23215e478b68d5d892c601469daad82069fa5a41
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri, 12 Jul 2024 10:19:26 +0200

Get rid of custom logging in tests

Diffstat:
M
src/test_api.c
 | 
12
++++--------
M
src/test_export.c
 | 
6
+-----
M
src/test_lifetime.c
 | 
1
-
M
src/test_partition.c
 | 
18
++++++------------

4 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/test_api.c b/src/test_api.c
@@ -21,7 +21,6 @@
 #include <rsys/str.h>
 #include <rsys/math.h>
 #include <rsys/mem_allocator.h>
-#include <rsys/logger.h>
 #include <rsys/dynamic_array_double.h>
 
 #include <stdlib.h>
@@ -54,7 +53,6 @@ main(int argc, char* argv[])
   struct scad_geometry* geoms[2];
   struct scad_geometry* out_geoms[2];
   struct mem_allocator allocator;
-  struct logger logger;
   struct darray_double trg;
   struct scad_options options = SCAD_DEFAULT_OPTIONS;
   const char* name;
@@ -63,7 +61,6 @@ main(int argc, char* argv[])
   (void)argc; (void)argv;
 
   OK(mem_init_proxy_allocator(&allocator, &mem_default_allocator));
-  OK(logger_init(&allocator, &logger));
 
   /* cannot call any API function before a successful call to scad_initialize */
   BAD(scad_finalize());
@@ -82,7 +79,7 @@ main(int argc, char* argv[])
   BAD(scad_geometry_get_name(geom, &name));
 
   /* cannot call any API function after a successful call to scad_finalize */
-  OK(scad_initialize(&logger, &allocator, 3));
+  OK(scad_initialize(NULL, &allocator, 3));
   OK(scad_finalize());
 
   BAD(scad_finalize());
@@ -100,10 +97,10 @@ main(int argc, char* argv[])
   BAD(scad_run_ui());
   BAD(scad_geometry_get_name(geom, &name));
 
-  BAD(scad_initialize(&logger, &allocator, 4));
-  BAD(scad_initialize(&logger, &allocator, -1));
+  BAD(scad_initialize(NULL, &allocator, 4));
+  BAD(scad_initialize(NULL, &allocator, -1));
 
-  OK(scad_initialize(&logger, &allocator, 3));
+  OK(scad_initialize(NULL, &allocator, 3));
 
   OK(scad_set_options(NULL));
   OK(scad_set_options(&options));
@@ -296,7 +293,6 @@ main(int argc, char* argv[])
   OK(scad_geometry_get_name(geom2, &name));
 
   OK(scad_finalize());
-  logger_release(&logger);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
diff --git a/src/test_export.c b/src/test_export.c
@@ -20,7 +20,6 @@
 #include <rsys/rsys.h>
 #include <rsys/math.h>
 #include <rsys/mem_allocator.h>
-#include <rsys/logger.h>
 
 #include <stdlib.h>
 
@@ -36,13 +35,11 @@ main(int argc, char* argv[])
   struct scad_geometry* cube2 = NULL;
   struct scad_geometry* geoms[2];
   struct mem_allocator allocator;
-  struct logger logger;
 
   (void)argc; (void)argv;
 
   OK(mem_init_proxy_allocator(&allocator, &mem_default_allocator));
-  OK(logger_init(&allocator, &logger));
-  OK(scad_initialize(&logger, &allocator, 3));
+  OK(scad_initialize(NULL, &allocator, 3));
 
   OK(scad_add_rectangle("rectangle", p1, d1, &rectangle));
   OK(scad_add_box("cube", p1, d1, &cube));
@@ -67,7 +64,6 @@ main(int argc, char* argv[])
 
   OK(scad_finalize());
 
-  logger_release(&logger);
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
   CHK(mem_allocated_size() == 0);
diff --git a/src/test_lifetime.c b/src/test_lifetime.c
@@ -21,7 +21,6 @@
 #include <rsys/str.h>
 #include <rsys/math.h>
 #include <rsys/mem_allocator.h>
-#include <rsys/logger.h>
 #include <rsys/dynamic_array_double.h>
 
 #include <stdlib.h>
diff --git a/src/test_partition.c b/src/test_partition.c
@@ -22,7 +22,6 @@
 #include <rsys/rsys.h>
 #include <rsys/math.h>
 #include <rsys/mem_allocator.h>
-#include <rsys/logger.h>
 #include <rsys/double3.h>
 
 #include <stdlib.h>
@@ -32,8 +31,7 @@ static res_T
 two_geoms
   (double x,
    const int allow_overlapping,
-   struct mem_allocator* allocator,
-   struct logger* logger)
+   struct mem_allocator* allocator)
 {
   double p0[3] = {0, 0, 2};
   double d0[3] = {1, 1, 1};
@@ -46,7 +44,7 @@ two_geoms
   char name[64];
   res_T res;
 
-  OK(scad_initialize(logger, allocator, 3));
+  OK(scad_initialize(NULL, allocator, 3));
 
   /* set position for cube #2 */
   d3(p2, x, 0.25, 0.25);
@@ -95,25 +93,21 @@ int
 main(int argc, char* argv[])
 {
   struct mem_allocator allocator;
-  struct logger logger;
   res_T res = RES_OK;
 
   (void)argc; (void)argv;
 
   OK(mem_init_proxy_allocator(&allocator, &mem_default_allocator));
-  OK(logger_init(&allocator, &logger));
 
   /* First with distant geometries */
-  OK(two_geoms(1.1, 0, &allocator, &logger));
+  OK(two_geoms(1.1, 0, &allocator));
 
   /* First with contacting geometries */
-  OK(two_geoms(1, 0, &allocator, &logger));
+  OK(two_geoms(1, 0, &allocator));
 
   /* First with overlapping geometries */
-  BAD(two_geoms(0.9, 0, &allocator, &logger));
-  OK(two_geoms(0.9, 1, &allocator, &logger));
-
-  logger_release(&logger);
+  BAD(two_geoms(0.9, 0, &allocator));
+  OK(two_geoms(0.9, 1, &allocator));
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);