Changing tests, using io.ErrShortWrite instead of io.ErrShortBuffer

Author: djherbis

buffer.go

@@ -12,7 +12,7 @@ type Buffer interface {
 	Len() int64 // How much data is Buffered in bytes
 	Cap() int64 // How much data can be Buffered at once in bytes.
 	io.Reader   // Read() will read from the top of the buffer [io.EOF if empty]
-	io.Writer   // Write() will write to the end of the buffer [io.ErrShortBuffer if not enough space]
+	io.Writer   // Write() will write to the end of the buffer [io.ErrShortWrite if not enough space]
 	Reset()     // Truncates the buffer, Len() == 0.
 }
 

buffer_test.go

@@ -8,8 +8,6 @@ import (
 	"io/ioutil"
 	"os"
 	"testing"
-
-	"github.com/djherbis/buffer/wrapio"
 )
 
 func BenchmarkMemory(b *testing.B) {
@@ -108,22 +106,6 @@ func TestSpill(t *testing.T) {
 	}
 }
 
-func TestWrap(t *testing.T) {
-	if file, err := ioutil.TempFile("", "wrap.test"); err == nil {
-		w := wrapio.NewWrapWriter(file, 0, 3)
-		w.Write([]byte("abcdef"))
-
-		r := wrapio.NewWrapReader(file, 0, 2)
-		data := make([]byte, 6)
-		r.Read(data)
-		if !bytes.Equal(data, []byte("dedede")) {
-			t.Error("Wrapper error!")
-		}
-		file.Close()
-		os.Remove(file.Name())
-	}
-}
-
 func TestFile(t *testing.T) {
 	file, err := ioutil.TempFile("", "buffer")
 	if err != nil {

limio/limit.go

@@ -9,7 +9,7 @@ type LimitedWriter struct {
 
 func (l *LimitedWriter) Write(p []byte) (n int, err error) {
 	if l.N <= 0 {
-		return 0, io.ErrShortBuffer
+		return 0, io.ErrShortWrite
 	}
 	if int64(len(p)) > l.N {
 		p = p[0:l.N]

mem.go

@@ -35,10 +35,9 @@ func (buf *memory) Write(p []byte) (n int, err error) {
 	return limio.LimitWriter(buf.Buffer, Gap(buf)).Write(p)
 }
 
-// BUG(Dustin): Should add io.ErrShortWrite
 func (buf *memory) WriteAt(p []byte, off int64) (n int, err error) {
 	if off > buf.Len() {
-		return 0, io.ErrShortBuffer
+		return 0, io.ErrShortWrite
 	} else if len64(p)+off <= buf.Len() {
 		d := buf.Bytes()[off:]
 		return copy(d, p), nil

multi.go

@@ -90,7 +90,7 @@ func (buf *chain) Read(p []byte) (n int, err error) {
 }
 
 func (buf *chain) Write(p []byte) (n int, err error) {
-	if n, err = buf.Buf.Write(p); err == io.ErrShortBuffer && buf.HasNext {
+	if n, err = buf.Buf.Write(p); err == io.ErrShortWrite && buf.HasNext {
 		err = nil
 	}
 	p = p[n:]

partition.go

@@ -68,7 +68,7 @@ func (buf *partition) Write(p []byte) (n int, err error) {
 		n += m
 		p = p[m:]
 
-		if er == io.ErrShortBuffer {
+		if er == io.ErrShortWrite {
 			er = nil
 		} else if er != nil {
 			return n, er