Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zstd: use helper function to create a zip reader in tests #566

Merged
merged 1 commit into from Apr 24, 2022
Merged

zstd: use helper function to create a zip reader in tests #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions zstd/decodeheader_test.go
View file
Open in desktop
Expand Up @@ -7,19 +7,10 @@ import (
"os"
"strings"
"testing"

"github.com/klauspost/compress/zip"
)

func TestHeader_Decode(t *testing.T) {
data, err := ioutil.ReadFile("testdata/headers.zip")
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader("testdata/headers.zip", t)

// Regenerate golden data...
const regen = false
Expand Down
97 changes: 11 additions & 86 deletions zstd/decoder_test.go
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@ import (
// "github.com/DataDog/zstd"
// zstd "github.com/valyala/gozstd"

"github.com/klauspost/compress/zip"
"github.com/klauspost/compress/zstd/internal/xxhash"
)

Expand Down Expand Up @@ -638,14 +637,8 @@ func TestNewDecoderFlushed(t *testing.T) {

func TestDecoderRegression(t *testing.T) {
defer timeout(160 * time.Second)()
data, err := ioutil.ReadFile("testdata/regression.zip")
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}

zr := testCreateZipReader("testdata/regression.zip", t)
dec, err := NewReader(nil, WithDecoderConcurrency(1), WithDecoderLowmem(true), WithDecoderMaxMemory(1<<20))
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -872,15 +865,7 @@ func TestDecoder_Reset(t *testing.T) {
}

func TestDecoderMultiFrame(t *testing.T) {
fn := "testdata/benchdecoder.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader("testdata/benchdecoder.zip", t)
dec, err := NewReader(nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -933,15 +918,7 @@ func TestDecoderMultiFrame(t *testing.T) {
}

func TestDecoderMultiFrameReset(t *testing.T) {
fn := "testdata/benchdecoder.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader("testdata/benchdecoder.zip", t)
dec, err := NewReader(nil)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -1005,14 +982,7 @@ func TestDecoderMultiFrameReset(t *testing.T) {
}

func testDecoderFile(t *testing.T, fn string, newDec func() (*Decoder, error)) {
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader(fn, t)
var want = make(map[string][]byte)
for _, tt := range zr.File {
if strings.HasSuffix(tt.Name, ".zst") {
Expand Down Expand Up @@ -1119,14 +1089,7 @@ func testDecoderFile(t *testing.T, fn string, newDec func() (*Decoder, error)) {
}

func testDecoderFileBad(t *testing.T, fn string, newDec func() (*Decoder, error), errMap map[string]string) {
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader(fn, t)
var want = make(map[string][]byte)
for _, tt := range zr.File {
if strings.HasSuffix(tt.Name, ".zst") {
Expand Down Expand Up @@ -1188,15 +1151,7 @@ func testDecoderFileBad(t *testing.T, fn string, newDec func() (*Decoder, error)
}

func BenchmarkDecoder_DecoderSmall(b *testing.B) {
fn := "testdata/benchdecoder.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
b.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
b.Fatal(err)
}
zr := testCreateZipReader("testdata/benchdecoder.zip", b)
dec, err := NewReader(nil)
if err != nil {
b.Fatal(err)
Expand Down Expand Up @@ -1249,15 +1204,7 @@ func BenchmarkDecoder_DecoderSmall(b *testing.B) {
}

func BenchmarkDecoder_DecodeAll(b *testing.B) {
fn := "testdata/benchdecoder.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
b.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
b.Fatal(err)
}
zr := testCreateZipReader("testdata/benchdecoder.zip", b)
dec, err := NewReader(nil, WithDecoderConcurrency(1))
if err != nil {
b.Fatal(err)
Expand Down Expand Up @@ -1397,15 +1344,7 @@ func BenchmarkDecoder_DecodeAllFilesP(b *testing.B) {
}

func BenchmarkDecoder_DecodeAllParallel(b *testing.B) {
fn := "testdata/benchdecoder.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
b.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
b.Fatal(err)
}
zr := testCreateZipReader("testdata/benchdecoder.zip", b)
dec, err := NewReader(nil, WithDecoderConcurrency(runtime.GOMAXPROCS(0)))
if err != nil {
b.Fatal(err)
Expand Down Expand Up @@ -1498,14 +1437,7 @@ func BenchmarkDecoderEnwik9(b *testing.B) {
}

func testDecoderDecodeAll(t *testing.T, fn string, dec *Decoder) {
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader(fn, t)
var want = make(map[string][]byte)
for _, tt := range zr.File {
if strings.HasSuffix(tt.Name, ".zst") {
Expand Down Expand Up @@ -1574,14 +1506,7 @@ func testDecoderDecodeAll(t *testing.T, fn string, dec *Decoder) {
}

func testDecoderDecodeAllError(t *testing.T, fn string, dec *Decoder, errMap map[string]string) {
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader(fn, t)

var wg sync.WaitGroup
for _, tt := range zr.File {
Expand Down
30 changes: 3 additions & 27 deletions zstd/dict_test.go
View file
Open in desktop
Expand Up @@ -12,15 +12,7 @@ import (

func TestDecoder_SmallDict(t *testing.T) {
// All files have CRC
fn := "testdata/dict-tests-small.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader("testdata/dict-tests-small.zip", t)
var dicts [][]byte
for _, tt := range zr.File {
if !strings.HasSuffix(tt.Name, ".dict") {
Expand Down Expand Up @@ -73,15 +65,7 @@ func TestDecoder_SmallDict(t *testing.T) {

func TestEncoder_SmallDict(t *testing.T) {
// All files have CRC
fn := "testdata/dict-tests-small.zip"
data, err := ioutil.ReadFile(fn)
if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
zr := testCreateZipReader("testdata/dict-tests-small.zip", t)
var dicts [][]byte
var encs []*Encoder
var noDictEncs []*Encoder
Expand Down Expand Up @@ -222,17 +206,9 @@ func TestEncoder_SmallDict(t *testing.T) {
}

func benchmarkEncodeAllLimitedBySize(b *testing.B, lowerLimit int, upperLimit int) {
fn := "testdata/dict-tests-small.zip"
data, err := ioutil.ReadFile(fn)
zr := testCreateZipReader("testdata/dict-tests-small.zip", b)
t := testing.TB(b)

if err != nil {
t.Fatal(err)
}
zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
if err != nil {
t.Fatal(err)
}
var dicts [][]byte
var encs []*Encoder
var encNames []string
Expand Down