diff --git a/proxyreader_test.go b/proxyreader_test.go index e56e82a..f7e9121 100644 --- a/proxyreader_test.go +++ b/proxyreader_test.go @@ -30,19 +30,19 @@ func TestProxyReader(t *testing.T) { p := mpb.New(mpb.WithOutput(io.Discard)) - reader := &testReader{strings.NewReader(content), false} + tr := &testReader{strings.NewReader(content), false} - bar := p.AddBar(int64(len(content))) + bar := p.New(int64(len(content)), mpb.NopStyle()) var buf bytes.Buffer - _, err := io.Copy(&buf, bar.ProxyReader(reader)) + _, err := io.Copy(&buf, bar.ProxyReader(tr)) if err != nil { - t.Errorf("Error copying from reader: %+v\n", err) + t.Errorf("io.Copy: %s\n", err.Error()) } p.Wait() - if !reader.called { + if !tr.called { t.Error("Read not called") } @@ -64,47 +64,50 @@ func TestProxyReadCloser(t *testing.T) { p := mpb.New(mpb.WithOutput(io.Discard)) - reader := &testReadCloser{strings.NewReader(content), false} + tr := &testReadCloser{strings.NewReader(content), false} - bar := p.AddBar(int64(len(content))) + bar := p.New(int64(len(content)), mpb.NopStyle()) - rc := bar.ProxyReader(reader) - _, _ = io.Copy(io.Discard, rc) + rc := bar.ProxyReader(tr) + _, err := io.Copy(io.Discard, rc) + if err != nil { + t.Errorf("io.Copy: %s\n", err.Error()) + } _ = rc.Close() p.Wait() - if !reader.called { + if !tr.called { t.Error("Close not called") } } -type testWriterTo struct { +type testReaderWriterTo struct { io.Reader called bool } -func (wt *testWriterTo) WriteTo(w io.Writer) (n int64, err error) { - wt.called = true - return wt.Reader.(io.WriterTo).WriteTo(w) +func (r *testReaderWriterTo) WriteTo(w io.Writer) (n int64, err error) { + r.called = true + return r.Reader.(io.WriterTo).WriteTo(w) } -func TestProxyWriterTo(t *testing.T) { +func TestProxyReaderWriterTo(t *testing.T) { p := mpb.New(mpb.WithOutput(io.Discard)) - writerTo := &testWriterTo{strings.NewReader(content), false} + tr := &testReaderWriterTo{strings.NewReader(content), false} - bar := p.AddBar(int64(len(content))) + bar := p.New(int64(len(content)), mpb.NopStyle()) var buf bytes.Buffer - _, err := io.Copy(&buf, bar.ProxyReader(writerTo)) + _, err := io.Copy(&buf, bar.ProxyReader(tr)) if err != nil { - t.Errorf("Error copying from reader: %+v\n", err) + t.Errorf("io.Copy: %s\n", err.Error()) } p.Wait() - if !writerTo.called { + if !tr.called { t.Error("WriteTo not called") }