Refactor: mv test internal/testutil; app_test for tests (#46)

Author: alexandear

internal/gitlab.go

@@ -65,7 +65,7 @@ func (s *GitLab) FetchProjectPage(ctx context.Context, page int, user *User, idA
 	}
 
 	for _, proj := range projs {
-		if !s.hasUserContributions(ctx, user, proj.ID) {
+		if !s.HasUserContributions(ctx, user, proj.ID) {
 			continue
 		}
 
@@ -81,7 +81,7 @@ func (s *GitLab) FetchProjectPage(ctx context.Context, page int, user *User, idA
 	return projects, resp.NextPage, nil
 }
 
-func (s *GitLab) hasUserContributions(ctx context.Context, user *User, projectID int) bool {
+func (s *GitLab) HasUserContributions(ctx context.Context, user *User, projectID int) bool {
 	const perPage = 50
 
 	opt := &gitlab.ListContributorsOptions{

internal/gitlab_test.go

@@ -1,4 +1,4 @@
-package app
+package app_test
 
 import (
 	"context"
@@ -9,16 +9,17 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/xanzy/go-gitlab"
 
-	"github.com/alexandear/import-gitlab-commits/test"
+	app "github.com/alexandear/import-gitlab-commits/internal"
+	"github.com/alexandear/import-gitlab-commits/internal/testutil"
 )
 
-func TestService_hasContributionsByUser(t *testing.T) {
+func TestGitLabHasUserContributions(t *testing.T) {
 	git := initGit(t)
-	s := NewGitLab(test.NewLog(t), git)
+	s := app.NewGitLab(testutil.NewLog(t), git)
 	user := newCurrentUser(t, git)
 
-	assert.False(t, s.hasUserContributions(context.Background(), user, 3))
-	assert.True(t, s.hasUserContributions(context.Background(), user, 575))
+	assert.False(t, s.HasUserContributions(context.Background(), user, 3))
+	assert.True(t, s.HasUserContributions(context.Background(), user, 575))
 }
 
 func initGit(t *testing.T) *gitlab.Client {
@@ -37,13 +38,13 @@ func initGit(t *testing.T) *gitlab.Client {
 	return git
 }
 
-func newCurrentUser(t *testing.T, gitlabClient *gitlab.Client) *User {
+func newCurrentUser(t *testing.T, gitlabClient *gitlab.Client) *app.User {
 	t.Helper()
 
 	user, _, err := gitlabClient.Users.CurrentUser()
 	require.NoError(t, err)
 
-	return &User{
+	return &app.User{
 		Name:      user.Name,
 		Email:     user.Email,
 		CreatedAt: *user.CreatedAt,

test/log.go renamed to internal/testutil/log.go

@@ -1,4 +1,4 @@
-package test
+package testutil
 
 import (
 	"log"

main_test.go

@@ -5,14 +5,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/alexandear/import-gitlab-commits/test"
+	"github.com/alexandear/import-gitlab-commits/internal/testutil"
 )
 
 func TestExecute(t *testing.T) {
 	t.Run("error when wrong GITLAB_TOKEN", func(t *testing.T) {
 		t.Setenv("GITLAB_TOKEN", "")
 
-		err := Execute(test.NewLog(t))
+		err := Execute(testutil.NewLog(t))
 
 		assert.ErrorContains(t, err, "GITLAB_TOKEN")
 	})
@@ -21,7 +21,7 @@ func TestExecute(t *testing.T) {
 		t.Setenv("GITLAB_TOKEN", "yourgitlabtoken")
 		t.Setenv("GITLAB_BASE_URL", ":")
 
-		err := Execute(test.NewLog(t))
+		err := Execute(testutil.NewLog(t))
 
 		assert.ErrorContains(t, err, "GITLAB_BASE_URL")
 	})
@@ -31,7 +31,7 @@ func TestExecute(t *testing.T) {
 		t.Setenv("GITLAB_BASE_URL", "https://gitlab.com")
 		t.Setenv("COMMITTER_NAME", "")
 
-		err := Execute(test.NewLog(t))
+		err := Execute(testutil.NewLog(t))
 
 		assert.ErrorContains(t, err, "COMMITTER_NAME")
 	})
@@ -42,7 +42,7 @@ func TestExecute(t *testing.T) {
 		t.Setenv("COMMITTER_NAME", "John Doe")
 		t.Setenv("COMMITTER_EMAIL", "")
 
-		err := Execute(test.NewLog(t))
+		err := Execute(testutil.NewLog(t))
 
 		assert.ErrorContains(t, err, "COMMITTER_EMAIL")
 	})