t tests changed so they don't fail on the extruder number check

5 files changed, 16 insertions, 4 deletions

diff --git a/t/combineinfill.t b/t/combineinfill.t
index e94cf9eb5..5402a84f5 100644
--- a/t/combineinfill.t
+++ b/t/combineinfill.t
@@ -57,7 +57,7 @@ plan tests => 8;
     my $config = Slic3r::Config::new_from_defaults;
     $config->set('layer_height', 0.2);
     $config->set('first_layer_height', 0.2);
-    $config->set('nozzle_diameter', [0.5]);
+    $config->set('nozzle_diameter', [0.5,0.5,0.5,0.5]);
     $config->set('infill_every_layers', 2);
     $config->set('perimeter_extruder', 1);
     $config->set('infill_extruder', 2);
diff --git a/t/custom_gcode.t b/t/custom_gcode.t
index bafcd4610..31d1d48e0 100644
--- a/t/custom_gcode.t
+++ b/t/custom_gcode.t
@@ -49,7 +49,6 @@ use Slic3r::Test;
     my $parser = Slic3r::GCode::PlaceholderParser->new;
     my $config = Slic3r::Config::new_from_defaults;
     $config->set('printer_notes', '  PRINTER_VENDOR_PRUSA3D  PRINTER_MODEL_MK2  ');
-    $config->set('nozzle_diameter', [0.6, 0.6, 0.6, 0.6]);
     $parser->apply_config($config);
     $parser->set('foo' => 0);
     $parser->set('bar' => 2);
@@ -123,6 +122,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config->new;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('extruder', 2);
     $config->set('first_layer_temperature', [200,205]);
     
@@ -204,6 +204,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config->new;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6,0.6]);
     $config->set('start_gcode', qq!
 ;substitution:{if infill_extruder==1}if block
          {elsif infill_extruder==2}elsif block 1
@@ -228,6 +229,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config->new;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('start_gcode', 
         ';substitution:{if infill_extruder==1}{if perimeter_extruder==1}block11{else}block12{endif}' .
         '{elsif infill_extruder==2}{if perimeter_extruder==1}block21{else}block22{endif}' .
diff --git a/t/fill.t b/t/fill.t
index a6fe8619c..dd9eee487 100644
--- a/t/fill.t
+++ b/t/fill.t
@@ -164,6 +164,7 @@ SKIP:
 
 for my $pattern (qw(rectilinear honeycomb hilbertcurve concentric)) {
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.4,0.4,0.4,0.4]);
     $config->set('fill_pattern', $pattern);
     $config->set('external_fill_pattern', $pattern);
     $config->set('perimeters', 1);
@@ -195,6 +196,7 @@ for my $pattern (qw(rectilinear honeycomb hilbertcurve concentric)) {
 
 {
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.4,0.4,0.4,0.4]);
     $config->set('infill_only_where_needed', 1);
     $config->set('bottom_solid_layers', 0);
     $config->set('infill_extruder', 2);
@@ -276,7 +278,7 @@ for my $pattern (qw(rectilinear honeycomb hilbertcurve concentric)) {
     $config->set('fill_density', 0);
     $config->set('layer_height', 0.2);
     $config->set('first_layer_height', 0.2);
-    $config->set('nozzle_diameter', [0.35]);
+    $config->set('nozzle_diameter', [0.35,0.35,0.35,0.35]);
     $config->set('infill_extruder', 2);
     $config->set('solid_infill_extruder', 2);
     $config->set('infill_extrusion_width', 0.52);
diff --git a/t/multi.t b/t/multi.t
index 49d35d907..75ce0c286 100644
--- a/t/multi.t
+++ b/t/multi.t
@@ -16,6 +16,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('raft_layers', 2);
     $config->set('infill_extruder', 2);
     $config->set('solid_infill_extruder', 3);
@@ -89,6 +90,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('support_material_extruder', 3);
     
     my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
@@ -97,6 +99,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config->new;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('extruder', 2);
     
     my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
@@ -105,6 +108,7 @@ use Slic3r::Test;
 
 {
     my $config = Slic3r::Config->new;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('perimeter_extruder', 2);
     $config->set('infill_extruder', 2);
     $config->set('support_material_extruder', 2);
@@ -126,6 +130,7 @@ use Slic3r::Test;
     $upper_config->set('bottom_solid_layers', 1);
     $upper_config->set('top_solid_layers', 0);
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('fill_density', 0);
     $config->set('solid_infill_speed', 99);
     $config->set('top_solid_infill_speed', 99);
@@ -172,6 +177,7 @@ use Slic3r::Test;
     my $object = $model->objects->[0];
     
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('layer_height', 0.4);
     $config->set('first_layer_height', '100%');
     $config->set('skirts', 0);
diff --git a/t/retraction.t b/t/retraction.t
index d7f1ea145..6e6a130ca 100644
--- a/t/retraction.t
+++ b/t/retraction.t
@@ -95,6 +95,7 @@ use Slic3r::Test qw(_eq);
         1;
     };
 
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('first_layer_height',      $config->layer_height);
     $config->set('first_layer_speed',       '100%');
     $config->set('start_gcode',             '');  # to avoid dealing with the nozzle lift in start G-code
@@ -207,6 +208,7 @@ use Slic3r::Test qw(_eq);
 
 {
     my $config = Slic3r::Config::new_from_defaults;
+    $config->set('nozzle_diameter', [0.6,0.6,0.6,0.6]);
     $config->set('start_gcode', '');
     $config->set('retract_lift', [3, 4]);
     
@@ -255,4 +257,4 @@ use Slic3r::Test qw(_eq);
         'Z is not lifted above the configured value for 2. extruder';
 }
 
-__END__
\ No newline at end of file
+__END__