libgo: Update to weekly.2011-11-02.

[pf3gnuchains/gcc-fork.git] / libgo / go / compress / flate / deflate_test.go

diff --git a/libgo/go/compress/flate/deflate_test.go b/libgo/go/compress/flate/deflate_test.go
index 650a805..db2d71d 100644 (file)
--- a/libgo/go/compress/flate/deflate_test.go
+++ b/libgo/go/compress/flate/deflate_test.go
@@ -9,7 +9,6 @@ import (
        "fmt"
        "io"
        "io/ioutil"
-       "os"
        "sync"
        "testing"
 )
@@ -57,7 +56,7 @@ var deflateInflateTests = []*deflateInflateTest{
        &deflateInflateTest{[]byte{0x11, 0x12}},
        &deflateInflateTest{[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11}},
        &deflateInflateTest{[]byte{0x11, 0x10, 0x13, 0x41, 0x21, 0x21, 0x41, 0x13, 0x87, 0x78, 0x13}},
-       &deflateInflateTest{getLargeDataChunk()},
+       &deflateInflateTest{largeDataChunk()},
 }
 
 var reverseBitsTests = []*reverseBitsTest{
@@ -71,23 +70,22 @@ var reverseBitsTests = []*reverseBitsTest{
        &reverseBitsTest{29, 5, 23},
 }
 
-func getLargeDataChunk() []byte {
+func largeDataChunk() []byte {
        result := make([]byte, 100000)
        for i := range result {
-               result[i] = byte(int64(i) * int64(i) & 0xFF)
+               result[i] = byte(i * i & 0xFF)
        }
        return result
 }
 
 func TestDeflate(t *testing.T) {
        for _, h := range deflateTests {
-               buffer := bytes.NewBuffer(nil)
-               w := NewWriter(buffer, h.level)
+               var buf bytes.Buffer
+               w := NewWriter(&buf, h.level)
                w.Write(h.in)
                w.Close()
-               if bytes.Compare(buffer.Bytes(), h.out) != 0 {
-                       t.Errorf("buffer is wrong; level = %v, buffer.Bytes() = %v, expected output = %v",
-                               h.level, buffer.Bytes(), h.out)
+               if !bytes.Equal(buf.Bytes(), h.out) {
+                       t.Errorf("Deflate(%d, %x) = %x, want %x", h.level, h.in, buf.Bytes(), h.out)
                }
        }
 }
@@ -103,7 +101,7 @@ func newSyncBuffer() *syncBuffer {
        return &syncBuffer{ready: make(chan bool, 1)}
 }
 
-func (b *syncBuffer) Read(p []byte) (n int, err os.Error) {
+func (b *syncBuffer) Read(p []byte) (n int, err error) {
        for {
                b.mu.RLock()
                n, err = b.buf.Read(p)
@@ -123,7 +121,7 @@ func (b *syncBuffer) signal() {
        }
 }
 
-func (b *syncBuffer) Write(p []byte) (n int, err os.Error) {
+func (b *syncBuffer) Write(p []byte) (n int, err error) {
        n, err = b.buf.Write(p)
        b.signal()
        return
@@ -138,7 +136,7 @@ func (b *syncBuffer) ReadMode() {
        b.signal()
 }
 
-func (b *syncBuffer) Close() os.Error {
+func (b *syncBuffer) Close() error {
        b.closed = true
        b.signal()
        return nil
@@ -205,7 +203,7 @@ func testSync(t *testing.T, level int, input []byte, name string) {
        }
        buf.ReadMode()
        out := make([]byte, 10)
-       if n, err := r.Read(out); n > 0 || err != os.EOF {
+       if n, err := r.Read(out); n > 0 || err != io.EOF {
                t.Errorf("testSync (%d, %d, %s): final Read: %d, %v (hex: %x)", level, len(input), name, n, err, out[0:n])
        }
        if buf.buf.Len() != 0 {
@@ -226,8 +224,7 @@ func testSync(t *testing.T, level int, input []byte, name string) {
        }
 }
 
-
-func testToFromWithLevel(t *testing.T, level int, input []byte, name string) os.Error {
+func testToFromWithLevel(t *testing.T, level int, input []byte, name string) error {
        buffer := bytes.NewBuffer(nil)
        w := NewWriter(buffer, level)
        w.Write(input)