3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed unit tests after the previous commit.

Browse Source
This commit is contained in:
Lukáš Hejl 2021-09-09 12:01:31 +02:00
parent d2a185ddb6
commit e520454c3e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/combineinfill.t
View File

@ -36,7 +36,15 @@ plan tests => 8;
$layer_infill{$self->Z} = 1; $layer_infill{$self->Z} = 1;
} }
} }
$layers{$args->{Z}} = 1 if $cmd eq 'G1' && $info->{dist_Z} > 0; # Previously, all G-code commands had a fixed number of decimal points with means with redundant zeros after decimal points.
# We changed this behavior and got rid of these redundant padding zeros, which caused this test to fail
# because the position in Z-axis is compared as a string, and previously, G-code contained the following two commands:
# "G1 Z5 F5000 ; lift nozzle"
# "G1 Z5.000 F7800.000"
# That has a different Z-axis position from the view of string comparisons of floating-point numbers.
# To correct the computation of the number of printed layers, even in the case of string comparisons of floating-point numbers,
# we filtered out the G-code command with the commend 'lift nozzle'.
$layers{$args->{Z}} = 1 if $cmd eq 'G1' && $info->{dist_Z} && index($info->{comment}, 'lift nozzle') == -1;
}); });
my $layers_with_perimeters = scalar(keys %layer_infill); my $layers_with_perimeters = scalar(keys %layer_infill);

8
tests/fff_print/test_gcodewriter.cpp
View File

@ -78,13 +78,13 @@ SCENARIO("set_speed emits values with fixed-point output.", "[GCodeWriter]") {
} }
} }
WHEN("set_speed is called to set speed to 1") { WHEN("set_speed is called to set speed to 1") {
THEN("Output string is G1 F1.000") { THEN("Output string is G1 F1") {
REQUIRE_THAT(writer.set_speed(1.0), Catch::Equals("G1 F1.000\n")); REQUIRE_THAT(writer.set_speed(1.0), Catch::Equals("G1 F1\n"));
} }
} }
WHEN("set_speed is called to set speed to 203.200022") { WHEN("set_speed is called to set speed to 203.200022") {
THEN("Output string is G1 F203.200") { THEN("Output string is G1 F203.2") {
REQUIRE_THAT(writer.set_speed(203.200022), Catch::Equals("G1 F203.200\n")); REQUIRE_THAT(writer.set_speed(203.200022), Catch::Equals("G1 F203.2\n"));
} }
} }
WHEN("set_speed is called to set speed to 203.200522") { WHEN("set_speed is called to set speed to 203.200522") {