1
- use gcode:: { GCode , Mnemonic , Span , Word } ;
1
+ use gcode:: { Mnemonic , Span , Word } ;
2
2
3
3
macro_rules! smoke_test {
4
4
( $name: ident, $filename: expr) => {
@@ -26,25 +26,7 @@ smoke_test!(pi_rustlogo, "PI_rustlogo.gcode");
26
26
smoke_test ! ( insulpro_piping, "Insulpro.Piping.-.115mm.OD.-.40mm.WT.txt" ) ;
27
27
28
28
#[ test]
29
- #[ ignore]
30
29
fn expected_program_2_output ( ) {
31
- // N10 T2 M3 S447 F80
32
- // N20 G0 X112 Y-2
33
- // ;N30 Z-5
34
- // N40 G41
35
- // N50 G1 X95 Y8 M8
36
- // ;N60 X32
37
- // ;N70 X5 Y15
38
- // ;N80 Y52
39
- // N90 G2 X15 Y62 I10 J0
40
- // N100 G1 X83
41
- // N110 G3 X95 Y50 I12 J0
42
- // N120 G1 Y-12
43
- // N130 G40
44
- // N140 G0 Z100 M9
45
- // ;N150 X150 Y150
46
- // N160 M30
47
-
48
30
let src = include_str ! ( "data/program_2.gcode" ) ;
49
31
50
32
let got: Vec < _ > =
@@ -54,15 +36,6 @@ fn expected_program_2_output() {
54
36
assert_eq ! ( got. len( ) , 20 ) ;
55
37
// check lines without any comments
56
38
assert_eq ! ( got. iter( ) . filter( |l| l. comments( ) . is_empty( ) ) . count( ) , 11 ) ;
57
-
58
- let gcodes: Vec < _ > = got. iter ( ) . flat_map ( |l| l. gcodes ( ) ) . cloned ( ) . collect ( ) ;
59
- let expected = vec ! [
60
- GCode :: new( Mnemonic :: ToolChange , 2.0 , Span :: PLACEHOLDER ) ,
61
- GCode :: new( Mnemonic :: Miscellaneous , 3.0 , Span :: PLACEHOLDER )
62
- . with_argument( Word :: new( 'S' , 447.0 , Span :: PLACEHOLDER ) )
63
- . with_argument( Word :: new( 'F' , 80.0 , Span :: PLACEHOLDER ) ) ,
64
- ] ;
65
- pretty_assertions:: assert_eq!( gcodes, expected) ;
66
39
}
67
40
68
41
struct PanicOnError ;
0 commit comments