mpeczkowski/GitRepositoryManager
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 1 Releases Wiki Activity

Simplify function and structure names for tests

Browse Source
This commit is contained in:
Mikołaj Pęczkowski 2021-11-07 00:43:40 +01:00
parent 07ed716279
commit 38cd52ffd6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/common_utils_test.go
View File

@ -13,7 +13,7 @@ import (
"gitlab.com/revalus/grm/config" "gitlab.com/revalus/grm/config"
) )
type TestDir struct { type TestSetup struct {
rootFS billy.Filesystem rootFS billy.Filesystem
baseRepository struct { baseRepository struct {
fileSystem billy.Filesystem fileSystem billy.Filesystem
@ -42,7 +42,7 @@ func createTmpDir() string {
return tempDir return tempDir
} }
func getTestDirForTests() TestDir { func getTestSetup() TestSetup {
tmpDir := createTmpDir() tmpDir := createTmpDir()
@ -71,7 +71,7 @@ func getTestDirForTests() TestDir {
checkErrorDuringPreparation(err) checkErrorDuringPreparation(err)
return TestDir{ return TestSetup{
baseRepository: struct { baseRepository: struct {
fileSystem billy.Filesystem fileSystem billy.Filesystem
repo *git.Repository repo *git.Repository
@ -100,8 +100,8 @@ func getFSForLocalRepo(dirName string, baseFileSystem billy.Filesystem) (billy.F
return fsForLocalRepo, storageForTestRepo return fsForLocalRepo, storageForTestRepo
} }
func getBaseForTestingSyncCommand() (StatusChecker, *git.Repository, config.RepositoryConfig, TestDir) { func getBaseForTestingSyncCommand() (StatusChecker, *git.Repository, config.RepositoryConfig, TestSetup) {
tmpDirWithInitialRepository := getTestDirForTests() tmpDirWithInitialRepository := getTestSetup()
dirNameForLocalRepository := "testRepo" dirNameForLocalRepository := "testRepo"
fsForLocalRepo, storageForTestRepo := getFSForLocalRepo(dirNameForLocalRepository, tmpDirWithInitialRepository.rootFS) fsForLocalRepo, storageForTestRepo := getFSForLocalRepo(dirNameForLocalRepository, tmpDirWithInitialRepository.rootFS)

8
commands/status_cmd_test.go
View File

@ -12,7 +12,7 @@ import (
) )
func TestIfBranchesAreEqual(t *testing.T) { func TestIfBranchesAreEqual(t *testing.T) {
tmpDirWithInitialRepository := getTestDirForTests() tmpDirWithInitialRepository := getTestSetup()
fakeLocalRepo, err := git.Clone(memory.NewStorage(), memfs.New(), &git.CloneOptions{ fakeLocalRepo, err := git.Clone(memory.NewStorage(), memfs.New(), &git.CloneOptions{
URL: tmpDirWithInitialRepository.baseRepository.fileSystem.Root(), URL: tmpDirWithInitialRepository.baseRepository.fileSystem.Root(),
@ -42,7 +42,7 @@ func TestIfBranchesAreEqual(t *testing.T) {
func TestIfCurrentBranchIsDifferent(t *testing.T) { func TestIfCurrentBranchIsDifferent(t *testing.T) {
tmpDirWithInitialRepository := getTestDirForTests() tmpDirWithInitialRepository := getTestSetup()
fakeLocalRepo, err := git.Clone(memory.NewStorage(), memfs.New(), &git.CloneOptions{ fakeLocalRepo, err := git.Clone(memory.NewStorage(), memfs.New(), &git.CloneOptions{
URL: tmpDirWithInitialRepository.baseRepository.fileSystem.Root(), URL: tmpDirWithInitialRepository.baseRepository.fileSystem.Root(),
}) })
@ -91,7 +91,7 @@ func TestIfCurrentBranchIsDifferent(t *testing.T) {
func TestCommandRepositoryDoesNotExists(t *testing.T) { func TestCommandRepositoryDoesNotExists(t *testing.T) {
tmpDirWithInitialRepository := getTestDirForTests() tmpDirWithInitialRepository := getTestSetup()
fsForLocalRepo, storageForTestRepo := getFSForLocalRepo("noMatterValue", tmpDirWithInitialRepository.rootFS) fsForLocalRepo, storageForTestRepo := getFSForLocalRepo("noMatterValue", tmpDirWithInitialRepository.rootFS)
_, err := git.Clone(storageForTestRepo, fsForLocalRepo, &git.CloneOptions{ _, err := git.Clone(storageForTestRepo, fsForLocalRepo, &git.CloneOptions{
@ -127,7 +127,7 @@ func TestCommandRepositoryDoesNotExists(t *testing.T) {
func TestCommandRepositoryNoRemoteBranch(t *testing.T) { func TestCommandRepositoryNoRemoteBranch(t *testing.T) {
tmpDirWithInitialRepository := getTestDirForTests() tmpDirWithInitialRepository := getTestSetup()
dirNameForLocalRepository := "testRepo" dirNameForLocalRepository := "testRepo"
fsForLocalRepo, storageForTestRepo := getFSForLocalRepo(dirNameForLocalRepository, tmpDirWithInitialRepository.rootFS) fsForLocalRepo, storageForTestRepo := getFSForLocalRepo(dirNameForLocalRepository, tmpDirWithInitialRepository.rootFS)