From 6b0dcc658d08164998929e56f9ed00fb186c451f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0ach?= Date: Thu, 4 Jan 2024 16:09:06 +0100 Subject: [PATCH] Fix narrowing conversion and memory leak in tests --- tests/fff_print/test_gcode.cpp | 4 ++-- tests/libslic3r/test_config.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/fff_print/test_gcode.cpp b/tests/fff_print/test_gcode.cpp index a61ca2dd8a..593723a272 100644 --- a/tests/fff_print/test_gcode.cpp +++ b/tests/fff_print/test_gcode.cpp @@ -280,8 +280,8 @@ TEST_CASE("M73s have correct percent values", "[GCode]") { Print print; Model model; TriangleMesh test_mesh{mesh(TestMesh::cube_20x20x20)}; - const double layer_height = config.opt_float("layer_height"); - test_mesh.scale(Vec3f{1, 1, layer_height/20}); + const auto layer_height = static_cast(config.opt_float("layer_height")); + test_mesh.scale(Vec3f{1.0F, 1.0F, layer_height/20.0F}); Test::init_print({test_mesh}, print, model, config); check_m73s(print); diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 229edeebae..721d0561a4 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -110,6 +110,7 @@ TEST_CASE("Config apply dynamic to static", "[Config]") { config2->apply(config, true); CHECK(config2->opt_int("perimeters") == 2); + delete config2; } TEST_CASE("Config apply static to dynamic", "[Config]") { @@ -118,11 +119,13 @@ TEST_CASE("Config apply static to dynamic", "[Config]") { DynamicPrintConfig config2; config2.apply(*config, true); + delete config; CHECK( config2.opt_int("perimeters") == DynamicPrintConfig::full_print_config().opt_int("perimeters") ); + } TEST_CASE("Config apply dynamic to dynamic", "[Config]") { @@ -144,6 +147,7 @@ TEST_CASE("Get abs value on percent", "[Config]") { config->set_deserialize_strict("solid_infill_speed", "60"); config->set_deserialize_strict("top_solid_infill_speed", "10%"); CHECK(config->get_abs_value("top_solid_infill_speed") == 6); + delete config; } TEST_CASE("No interference between DynamicConfig objects", "[Config]") {