Merge pull request #102 from setlog/quality-remove-unnecessary-code

Remove own code by relying on bytes.Buffer instead

Author: MMulthaupt

pkg/dummy/io.go

@@ -1,38 +1,11 @@
 package dummy
 
-import "io"
+import (
+	"bytes"
+)
 
-type ReadCloser struct {
-	Data []byte
-	pos  int
+type ByteReadCloser struct {
+	*bytes.Buffer
 }
 
-func (rc *ReadCloser) Read(p []byte) (n int, err error) {
-	if rc.Data == nil {
-		return 0, nil
-	}
-	var bytesWritten int
-	if len(p) < len(rc.Data)-rc.pos {
-		bytesWritten = rc.write(p, len(p))
-	} else {
-		bytesWritten = rc.write(p, len(rc.Data)-rc.pos)
-	}
-	if rc.pos == len(rc.Data) {
-		return bytesWritten, io.EOF
-	}
-	return bytesWritten, nil
-}
-
-func (rc *ReadCloser) write(p []byte, count int) int {
-	x := 0
-	for i := rc.pos; i < rc.pos+count; i++ {
-		p[x] = rc.Data[i]
-		x++
-	}
-	rc.pos += x
-	return x
-}
-
-func (rc *ReadCloser) Close() error {
-	return nil
-}
+func (rc *ByteReadCloser) Close() error { return nil }

pkg/dummy/io_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestReadCloser(t *testing.T) {
 	data := []byte("super amazing data")
-	rc := &dummy.ReadCloser{Data: data}
+	rc := &dummy.ByteReadCloser{Buffer: bytes.NewBuffer(data)}
 	readData, err := ioutil.ReadAll(rc)
 	if err != nil {
 		t.Fatalf("Error: %v", err)
@@ -23,7 +23,7 @@ func TestReadCloser(t *testing.T) {
 
 func TestReadCloserBigFile(t *testing.T) {
 	data := []byte("hyper amazing data" + misc.MustGetRandomHexString(10000))
-	rc := &dummy.ReadCloser{Data: data}
+	rc := &dummy.ByteReadCloser{Buffer: bytes.NewBuffer(data)}
 	readData, err := ioutil.ReadAll(rc)
 	if err != nil {
 		t.Fatalf("Error: %v", err)

pkg/fetching/download_test.go

@@ -64,7 +64,7 @@ func TestHttpClientDoFuncFailure(t *testing.T) {
 func TestBadHttpResponse(t *testing.T) {
 	de := fetching.CreateDummyEnvironment(t, 1000, -1)
 	fetching.DoForClientFunc = func(client *http.Client, req *http.Request) (*http.Response, error) {
-		return &http.Response{StatusCode: http.StatusInternalServerError, Body: &dummy.ReadCloser{}}, nil
+		return &http.Response{StatusCode: http.StatusInternalServerError, Body: &dummy.ByteReadCloser{}}, nil
 	}
 	de.TestDownloadRetries(t, "http://example.com")
 	de.OmitContentLength = true

pkg/launcher/hashing/scan_test.go

@@ -1,6 +1,7 @@
 package hashing
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -49,13 +50,13 @@ func dummyListDirectory(dirPath string) ([]os.FileInfo, error) {
 func dummyReadFile(filePath string) (io.ReadCloser, error) {
 	switch filePath {
 	case filepath.FromSlash("x/foo"):
-		return &dummy.ReadCloser{Data: []byte("abc")}, nil
+		return &dummy.ByteReadCloser{Buffer: bytes.NewBuffer([]byte("abc"))}, nil
 	case filepath.FromSlash("x/foo/bar"):
-		return &dummy.ReadCloser{Data: []byte("def")}, nil
+		return &dummy.ByteReadCloser{Buffer: bytes.NewBuffer([]byte("def"))}, nil
 	case filepath.FromSlash("x/fuu/baaar"):
-		return &dummy.ReadCloser{Data: []byte("ghi")}, nil
+		return &dummy.ByteReadCloser{Buffer: bytes.NewBuffer([]byte("ghi"))}, nil
 	case filepath.FromSlash("x/fuu/moo/meow/bla"):
-		return &dummy.ReadCloser{Data: []byte("jkl")}, nil
+		return &dummy.ByteReadCloser{Buffer: bytes.NewBuffer([]byte("jkl"))}, nil
 	}
 	return nil, fmt.Errorf("File not found")
 }