Skip to content

Commit

Permalink
tests: Remove references to io/ioutil (#652)
Browse files Browse the repository at this point in the history 
As the go doc says: "Deprecated: As of Go 1.16, the same functionality is
now provided by package io or package os, and those implementations should
be preferred in new code."

Co-authored-by: Klaus Post <klauspost@gmail.com>
  • Loading branch information
@WojciechMula @klauspost
WojciechMula and klauspost committed Aug 29, 2022
1 parent 6d0019a commit 1481365
Show file tree
Hide file tree
Showing 35 changed files with 389 additions and 401 deletions.
20 changes: 10 additions & 10 deletions flate/deflate_test.go
View file
Expand Up @@ -9,7 +9,7 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"reflect"
"strings"
"sync"
Expand Down Expand Up @@ -296,7 +296,7 @@ func testSync(t *testing.T, level int, input []byte, name string) {

// stream should work for ordinary reader too
r = NewReader(buf1)
out, err = ioutil.ReadAll(r)
out, err = io.ReadAll(r)
if err != nil {
t.Errorf("testSync: read: %s", err)
return
Expand Down Expand Up @@ -324,7 +324,7 @@ func testToFromWithLevelAndLimit(t *testing.T, level int, input []byte, name str
t.Logf("level: %d - Size:%.2f%%, %d b\n", level, float64(buffer.Len()*100)/float64(limit), buffer.Len())
}
r := NewReader(&buffer)
out, err := ioutil.ReadAll(r)
out, err := io.ReadAll(r)
if err != nil {
t.Errorf("read: %s", err)
return
Expand Down Expand Up @@ -380,7 +380,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{

func TestDeflateInflateString(t *testing.T) {
for _, test := range deflateInflateStringTests {
gold, err := ioutil.ReadFile(test.filename)
gold, err := os.ReadFile(test.filename)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -417,7 +417,7 @@ func TestReaderDict(t *testing.T) {
w.Close()

r := NewReaderDict(&b, []byte(dict))
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -463,7 +463,7 @@ func TestRegression2508(t *testing.T) {
t.Logf("test disabled with -short")
return
}
w, err := NewWriter(ioutil.Discard, 1)
w, err := NewWriter(io.Discard, 1)
if err != nil {
t.Fatalf("NewWriter: %v", err)
}
Expand All @@ -484,17 +484,17 @@ func TestWriterReset(t *testing.T) {
if testing.Short() && level > 1 {
break
}
w, err := NewWriter(ioutil.Discard, level)
w, err := NewWriter(io.Discard, level)
if err != nil {
t.Fatalf("NewWriter: %v", err)
}
buf := []byte("hello world")
for i := 0; i < 1024; i++ {
w.Write(buf)
}
w.Reset(ioutil.Discard)
w.Reset(io.Discard)

wref, err := NewWriter(ioutil.Discard, level)
wref, err := NewWriter(io.Discard, level)
if err != nil {
t.Fatalf("NewWriter: %v", err)
}
Expand Down Expand Up @@ -646,7 +646,7 @@ func TestBestSpeed(t *testing.T) {
}

r := NewReader(buf)
got, err := ioutil.ReadAll(r)
got, err := io.ReadAll(r)
if err != nil {
t.Errorf("i=%d, firstN=%d, flush=%t: ReadAll: %v", i, firstN, flush, err)
continue
Expand Down
15 changes: 8 additions & 7 deletions flate/flate_test.go
View file
Expand Up @@ -14,7 +14,8 @@ import (
"compress/flate"
"encoding/hex"
"fmt"
"io/ioutil"
"io"
"os"
"testing"
)

Expand Down Expand Up @@ -71,7 +72,7 @@ func TestInvalidEncoding(t *testing.T) {

func TestRegressions(t *testing.T) {
// Test fuzzer regressions
data, err := ioutil.ReadFile("testdata/regression.zip")
data, err := os.ReadFile("testdata/regression.zip")
if err != nil {
t.Fatal(err)
}
Expand All @@ -84,7 +85,7 @@ func TestRegressions(t *testing.T) {
if err != nil {
t.Fatal(err)
}
data1, err := ioutil.ReadAll(data)
data1, err := io.ReadAll(data)
if err != nil {
t.Fatal(err)
}
Expand All @@ -111,7 +112,7 @@ func TestRegressions(t *testing.T) {
t.Error(err)
}
fr1 := NewReader(buf)
data2, err := ioutil.ReadAll(fr1)
data2, err := io.ReadAll(fr1)
if err != nil {
t.Error(err)
}
Expand All @@ -133,7 +134,7 @@ func TestRegressions(t *testing.T) {
t.Error(err)
}
fr1 = flate.NewReader(buf)
data2, err = ioutil.ReadAll(fr1)
data2, err = io.ReadAll(fr1)
if err != nil {
t.Error(err)
}
Expand All @@ -158,7 +159,7 @@ func TestRegressions(t *testing.T) {
}
t.Log(buf.Len())
fr1 := NewReader(buf)
data2, err := ioutil.ReadAll(fr1)
data2, err := io.ReadAll(fr1)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -346,7 +347,7 @@ func TestStreams(t *testing.T) {
if err != nil {
t.Fatal(err)
}
data, err = ioutil.ReadAll(NewReader(bytes.NewReader(data)))
data, err = io.ReadAll(NewReader(bytes.NewReader(data)))
if tc.want == "fail" {
if err == nil {
t.Errorf("#%d (%s): got nil error, want non-nil", i, tc.desc)
Expand Down
29 changes: 14 additions & 15 deletions flate/huffman_bit_writer_test.go
View file
Expand Up @@ -8,7 +8,6 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -40,7 +39,7 @@ func TestBlockHuff(t *testing.T) {
}

func testBlockHuff(t *testing.T, in, out string) {
all, err := ioutil.ReadFile(in)
all, err := os.ReadFile(in)
if err != nil {
t.Error(err)
return
Expand All @@ -52,7 +51,7 @@ func testBlockHuff(t *testing.T, in, out string) {
bw.flush()
got := buf.Bytes()

want, err := ioutil.ReadFile(out)
want, err := os.ReadFile(out)
if err != nil && !*update {
t.Error(err)
return
Expand All @@ -63,7 +62,7 @@ func testBlockHuff(t *testing.T, in, out string) {
if *update {
if in != out {
t.Logf("Updating %q", out)
if err := ioutil.WriteFile(out, got, 0666); err != nil {
if err := os.WriteFile(out, got, 0666); err != nil {
t.Error(err)
}
return
Expand All @@ -73,7 +72,7 @@ func testBlockHuff(t *testing.T, in, out string) {
}

t.Errorf("%q != %q (see %q)", in, out, in+".got")
if err := ioutil.WriteFile(in+".got", got, 0666); err != nil {
if err := os.WriteFile(in+".got", got, 0666); err != nil {
t.Error(err)
}
return
Expand All @@ -88,7 +87,7 @@ func testBlockHuff(t *testing.T, in, out string) {
got = buf.Bytes()
if !bytes.Equal(got, want) {
t.Errorf("after reset %q != %q (see %q)", in, out, in+".reset.got")
if err := ioutil.WriteFile(in+".reset.got", got, 0666); err != nil {
if err := os.WriteFile(in+".reset.got", got, 0666); err != nil {
t.Error(err)
}
return
Expand Down Expand Up @@ -199,7 +198,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
if *update {
if test.input != "" {
t.Logf("Updating %q", test.want)
input, err := ioutil.ReadFile(test.input)
input, err := os.ReadFile(test.input)
if err != nil {
t.Error(err)
return
Expand Down Expand Up @@ -229,12 +228,12 @@ func testBlock(t *testing.T, test huffTest, ttype string) {

if test.input != "" {
t.Logf("Testing %q", test.want)
input, err := ioutil.ReadFile(test.input)
input, err := os.ReadFile(test.input)
if err != nil {
t.Error(err)
return
}
want, err := ioutil.ReadFile(test.want)
want, err := os.ReadFile(test.want)
if err != nil {
t.Error(err)
return
Expand All @@ -246,7 +245,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
got := buf.Bytes()
if !bytes.Equal(got, want) {
t.Errorf("writeBlock did not yield expected result for file %q with input. See %q", test.want, test.want+gotSuffix)
if err := ioutil.WriteFile(test.want+gotSuffix, got, 0666); err != nil {
if err := os.WriteFile(test.want+gotSuffix, got, 0666); err != nil {
t.Error(err)
}
}
Expand All @@ -260,7 +259,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
got = buf.Bytes()
if !bytes.Equal(got, want) {
t.Errorf("reset: writeBlock did not yield expected result for file %q with input. See %q", test.want, test.want+".reset"+gotSuffix)
if err := ioutil.WriteFile(test.want+".reset"+gotSuffix, got, 0666); err != nil {
if err := os.WriteFile(test.want+".reset"+gotSuffix, got, 0666); err != nil {
t.Error(err)
}
return
Expand All @@ -269,7 +268,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
testWriterEOF(t, "wb", test, true)
}
t.Logf("Testing %q", test.wantNoInput)
wantNI, err := ioutil.ReadFile(test.wantNoInput)
wantNI, err := os.ReadFile(test.wantNoInput)
if err != nil {
t.Error(err)
return
Expand All @@ -281,7 +280,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
got := buf.Bytes()
if !bytes.Equal(got, wantNI) {
t.Errorf("writeBlock did not yield expected result for file %q with input. See %q", test.wantNoInput, test.wantNoInput+gotSuffix)
if err := ioutil.WriteFile(test.wantNoInput+gotSuffix, got, 0666); err != nil {
if err := os.WriteFile(test.wantNoInput+gotSuffix, got, 0666); err != nil {
t.Error(err)
}
} else if got[0]&1 == 1 {
Expand All @@ -299,7 +298,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
got = buf.Bytes()
if !bytes.Equal(got, wantNI) {
t.Errorf("reset: writeBlock did not yield expected result for file %q without input. See %q", test.wantNoInput, test.wantNoInput+".reset"+gotSuffix)
if err := ioutil.WriteFile(test.wantNoInput+".reset"+gotSuffix, got, 0666); err != nil {
if err := os.WriteFile(test.wantNoInput+".reset"+gotSuffix, got, 0666); err != nil {
t.Error(err)
}
return
Expand Down Expand Up @@ -340,7 +339,7 @@ func testWriterEOF(t *testing.T, ttype string, test huffTest, useInput bool) {
var input []byte
if useInput {
var err error
input, err = ioutil.ReadFile(test.input)
input, err = os.ReadFile(test.input)
if err != nil {
t.Error(err)
return
Expand Down
9 changes: 4 additions & 5 deletions flate/inflate_test.go
View file
Expand Up @@ -8,7 +8,6 @@ import (
"bytes"
"crypto/rand"
"io"
"io/ioutil"
"strconv"
"strings"
"testing"
Expand Down Expand Up @@ -59,7 +58,7 @@ func TestReaderTruncated(t *testing.T) {
for i, v := range vectors {
r := strings.NewReader(v.input)
zr := NewReader(r)
b, err := ioutil.ReadAll(zr)
b, err := io.ReadAll(zr)
if err != io.ErrUnexpectedEOF {
t.Errorf("test %d, error mismatch: got %v, want io.ErrUnexpectedEOF", i, err)
}
Expand Down Expand Up @@ -143,7 +142,7 @@ func TestInflate(t *testing.T) {
buf := bytes.NewReader(data)
r := NewReader(buf)

_, err := io.Copy(ioutil.Discard, r)
_, err := io.Copy(io.Discard, r)
if (test.n == 0 && err == nil) || (test.n != 0 && err != nil) {
t.Logf("%q: OK:", test.id)
t.Logf(" - got %v", err)
Expand Down Expand Up @@ -172,7 +171,7 @@ func TestInflate(t *testing.T) {
buf := bytes.NewReader(data)
r := NewReader(buf)

_, err := io.Copy(ioutil.Discard, r)
_, err := io.Copy(io.Discard, r)
if test.err == (err != nil) {
t.Logf("%q: OK:", test.id)
t.Logf(" - got %v", err)
Expand Down Expand Up @@ -256,7 +255,7 @@ func TestWriteTo(t *testing.T) {

dec := NewReader(bytes.NewBuffer(buf))
// ReadAll does not use WriteTo, but we wrap it in a NopCloser to be sure.
readall, err := ioutil.ReadAll(ioutil.NopCloser(dec))
readall, err := io.ReadAll(io.NopCloser(dec))
if err != nil {
t.Fatal(err)
}
Expand Down
8 changes: 4 additions & 4 deletions flate/reader_test.go
View file
Expand Up @@ -7,7 +7,7 @@ package flate
import (
"bytes"
"io"
"io/ioutil"
"os"
"runtime"
"strings"
"testing"
Expand All @@ -16,7 +16,7 @@ import (
func TestNlitOutOfRange(t *testing.T) {
// Trying to decode this bogus flate data, which has a Huffman table
// with nlit=288, should not panic.
io.Copy(ioutil.Discard, NewReader(strings.NewReader(
io.Copy(io.Discard, NewReader(strings.NewReader(
"\xfc\xfe\x36\xe7\x5e\x1c\xef\xb3\x55\x58\x77\xb6\x56\xb5\x43\xf4"+
"\x6f\xf2\xd2\xe6\x3d\x99\xa0\x85\x8c\x48\xeb\xf8\xda\x83\x04\x2a"+
"\x75\xc4\xf8\x0f\x12\x11\xb9\xb4\x4b\x09\xa0\xbe\x8b\x91\x4c")))
Expand All @@ -43,7 +43,7 @@ func benchmarkDecode(b *testing.B, testfile, level, n int) {
b.ReportAllocs()
b.StopTimer()
b.SetBytes(int64(n))
buf0, err := ioutil.ReadFile(testfiles[testfile])
buf0, err := os.ReadFile(testfiles[testfile])
if err != nil {
b.Fatal(err)
}
Expand All @@ -70,7 +70,7 @@ func benchmarkDecode(b *testing.B, testfile, level, n int) {
res := r.(Resetter)
for i := 0; i < b.N; i++ {
res.Reset(bytes.NewReader(buf1), nil)
io.Copy(ioutil.Discard, r)
io.Copy(io.Discard, r)
}
}

Expand Down
4 changes: 2 additions & 2 deletions flate/token_test.go
View file
Expand Up @@ -2,7 +2,7 @@ package flate

import (
"bytes"
"io/ioutil"
"os"
"testing"
)

Expand All @@ -13,7 +13,7 @@ type testFatal interface {
// loadTestTokens will load test tokens.
// First block from enwik9, varint encoded.
func loadTestTokens(t testFatal) *tokens {
b, err := ioutil.ReadFile("testdata/tokens.bin")
b, err := os.ReadFile("testdata/tokens.bin")
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 1481365

Please sign in to comment.