Fix tests

Signed-off-by: Filip Navara <[email protected]>

Author: filipnavara

modules/git/blob_test.go

@@ -5,7 +5,6 @@
 package git
 
 import (
-	"bytes"
 	"io/ioutil"
 	"testing"
 
@@ -50,9 +49,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 `
 
-	r, err := testBlob.Data()
+	r, err := testBlob.DataAsync()
 	assert.NoError(t, err)
 	require.NotNil(t, r)
+	defer r.Close()
 
 	data, err := ioutil.ReadAll(r)
 	assert.NoError(t, err)
@@ -61,20 +61,11 @@ THE SOFTWARE.
 
 func Benchmark_Blob_Data(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		r, err := testBlob.Data()
+		r, err := testBlob.DataAsync()
 		if err != nil {
 			b.Fatal(err)
 		}
+		defer r.Close()
 		ioutil.ReadAll(r)
 	}
 }
-
-func Benchmark_Blob_DataPipeline(b *testing.B) {
-	stdout := new(bytes.Buffer)
-	for i := 0; i < b.N; i++ {
-		stdout.Reset()
-		if err := testBlob.DataPipeline(stdout, nil); err != nil {
-			b.Fatal(err)
-		}
-	}
-}

modules/git/commit_info_test.go

@@ -51,7 +51,7 @@ func testGetCommitsInfo(t *testing.T, repo1 *Repository) {
 		assert.NoError(t, err)
 		entries, err := tree.ListEntries()
 		assert.NoError(t, err)
-		commitsInfo, err := entries.GetCommitsInfo(commit, testCase.Path, nil)
+		commitsInfo, _, err := entries.GetCommitsInfo(commit, testCase.Path, nil)
 		assert.NoError(t, err)
 		assert.Len(t, commitsInfo, len(testCase.ExpectedIDs))
 		for _, commitInfo := range commitsInfo {
@@ -107,7 +107,7 @@ func BenchmarkEntries_GetCommitsInfo(b *testing.B) {
 		b.ResetTimer()
 		b.Run(benchmark.name, func(b *testing.B) {
 			for i := 0; i < b.N; i++ {
-				_, err := entries.GetCommitsInfo(commit, "", nil)
+				_, _, err := entries.GetCommitsInfo(commit, "", nil)
 				if err != nil {
 					b.Fatal(err)
 				}

modules/git/parse_test.go

@@ -8,6 +8,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
+	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 func TestParseTreeEntries(t *testing.T) {
@@ -23,10 +25,12 @@ func TestParseTreeEntries(t *testing.T) {
 			Input: "100644 blob 61ab7345a1a3bbc590068ccae37b8515cfc5843c\texample/file2.txt\n",
 			Expected: []*TreeEntry{
 				{
-					mode: EntryModeBlob,
-					Type: ObjectBlob,
-					ID:   MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
-					name: "example/file2.txt",
+					ID: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
+					gogitTreeEntry: &object.TreeEntry{
+						Hash: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
+						Name: "example/file2.txt",
+						Mode: filemode.Regular,
+					},
 				},
 			},
 		},
@@ -35,16 +39,20 @@ func TestParseTreeEntries(t *testing.T) {
 				"040000 tree 1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8\texample\n",
 			Expected: []*TreeEntry{
 				{
-					ID:   MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
-					Type: ObjectBlob,
-					mode: EntryModeSymlink,
-					name: "example/\n.txt",
+					ID: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
+					gogitTreeEntry: &object.TreeEntry{
+						Hash: MustIDFromString("61ab7345a1a3bbc590068ccae37b8515cfc5843c"),
+						Name: "example/\n.txt",
+						Mode: filemode.Symlink,
+					},
 				},
 				{
-					ID:   MustIDFromString("1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8"),
-					Type: ObjectTree,
-					mode: EntryModeTree,
-					name: "example",
+					ID: MustIDFromString("1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8"),
+					gogitTreeEntry: &object.TreeEntry{
+						Hash: MustIDFromString("1d01fb729fb0db5881daaa6030f9f2d3cd3d5ae8"),
+						Name: "example",
+						Mode: filemode.Dir,
+					},
 				},
 			},
 		},

modules/git/repo_blob_test.go

@@ -30,8 +30,9 @@ func TestRepository_GetBlob_Found(t *testing.T) {
 		blob, err := r.GetBlob(testCase.OID)
 		assert.NoError(t, err)
 
-		dataReader, err := blob.Data()
+		dataReader, err := blob.DataAsync()
 		assert.NoError(t, err)
+		defer dataReader.Close()
 
 		data, err := ioutil.ReadAll(dataReader)
 		assert.NoError(t, err)

modules/git/tree_entry_test.go

@@ -8,18 +8,20 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
+	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 func getTestEntries() Entries {
 	return Entries{
-		&TreeEntry{name: "v1.0", mode: EntryModeTree},
-		&TreeEntry{name: "v2.0", mode: EntryModeTree},
-		&TreeEntry{name: "v2.1", mode: EntryModeTree},
-		&TreeEntry{name: "v2.12", mode: EntryModeTree},
-		&TreeEntry{name: "v2.2", mode: EntryModeTree},
-		&TreeEntry{name: "v12.0", mode: EntryModeTree},
-		&TreeEntry{name: "abc", mode: EntryModeBlob},
-		&TreeEntry{name: "bcd", mode: EntryModeBlob},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v1.0", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.0", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.1", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.12", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v2.2", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "v12.0", Mode: filemode.Dir}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "abc", Mode: filemode.Regular}},
+		&TreeEntry{gogitTreeEntry: &object.TreeEntry{Name: "bcd", Mode: filemode.Regular}},
 	}
 }
 

routers/repo/wiki_test.go

@@ -40,8 +40,9 @@ func wikiContent(t *testing.T, repo *models.Repository, wikiName string) string
 	if !assert.NotNil(t, entry) {
 		return ""
 	}
-	reader, err := entry.Blob().Data()
+	reader, err := entry.Blob().DataAsync()
 	assert.NoError(t, err)
+	defer reader.Close()
 	bytes, err := ioutil.ReadAll(reader)
 	assert.NoError(t, err)
 	return string(bytes)