mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Have flatecut.Cut take an optional io.Writer arg
This commit is contained in:
1 parent
b54f3b4df3
commit
a79eb83f65
3 files changed
+61
-22
No files matched your search
@@ -43,7 +43,7 @@ func clone(b []byte) []byte {
|
||||
|
||||
func Test(t *testing.T,
|
||||
smallestValidMaxEncodedLen int,
|
||||
cut func([]byte, int) (int, int, error),
|
||||
cut func(io.Writer, []byte, int) (int, int, error),
|
||||
newReader func(io.Reader) (io.ReadCloser, error),
|
||||
filenames []string) {
|
||||
|
||||
@@ -90,8 +90,9 @@ func Test(t *testing.T,
|
||||
if maxEncodedLen < smallestValidMaxEncodedLen {
|
||||
continue
|
||||
}
|
||||
w0 := &bytes.Buffer{}
|
||||
encoded := clone(full)
|
||||
encLen, decLen, err := cut(encoded, maxEncodedLen)
|
||||
encLen, decLen, err := cut(w0, encoded, maxEncodedLen)
|
||||
if err != nil {
|
||||
t.Errorf("f=%q, mEL=%d: cut: %v", filename, maxEncodedLen, err)
|
||||
continue
|
||||
@@ -107,13 +108,13 @@ func Test(t *testing.T,
|
||||
continue
|
||||
}
|
||||
|
||||
w := &bytes.Buffer{}
|
||||
w1 := &bytes.Buffer{}
|
||||
r, err := newReader(bytes.NewReader(encoded[:encLen]))
|
||||
if err != nil {
|
||||
t.Errorf("f=%q, mEL=%d: newReader: %v", filename, maxEncodedLen, err)
|
||||
continue
|
||||
}
|
||||
if n, err := io.Copy(w, r); err != nil {
|
||||
if n, err := io.Copy(w1, r); err != nil {
|
||||
t.Errorf("f=%q, mEL=%d: io.Copy: %v", filename, maxEncodedLen, err)
|
||||
continue
|
||||
} else if n != int64(decLen) {
|
||||
@@ -122,6 +123,11 @@ func Test(t *testing.T,
|
||||
continue
|
||||
}
|
||||
|
||||
if !bytes.Equal(w0.Bytes(), w1.Bytes()) {
|
||||
t.Errorf("f=%q, mEL=%d: decoded bytes were not equal", filename, maxEncodedLen)
|
||||
continue
|
||||
}
|
||||
|
||||
if (maxEncodedLen == len(encoded)) && (int64(decLen) != fullDecodedLen) {
|
||||
t.Errorf("f=%q, mEL=%d: full decode: got %d, want %d",
|
||||
filename, maxEncodedLen, decLen, fullDecodedLen)
|
||||
@@ -138,7 +144,7 @@ func Test(t *testing.T,
|
||||
|
||||
func Benchmark(b *testing.B,
|
||||
smallestValidMaxEncodedLen int,
|
||||
cut func([]byte, int) (int, int, error),
|
||||
cut func(io.Writer, []byte, int) (int, int, error),
|
||||
newReader func(io.Reader) (io.ReadCloser, error),
|
||||
filename string,
|
||||
trimPrefix int,
|
||||
@@ -168,7 +174,7 @@ func Benchmark(b *testing.B,
|
||||
continue
|
||||
}
|
||||
encoded := clone(full)
|
||||
if _, _, err := cut(encoded, maxEncodedLen); err != nil {
|
||||
if _, _, err := cut(nil, encoded, maxEncodedLen); err != nil {
|
||||
b.Fatalf("cut: %v", err)
|
||||
}
|
||||
if maxEncodedLen >= len(full) {
|
||||
|
||||
Reference in new issue
Block a user