11package litter_test
22
33import (
4+ "errors"
45 "fmt"
56 "io"
6- "io/ioutil"
77 "os"
88 "os/exec"
99 "reflect"
@@ -15,7 +15,7 @@ import (
1515 "github.com/sanity-io/litter"
1616)
1717
18- func Function (arg1 string , arg2 int ) (string , error ) {
18+ func Function (string , int ) (string , error ) {
1919 return "" , nil
2020}
2121
@@ -238,7 +238,7 @@ func TestSdump_maps(t *testing.T) {
238238 2 : "two" ,
239239 },
240240 map [int ]* BlankStruct {
241- 2 : & BlankStruct {},
241+ 2 : {},
242242 },
243243 })
244244}
@@ -263,16 +263,19 @@ var standardCfg = litter.Options{}
263263func runTestWithCfg (t * testing.T , name string , cfg * litter.Options , cases ... interface {}) {
264264 t .Run (name , func (t * testing.T ) {
265265 fileName := fmt .Sprintf ("testdata/%s.dump" , name )
266+
266267 dump := cfg .Sdump (cases ... )
267- reference , err := ioutil .ReadFile (fileName )
268+
269+ reference , err := os .ReadFile (fileName )
268270 if os .IsNotExist (err ) {
269271 t .Logf ("Note: Test data file %s does not exist, writing it; verify contents!" , fileName )
270- err := ioutil .WriteFile (fileName , []byte (dump ), 0644 )
272+ err := os .WriteFile (fileName , []byte (dump ), 0644 )
271273 if err != nil {
272274 t .Error (err )
273275 }
274276 return
275277 }
278+
276279 assertEqualStringsWithDiff (t , string (reference ), dump )
277280 })
278281}
@@ -286,17 +289,19 @@ func diffStrings(t *testing.T, expected, actual string) (*string, bool) {
286289 return nil , true
287290 }
288291
289- dir , err := ioutil . TempDir ("" , "test" )
292+ dir , err := os . MkdirTemp ("" , "test" )
290293 require .NoError (t , err )
291294 defer os .RemoveAll (dir )
292295
293- require .NoError (t , ioutil .WriteFile (fmt .Sprintf ("%s/expected" , dir ), []byte (expected ), 0644 ))
294- require .NoError (t , ioutil .WriteFile (fmt .Sprintf ("%s/actual" , dir ), []byte (actual ), 0644 ))
296+ require .NoError (t , os .WriteFile (fmt .Sprintf ("%s/expected" , dir ), []byte (expected ), 0644 ))
297+ require .NoError (t , os .WriteFile (fmt .Sprintf ("%s/actual" , dir ), []byte (actual ), 0644 ))
295298
296299 out , err := exec .Command ("diff" , "--side-by-side" ,
297300 fmt .Sprintf ("%s/expected" , dir ),
298301 fmt .Sprintf ("%s/actual" , dir )).Output ()
299- if _ , ok := err .(* exec.ExitError ); ! ok {
302+
303+ var exitErr * exec.ExitError
304+ if ! errors .As (err , & exitErr ) {
300305 require .NoError (t , err )
301306 }
302307
0 commit comments