add new invalid repo test case for branch package

neel1996 · neel1996 · commit 56512e7d7463 · 2021-07-03T23:10:34.000+05:30
diff --git a/.github/workflows/go-collab.yml b/.github/workflows/go-collab.yml
@@ -46,7 +46,7 @@ jobs:
           sudo chown $(whoami) /usr/local/gitconvex/
           go generate
           $GITHUB_WORKSPACE/build_scripts/clone_test_repo.sh
-          go test ./... -count=1 -v
+          go test ./... -count=1 -cover
 
   gitconvex-build:
     needs:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -46,7 +46,7 @@ jobs:
           sudo chown $(whoami) /usr/local/gitconvex/
           go generate
           $GITHUB_WORKSPACE/build_scripts/clone_test_repo.sh
-          go test ./... -count=1 -v
+          go test ./... -count=1 -cover
 
   gitconvex-build:
     needs:
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ gitconvex-test/
 
 env_config.json
 gitclient
+coverage.out
 /*.exe
 /*.dll
 gitconvex
diff --git a/Makefile b/Makefile
@@ -34,8 +34,20 @@ test:
 	rm -rf $$GITCONVEX_TEST_REPO && \
  	go clean --cache && \
  	./build_scripts/clone_test_repo.sh && \
- 	go test ./... -count=1 && \
+ 	go test ./... -count=1 -cover -coverprofile=coverage.out && \
 	rm -rf $$GITCONVEX_TEST_REPO
 
+test-pretty:
+	export GITCONVEX_TEST_REPO="$(PWD)/gitconvex-test" && \
+	export GITCONVEX_DEFAULT_PATH="$(PWD)/gitconvex-test" && \
+	rm -rf $$GITCONVEX_TEST_REPO && \
+ 	go clean --cache && \
+ 	./build_scripts/clone_test_repo.sh && \
+ 	gotestsum ./... -count=1 -cover -coverprofile=coverage.out && \
+	rm -rf $$GITCONVEX_TEST_REPO
+
+show-coverage:
+	go tool cover -html=coverage.out
+
 start:
 	./dist/gitconvex
diff --git a/build_scripts/clone_test_repo.sh b/build_scripts/clone_test_repo.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-git clone https://github.com/neel1996/gitconvex-test.git $GITCONVEX_TEST_REPO
+git clone https://github.com/neel1996/gitconvex-test.git $GITCONVEX_TEST_REPO
+git init $GITCONVEX_TEST_REPO/no_head
+clear
diff --git a/git/branch/branch_validation_test.go b/git/branch/branch_validation_test.go
@@ -10,9 +10,9 @@ import (
 
 type BranchFieldValidationTestSuite struct {
 	suite.Suite
-	repo       *git2go.Repository
-	branchName string
-	validation Validation
+	repo        *git2go.Repository
+	branchNames []string
+	validation  Validation
 }
 
 func TestBranchFieldValidationTestSuite(t *testing.T) {
@@ -26,8 +26,8 @@ func (suite *BranchFieldValidationTestSuite) SetupTest() {
 	}
 
 	suite.repo = r
-	suite.branchName = "test_branch"
-	suite.validation = NewBranchFieldsValidation(suite.repo, suite.branchName)
+	suite.branchNames = []string{"test_branch_1", "test_branch_2"}
+	suite.validation = NewBranchFieldsValidation(suite.repo, suite.branchNames[0], suite.branchNames[1])
 }
 
 func (suite *BranchFieldValidationTestSuite) TestValidateBranchFields_WhenAllFieldsAreValid_ShouldReturnNil() {
@@ -45,7 +45,7 @@ func (suite *BranchFieldValidationTestSuite) TestValidateBranchFields_WhenRepoIs
 }
 
 func (suite *BranchFieldValidationTestSuite) TestValidateBranchFields_WhenBranchNameIsEmpty_ShouldReturnError() {
-	suite.validation = NewBranchFieldsValidation(suite.repo, "")
+	suite.validation = NewBranchFieldsValidation(suite.repo, "", "")
 	err := suite.validation.ValidateBranchFields()
 
 	suite.NotNil(err)
diff --git a/git/branch/git_branch_add_test.go b/git/branch/git_branch_add_test.go
@@ -5,13 +5,16 @@ import (
 	git2go "github.com/libgit2/git2go/v31"
 	"github.com/stretchr/testify/suite"
 	"os"
+	"path/filepath"
 	"testing"
 )
 
 type BranchAddTestSuite struct {
 	suite.Suite
-	repo      *git2go.Repository
-	branchAdd Add
+	repo       *git2go.Repository
+	noHeadRepo *git2go.Repository
+	branchName string
+	branchAdd  Add
 }
 
 func TestBranchAddTestSuite(t *testing.T) {
@@ -23,13 +26,18 @@ func (suite *BranchAddTestSuite) SetupTest() {
 	if err != nil {
 		fmt.Println(err)
 	}
+	noHeadPath := os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "no_head"
+	noHeadRepo, _ := git2go.OpenRepository(noHeadPath)
+
 	suite.repo = r
-	suite.branchAdd = NewAddBranch(suite.repo, "test_1", false, nil)
+	suite.noHeadRepo = noHeadRepo
+	suite.branchName = "test_1"
+	suite.branchAdd = NewAddBranch(suite.repo, suite.branchName, false, nil)
 }
 
-func (suite *BranchAddTestSuite) TearDownTest() {
+func (suite *BranchAddTestSuite) TearDownSuite() {
 	r, _ := git2go.OpenRepository(os.Getenv("GITCONVEX_TEST_REPO"))
-	NewDeleteBranch(r, "test_1").DeleteBranch()
+	_ = NewDeleteBranch(r, suite.branchName).DeleteBranch()
 }
 
 func (suite *BranchAddTestSuite) TestAddBranch_WhenBranchAdditionSucceeds_ShouldReturnNil() {
@@ -46,16 +54,22 @@ func (suite *BranchAddTestSuite) TestAddBranch_WhenRepoIsNil_ShouldReturnError()
 }
 
 func (suite *BranchAddTestSuite) TestAddBranch_WhenBranchNameIsEmpty_ShouldReturnError() {
-	r, _ := git2go.OpenRepository(os.Getenv("GITCONVEX_TEST_REPO"))
-	suite.branchAdd = NewAddBranch(r, "", false, nil)
+	suite.branchAdd = NewAddBranch(suite.repo, "", false, nil)
+	branchAddError := suite.branchAdd.AddBranch()
+
+	suite.NotNil(branchAddError)
+}
+
+func (suite *BranchAddTestSuite) TestAddBranch_WhenHeadIsNil_ShouldReturnError() {
+	suite.branchAdd = NewAddBranch(suite.noHeadRepo, suite.branchName, false, nil)
 	branchAddError := suite.branchAdd.AddBranch()
 
 	suite.NotNil(branchAddError)
 }
 
 func (suite *BranchAddTestSuite) TestAddBranch_WhenBranchAdditionFails_ShouldReturnError() {
 	r, _ := git2go.OpenRepository(os.Getenv("GITCONVEX_TEST_REPO"))
-	suite.branchAdd = NewAddBranch(r, "test_1", false, nil)
+	suite.branchAdd = NewAddBranch(r, "master", false, nil)
 
 	//Adding duplicate branches
 	_ = suite.branchAdd.AddBranch()
diff --git a/git/branch/git_branch_checkout_test.go b/git/branch/git_branch_checkout_test.go
@@ -5,6 +5,7 @@ import (
 	git2go "github.com/libgit2/git2go/v31"
 	"github.com/stretchr/testify/suite"
 	"os"
+	"path/filepath"
 	"testing"
 )
 
@@ -13,18 +14,24 @@ type BranchCheckoutTestSuite struct {
 	branchName     string
 	checkoutBranch Checkout
 	repo           *git2go.Repository
+	noHeadRepo     *git2go.Repository
 }
 
 func TestBranchCheckoutTestSuite(t *testing.T) {
 	suite.Run(t, new(BranchCheckoutTestSuite))
 }
 
-func (suite *BranchCheckoutTestSuite) SetupTest() {
+func (suite *BranchCheckoutTestSuite) SetupSuite() {
 	r, err := git2go.OpenRepository(os.Getenv("GITCONVEX_TEST_REPO"))
 	if err != nil {
 		fmt.Println(err)
 	}
+
+	noHeadPath := os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "no_head"
+	noHeadRepo, _ := git2go.OpenRepository(noHeadPath)
+
 	suite.repo = r
+	suite.noHeadRepo = noHeadRepo
 	suite.branchName = "test_checkout"
 	addErr := NewAddBranch(suite.repo, suite.branchName, false, nil).AddBranch()
 	if addErr != nil {
@@ -39,7 +46,7 @@ func (suite *BranchCheckoutTestSuite) TearDownSuite() {
 	if err != nil {
 		return
 	}
-	NewDeleteBranch(suite.repo, suite.branchName).DeleteBranch()
+	_ = NewDeleteBranch(suite.repo, suite.branchName).DeleteBranch()
 }
 
 func (suite *BranchCheckoutTestSuite) TestCheckoutBranch_WhenBranchIsCheckedOut_ShouldReturnNil() {
@@ -71,6 +78,13 @@ func (suite *BranchCheckoutTestSuite) TestCheckoutBranch_WhenBranchNameIsEmpty_S
 	suite.Equal("branch name is empty", err.Error())
 }
 
+func (suite *BranchCheckoutTestSuite) TestCheckoutBranch_WhenRepoHasNoHead_ShouldReturnError() {
+	suite.checkoutBranch = NewBranchCheckout(suite.noHeadRepo, suite.branchName)
+	err := suite.checkoutBranch.CheckoutBranch()
+
+	suite.NotNil(err)
+}
+
 func (suite *BranchCheckoutTestSuite) TestCheckoutBranch_WhenNonExistingBranchIsSelected_ShouldReturnError() {
 	suite.checkoutBranch = NewBranchCheckout(suite.repo, "no_exists")
 	err := suite.checkoutBranch.CheckoutBranch()
diff --git a/git/branch/git_branch_compare_test.go b/git/branch/git_branch_compare_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 )
@@ -31,7 +32,7 @@ func (suite *BranchCompareTestSuite) SetupSuite() {
 		fmt.Println(err)
 	}
 	suite.repo = r
-	suite.testFile = os.Getenv("GITCONVEX_TEST_REPO") + "/" + "compare_test.txt"
+	suite.testFile = os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "compare_test.txt"
 	suite.baseBranch = "master"
 	suite.compareBranch = "new_compare"
 	addErr := NewAddBranch(r, suite.compareBranch, false, nil).AddBranch()
@@ -53,7 +54,7 @@ func (suite *BranchCompareTestSuite) SetupTest() {
 }
 
 func (suite *BranchCompareTestSuite) TearDownSuite() {
-	checkoutErr := NewBranchCheckout(suite.repo, suite.baseBranch).CheckoutBranch()
+	checkoutErr := NewBranchCheckout(suite.repo, "master").CheckoutBranch()
 	if checkoutErr != nil {
 		logger.Log(checkoutErr.Error(), global.StatusError)
 		return
@@ -80,9 +81,10 @@ func (suite *BranchCompareTestSuite) TestCompareBranch_WhenBranchesHaveDifferent
 		time.UTC,
 	).String()
 
-	suite.Len(compareResults, 1)
+	suite.NotNil(compareResults)
+	suite.NotZero(len(compareResults))
+	suite.NotZero(len(compareResults[0].Commits))
 
-	suite.Len(compareResults[0].Commits, 1)
 	suite.NotNil(*compareResults[0].Commits[0])
 	suite.NotEmpty(*compareResults[0].Commits[0].CommitMessage)
 	suite.Contains(timeString, compareResults[0].Date)
diff --git a/git/branch/git_branch_delete_test.go b/git/branch/git_branch_delete_test.go
@@ -5,6 +5,7 @@ import (
 	git2go "github.com/libgit2/git2go/v31"
 	"github.com/stretchr/testify/suite"
 	"os"
+	"path/filepath"
 	"testing"
 )
 
@@ -13,6 +14,7 @@ type BranchDeleteTestSuite struct {
 	branchDelete Delete
 	branchName   string
 	repo         *git2go.Repository
+	noHeadRepo   *git2go.Repository
 }
 
 func TestBranchDeleteTestSuite(t *testing.T) {
@@ -24,7 +26,12 @@ func (suite *BranchDeleteTestSuite) SetupTest() {
 	if err != nil {
 		fmt.Println(err)
 	}
+
+	noHeadPath := os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "no_head"
+	noHeadRepo, _ := git2go.OpenRepository(noHeadPath)
+
 	suite.repo = r
+	suite.noHeadRepo = noHeadRepo
 	suite.branchName = "delete_branch"
 	suite.branchDelete = NewDeleteBranch(suite.repo, suite.branchName)
 }
@@ -70,6 +77,13 @@ func (suite *BranchDeleteTestSuite) TestDeleteBranch_WhenBranchNameIsEmpty_Shoul
 	suite.NotNil(err)
 }
 
+func (suite *BranchDeleteTestSuite) TestDeleteBranch_WhenRepoHasNoHead_ShouldReturnError() {
+	suite.branchDelete = NewDeleteBranch(suite.noHeadRepo, suite.branchName)
+	err := suite.branchDelete.DeleteBranch()
+
+	suite.NotNil(err)
+}
+
 func (suite *BranchDeleteTestSuite) TestDeleteBranch_WhenBranchDoesNotExists_ShouldReturnError() {
 	suite.branchDelete = NewDeleteBranch(suite.repo, "no_exists")
 	err := suite.branchDelete.DeleteBranch()
diff --git a/git/branch/git_branch_list_test.go b/git/branch/git_branch_list_test.go
@@ -26,7 +26,7 @@ func (suite *BranchListTestSuite) SetupTest() {
 		fmt.Println(err)
 	}
 	noHeadPath := os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "no_head"
-	noHeadRepo, _ := git2go.InitRepository(noHeadPath, false)
+	noHeadRepo, _ := git2go.OpenRepository(noHeadPath)
 
 	suite.repo = r
 	suite.noHeadRepo = noHeadRepo

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (suite *BranchListTestSuite) SetupTest() {`
`26`	`26`	`fmt.Println(err)`
`27`	`27`	`}`
`28`	`28`	`noHeadPath := os.Getenv("GITCONVEX_TEST_REPO") + string(filepath.Separator) + "no_head"`
`29`		`- noHeadRepo, _ := git2go.InitRepository(noHeadPath, false)`
	`29`	`+ noHeadRepo, _ := git2go.OpenRepository(noHeadPath)`
`30`	`30`
`31`	`31`	`suite.repo = r`
`32`	`32`	`suite.noHeadRepo = noHeadRepo`