zstd: factor out zip reader creation to a helper function

klauspost · Apr 22, 2022 · a33a338 · a33a338
1 parent aa5b572
commit a33a338
Showing 1 changed file with 32 additions and 63 deletions.
diff --git a/zstd/seqdec_test.go b/zstd/seqdec_test.go
@@ -175,16 +175,8 @@ func Test_seqdec_decoder(t *testing.T) {
 	want := map[string][]seqVals{}
 	var wantOffsets = map[string][3]int{}
 	if !writeWant {
-		fn := "testdata/seqs-want.zip"
-		data, err := ioutil.ReadFile(fn)
+		zr := testCreateZipReader("testdata/seqs-want.zip", t)
 		tb := t
-		if err != nil {
-			tb.Fatal(err)
-		}
-		zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-		if err != nil {
-			tb.Fatal(err)
-		}
 		for _, tt := range zr.File {
 			var ref testSequence
 			if !ref.parse(tt.Name) {
@@ -217,16 +209,8 @@ func Test_seqdec_decoder(t *testing.T) {
 			o.Close()
 		}
 	}
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", t)
 	tb := t
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -289,16 +273,8 @@ func Test_seqdec_decoder(t *testing.T) {
 }
 
 func Test_seqdec_execute(t *testing.T) {
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", t)
 	tb := t
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -350,16 +326,8 @@ func Test_seqdec_execute(t *testing.T) {
 }
 
 func Test_seqdec_decodeSync(t *testing.T) {
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", t)
 	tb := t
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -408,16 +376,8 @@ func Benchmark_seqdec_decode(b *testing.B) {
 }
 
 func benchmark_seqdec_decode(b *testing.B) {
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", b)
 	tb := b
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -468,16 +428,8 @@ func benchmark_seqdec_decode(b *testing.B) {
 }
 
 func Benchmark_seqdec_execute(b *testing.B) {
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", b)
 	tb := b
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -532,16 +484,8 @@ func Benchmark_seqdec_execute(b *testing.B) {
 }
 
 func Benchmark_seqdec_decodeSync(b *testing.B) {
-	fn := "testdata/seqs.zip"
-	data, err := ioutil.ReadFile(fn)
+	zr := testCreateZipReader("testdata/seqs.zip", b)
 	tb := b
-	if err != nil {
-		tb.Fatal(err)
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		tb.Fatal(err)
-	}
 	for _, tt := range zr.File {
 		var ref testSequence
 		if !ref.parse(tt.Name) {
@@ -594,3 +538,28 @@ func Benchmark_seqdec_decodeSync(b *testing.B) {
 		})
 	}
 }
+
+func testCreateZipReader(path string, tb interface{}) *zip.Reader {
+	failOnError := func(err error) {
+		if err == nil {
+			return
+		}
+
+		switch o := tb.(type) {
+		case *testing.T:
+			o.Fatal(err)
+		case *testing.B:
+			o.Fatal(err)
+		default:
+			panic("the second argument is expected to be *testing.T or *testing.B")
+		}
+	}
+
+	data, err := ioutil.ReadFile(path)
+	failOnError(err)
+
+	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
+	failOnError(err)
+
+	return zr
+}