diff options
author | Robert Griesemer <gri@golang.org> | 2009-12-15 15:33:31 -0800 |
---|---|---|
committer | Robert Griesemer <gri@golang.org> | 2009-12-15 15:33:31 -0800 |
commit | d9527dd16f72598b54a64550607bf892efa12384 (patch) | |
tree | 2ad16a7db2d3c484b47426ad2568359ab633820c /src/pkg/compress/flate/deflate_test.go | |
parent | aea97e0bd7da9cef1cc631ddbd3578a0877a4fcc (diff) | |
download | golang-d9527dd16f72598b54a64550607bf892efa12384.tar.gz |
1) Change default gofmt default settings for
parsing and printing to new syntax.
Use -oldparser to parse the old syntax,
use -oldprinter to print the old syntax.
2) Change default gofmt formatting settings
to use tabs for indentation only and to use
spaces for alignment. This will make the code
alignment insensitive to an editor's tabwidth.
Use -spaces=false to use tabs for alignment.
3) Manually changed src/exp/parser/parser_test.go
so that it doesn't try to parse the parser's
source files using the old syntax (they have
new syntax now).
4) gofmt -w src misc test/bench
1st set of files.
R=rsc
CC=agl, golang-dev, iant, ken2, r
http://codereview.appspot.com/180047
Diffstat (limited to 'src/pkg/compress/flate/deflate_test.go')
-rw-r--r-- | src/pkg/compress/flate/deflate_test.go | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/pkg/compress/flate/deflate_test.go b/src/pkg/compress/flate/deflate_test.go index 9d5ada994..1ac8059b3 100644 --- a/src/pkg/compress/flate/deflate_test.go +++ b/src/pkg/compress/flate/deflate_test.go @@ -5,27 +5,27 @@ package flate import ( - "bytes"; - "fmt"; - "io/ioutil"; - "os"; - "testing"; + "bytes" + "fmt" + "io/ioutil" + "os" + "testing" ) type deflateTest struct { - in []byte; - level int; - out []byte; + in []byte + level int + out []byte } type deflateInflateTest struct { - in []byte; + in []byte } type reverseBitsTest struct { - in uint16; - bitCount uint8; - out uint16; + in uint16 + bitCount uint8 + out uint16 } var deflateTests = []*deflateTest{ @@ -70,19 +70,19 @@ var reverseBitsTests = []*reverseBitsTest{ } func getLargeDataChunk() []byte { - result := make([]byte, 100000); + result := make([]byte, 100000) for i := range result { result[i] = byte(int64(i) * int64(i) & 0xFF) } - return result; + return result } func TestDeflate(t *testing.T) { for _, h := range deflateTests { - buffer := bytes.NewBuffer([]byte{}); - w := NewDeflater(buffer, h.level); - w.Write(h.in); - w.Close(); + buffer := bytes.NewBuffer([]byte{}) + w := NewDeflater(buffer, 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) @@ -91,21 +91,21 @@ func TestDeflate(t *testing.T) { } func testToFromWithLevel(t *testing.T, level int, input []byte, name string) os.Error { - buffer := bytes.NewBuffer([]byte{}); - w := NewDeflater(buffer, level); - w.Write(input); - w.Close(); - inflater := NewInflater(buffer); - decompressed, err := ioutil.ReadAll(inflater); + buffer := bytes.NewBuffer([]byte{}) + w := NewDeflater(buffer, level) + w.Write(input) + w.Close() + inflater := NewInflater(buffer) + decompressed, err := ioutil.ReadAll(inflater) if err != nil { - t.Errorf("reading inflater: %s", err); - return err; + t.Errorf("reading inflater: %s", err) + return err } - inflater.Close(); + inflater.Close() if bytes.Compare(input, decompressed) != 0 { t.Errorf("decompress(compress(data)) != data: level=%d input=%s", level, name) } - return nil; + return nil } func testToFrom(t *testing.T, input []byte, name string) { @@ -130,8 +130,8 @@ func TestReverseBits(t *testing.T) { } func TestDeflateInflateString(t *testing.T) { - gold := bytes.NewBufferString(getEdata()).Bytes(); - testToFromWithLevel(t, 1, gold, "2.718281828..."); + gold := bytes.NewBufferString(getEdata()).Bytes() + testToFromWithLevel(t, 1, gold, "2.718281828...") } func getEdata() string { |