From 0d999e1db6cd8736ab697de8ce848fa3a5274b9f Mon Sep 17 00:00:00 2001 From: Joshua Sjoding Date: Wed, 24 Feb 2016 22:40:30 -0800 Subject: Refactor to use core.ObjectReader and core.ObjectWriter * New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future * New function signatures provide proper error handling * ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively * Object.Reader now returns (ObjectReader, error) * Object.Writer now returns (ObjectWriter, error) * File.Contents now returns (string, error) * File.Lines now returns ([]string, error) * Blob.Reader now returns (core.ObjectReader, error) * Added internal close helper function for deferred calls to Close that need to check the return value --- storage/memory/object_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'storage/memory/object_test.go') diff --git a/storage/memory/object_test.go b/storage/memory/object_test.go index f9dd25d..f2873fa 100644 --- a/storage/memory/object_test.go +++ b/storage/memory/object_test.go @@ -51,7 +51,11 @@ func (s *ObjectSuite) TestSize(c *C) { func (s *ObjectSuite) TestReader(c *C) { o := &Object{content: []byte("foo")} - b, err := ioutil.ReadAll(o.Reader()) + reader, err := o.Reader() + c.Assert(err, IsNil) + defer func() { c.Assert(reader.Close(), IsNil) }() + + b, err := ioutil.ReadAll(reader) c.Assert(err, IsNil) c.Assert(b, DeepEquals, []byte("foo")) } @@ -59,7 +63,11 @@ func (s *ObjectSuite) TestReader(c *C) { func (s *ObjectSuite) TestWriter(c *C) { o := &Object{} - n, err := o.Writer().Write([]byte("foo")) + writer, err := o.Writer() + c.Assert(err, IsNil) + defer func() { c.Assert(writer.Close(), IsNil) }() + + n, err := writer.Write([]byte("foo")) c.Assert(err, IsNil) c.Assert(n, Equals, 3) -- cgit