fix(pkg/gitreceive/storage/bucket_test.go): check that calls were made in the bucket tests

Author: Aaron Schlesinger

pkg/gitreceive/storage/bucket_test.go

@@ -19,22 +19,26 @@ type bucketCreate struct {
 }
 
 func TestCreateBucketSuccess(t *testing.T) {
-	var res bucketCreate
-	creator := FakeBucketCreator(func(name string, acl s3.BucketACL, location string) error {
-		res = bucketCreate{name: name, acl: acl, loc: location}
-		return nil
-	})
+	creator := &FakeBucketCreator{
+		Fn: func(name string, acl s3.BucketACL, location string) error {
+			return nil
+		},
+	}
 
 	assert.NoErr(t, CreateBucket(creator, bucketName))
-	assert.Equal(t, res.name, bucketName, "bucket name")
-	assert.Equal(t, res.acl, ACLPublicRead, "bucket ACL")
-	assert.Equal(t, res.loc, "", "bucket location")
+	assert.Equal(t, len(creator.Calls), 1, "number of calls to MakeBucket")
+	assert.Equal(t, creator.Calls[0].BucketName, bucketName, "bucket name")
+	assert.Equal(t, creator.Calls[0].ACL, ACLPublicRead, "bucket ACL")
+	assert.Equal(t, creator.Calls[0].Location, "", "bucket location")
 }
 
 func TestCreateBucketFailure(t *testing.T) {
 	err := errors.New("test err")
-	creator := FakeBucketCreator(func(string, s3.BucketACL, string) error {
-		return err
-	})
+	creator := &FakeBucketCreator{
+		Fn: func(string, s3.BucketACL, string) error {
+			return err
+		},
+	}
 	assert.Err(t, CreateBucket(creator, bucketName), err)
+	assert.Equal(t, len(creator.Calls), 1, "number of calls to MakeBucket")
 }

pkg/gitreceive/storage/object_test.go

@@ -0,0 +1,39 @@
+package storage
+
+import (
+	"testing"
+
+	"github.com/arschles/assert"
+	s3 "github.com/minio/minio-go"
+)
+
+const (
+	objKey = "myobj"
+)
+
+func TestObjectExistsSuccess(t *testing.T) {
+	objInfo := s3.ObjectInfo{Key: objKey, Err: nil, Size: 1234}
+	statter := &FakeObjectStatter{
+		Fn: func(string, string) (s3.ObjectInfo, error) {
+			return objInfo, nil
+		},
+	}
+	exists, err := ObjectExists(statter, bucketName, objKey)
+	assert.NoErr(t, err)
+	assert.True(t, exists, "object not found when it should be present")
+	assert.Equal(t, len(statter.Calls), 1, "number of StatObject calls")
+	assert.Equal(t, statter.Calls[0].BucketName, bucketName, "bucket name")
+	assert.Equal(t, statter.Calls[0].ObjectKey, objKey, "object key")
+}
+
+func TestObjectExistsNoObject(t *testing.T) {
+	statter := &FakeObjectStatter{
+		Fn: func(string, string) (s3.ObjectInfo, error) {
+			return s3.ObjectInfo{}, s3.ErrorResponse{Code: noSuchKeyCode}
+		},
+	}
+	exists, err := ObjectExists(statter, bucketName, objKey)
+	assert.NoErr(t, err)
+	assert.False(t, exists, "object found when it should be missing")
+	assert.Equal(t, len(statter.Calls), 1, "number of StatObject calls")
+}