From ab8306d9158432f649f71e4ac37ff58988fbb313 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 16 Apr 2015 19:01:18 -0400 Subject: [PATCH] move decompressor test --- cayley_test.go | 77 ---------------------------- internal/decompressor_test.go | 96 +++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 77 deletions(-) create mode 100644 internal/decompressor_test.go diff --git a/cayley_test.go b/cayley_test.go index f488a3c8d..3c4c76608 100644 --- a/cayley_test.go +++ b/cayley_test.go @@ -15,16 +15,12 @@ package main import ( - "bytes" - "compress/bzip2" - "compress/gzip" "flag" "fmt" "io" "os" "reflect" "sort" - "strings" "sync" "testing" "time" @@ -32,7 +28,6 @@ import ( "github.com/google/cayley/config" "github.com/google/cayley/db" "github.com/google/cayley/graph" - "github.com/google/cayley/internal" "github.com/google/cayley/quad" "github.com/google/cayley/query/gremlin" ) @@ -651,75 +646,3 @@ type reader struct { func (r reader) Read(p []byte) (int, error) { return r.r.Read(p) } - -var testDecompressor = []struct { - message string - input io.Reader - expect []byte - err error - readErr error -}{ - { - message: "text input", - input: strings.NewReader("cayley data\n"), - err: nil, - expect: []byte("cayley data\n"), - readErr: nil, - }, - { - message: "gzip input", - input: bytes.NewReader([]byte{ - 0x1f, 0x8b, 0x08, 0x00, 0x5c, 0xbc, 0xcd, 0x53, 0x00, 0x03, 0x4b, 0x4e, 0xac, 0xcc, 0x49, 0xad, - 0x54, 0x48, 0x49, 0x2c, 0x49, 0xe4, 0x02, 0x00, 0x03, 0xe1, 0xfc, 0xc3, 0x0c, 0x00, 0x00, 0x00, - }), - err: nil, - expect: []byte("cayley data\n"), - readErr: nil, - }, - { - message: "bzip2 input", - input: bytes.NewReader([]byte{ - 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, 0x53, 0x59, 0xb5, 0x4b, 0xe3, 0xc4, 0x00, 0x00, - 0x02, 0xd1, 0x80, 0x00, 0x10, 0x40, 0x00, 0x2e, 0x04, 0x04, 0x20, 0x20, 0x00, 0x31, 0x06, 0x4c, - 0x41, 0x4c, 0x1e, 0xa7, 0xa9, 0x2a, 0x18, 0x26, 0xb1, 0xc2, 0xee, 0x48, 0xa7, 0x0a, 0x12, 0x16, - 0xa9, 0x7c, 0x78, 0x80, - }), - err: nil, - expect: []byte("cayley data\n"), - readErr: nil, - }, - { - message: "bad gzip input", - input: strings.NewReader("\x1f\x8bcayley data\n"), - err: gzip.ErrHeader, - expect: nil, - readErr: nil, - }, - { - message: "bad bzip2 input", - input: strings.NewReader("\x42\x5a\x68cayley data\n"), - err: nil, - expect: nil, - readErr: bzip2.StructuralError("invalid compression level"), - }, -} - -func TestDecompressor(t *testing.T) { - for _, test := range testDecompressor { - r, err := internal.Decompressor(test.input) - if err != test.err { - t.Fatalf("Unexpected error for %s, got:%v expect:%v", test.message, err, test.err) - } - if err != nil { - continue - } - p := make([]byte, len(test.expect)*2) - n, err := r.Read(p) - if err != test.readErr { - t.Fatalf("Unexpected error for reading %s, got:%v expect:%v", test.message, err, test.err) - } - if bytes.Compare(p[:n], test.expect) != 0 { - t.Errorf("Unexpected read result for %s, got:%q expect:%q", test.message, p[:n], test.expect) - } - } -} diff --git a/internal/decompressor_test.go b/internal/decompressor_test.go new file mode 100644 index 000000000..d392e37cf --- /dev/null +++ b/internal/decompressor_test.go @@ -0,0 +1,96 @@ +// Copyright 2014 The Cayley Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package internal + +import ( + "bytes" + "compress/bzip2" + "compress/gzip" + "io" + "strings" + "testing" +) + +var testDecompressor = []struct { + message string + input io.Reader + expect []byte + err error + readErr error +}{ + { + message: "text input", + input: strings.NewReader("cayley data\n"), + err: nil, + expect: []byte("cayley data\n"), + readErr: nil, + }, + { + message: "gzip input", + input: bytes.NewReader([]byte{ + 0x1f, 0x8b, 0x08, 0x00, 0x5c, 0xbc, 0xcd, 0x53, 0x00, 0x03, 0x4b, 0x4e, 0xac, 0xcc, 0x49, 0xad, + 0x54, 0x48, 0x49, 0x2c, 0x49, 0xe4, 0x02, 0x00, 0x03, 0xe1, 0xfc, 0xc3, 0x0c, 0x00, 0x00, 0x00, + }), + err: nil, + expect: []byte("cayley data\n"), + readErr: nil, + }, + { + message: "bzip2 input", + input: bytes.NewReader([]byte{ + 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, 0x53, 0x59, 0xb5, 0x4b, 0xe3, 0xc4, 0x00, 0x00, + 0x02, 0xd1, 0x80, 0x00, 0x10, 0x40, 0x00, 0x2e, 0x04, 0x04, 0x20, 0x20, 0x00, 0x31, 0x06, 0x4c, + 0x41, 0x4c, 0x1e, 0xa7, 0xa9, 0x2a, 0x18, 0x26, 0xb1, 0xc2, 0xee, 0x48, 0xa7, 0x0a, 0x12, 0x16, + 0xa9, 0x7c, 0x78, 0x80, + }), + err: nil, + expect: []byte("cayley data\n"), + readErr: nil, + }, + { + message: "bad gzip input", + input: strings.NewReader("\x1f\x8bcayley data\n"), + err: gzip.ErrHeader, + expect: nil, + readErr: nil, + }, + { + message: "bad bzip2 input", + input: strings.NewReader("\x42\x5a\x68cayley data\n"), + err: nil, + expect: nil, + readErr: bzip2.StructuralError("invalid compression level"), + }, +} + +func TestDecompressor(t *testing.T) { + for _, test := range testDecompressor { + r, err := Decompressor(test.input) + if err != test.err { + t.Fatalf("Unexpected error for %s, got:%v expect:%v", test.message, err, test.err) + } + if err != nil { + continue + } + p := make([]byte, len(test.expect)*2) + n, err := r.Read(p) + if err != test.readErr { + t.Fatalf("Unexpected error for reading %s, got:%v expect:%v", test.message, err, test.err) + } + if bytes.Compare(p[:n], test.expect) != 0 { + t.Errorf("Unexpected read result for %s, got:%q expect:%q", test.message, p[:n], test.expect) + } + } +}