@@ -114,16 +114,39 @@ func TestNewSketchWrongMain(t *testing.T) {
114
114
}
115
115
116
116
func TestNewSketchCasingWrong (t * testing.T ) {
117
- sketchPath := paths .New ("testdata" , "SketchWithWrongMain" )
118
- sketch , err := New (sketchPath )
119
- assert .Nil (t , sketch )
120
- assert .Error (t , err )
121
- assert .IsType (t , & InvalidSketchFolderNameError {}, err )
122
- e := err .(* InvalidSketchFolderNameError )
123
- assert .NotNil (t , e .Sketch )
124
- sketchPath , _ = sketchPath .Abs ()
125
- expectedError := fmt .Sprintf ("no valid sketch found in %s: missing %s" , sketchPath .String (), sketchPath .Join (sketchPath .Base ()+ ".ino" ))
126
- assert .EqualError (t , err , expectedError )
117
+ {
118
+ sketchPath := paths .New ("testdata" , "SketchWithWrongMain" )
119
+ sketch , err := New (sketchPath )
120
+ assert .Nil (t , sketch )
121
+ assert .Error (t , err )
122
+ _ , ok := err .(* InvalidSketchFolderNameError )
123
+ assert .False (t , ok )
124
+ sketchPath , _ = sketchPath .Abs ()
125
+ expectedError := fmt .Sprintf ("main file missing from sketch: %s" , sketchPath .Join (sketchPath .Base ()+ ".ino" ))
126
+ assert .EqualError (t , err , expectedError )
127
+ }
128
+ {
129
+ sketchPath := paths .New ("testdata" , "SketchWithWrongMain" , "main.ino" )
130
+ sketch , err := New (sketchPath )
131
+ assert .Nil (t , sketch )
132
+ assert .Error (t , err )
133
+ _ , ok := err .(* InvalidSketchFolderNameError )
134
+ assert .False (t , ok )
135
+ sketchPath , _ = sketchPath .Parent ().Abs ()
136
+ expectedError := fmt .Sprintf ("main file missing from sketch: %s" , sketchPath .Join (sketchPath .Base ()+ ".ino" ))
137
+ assert .EqualError (t , err , expectedError )
138
+ }
139
+ {
140
+ sketchPath := paths .New ("testdata" , "non-existent" )
141
+ sketch , skerr := New (sketchPath )
142
+ require .Nil (t , sketch )
143
+ require .Error (t , skerr )
144
+ _ , ok := skerr .(* InvalidSketchFolderNameError )
145
+ assert .False (t , ok )
146
+ sketchPath , _ = sketchPath .Abs ()
147
+ expectedError := fmt .Sprintf ("main file missing from sketch: %s" , sketchPath .Join (sketchPath .Base ()+ ".ino" ))
148
+ require .EqualError (t , skerr , expectedError )
149
+ }
127
150
}
128
151
129
152
func TestNewSketchCasingCorrect (t * testing.T ) {
0 commit comments