From 6ede4c6086bc0d571bbf0abca94a149147e05086 Mon Sep 17 00:00:00 2001 From: andygeiss <4ndygeiss@gmail.com> Date: Sat, 19 Jun 2021 13:25:38 +0200 Subject: [PATCH] refactoring --- clients/cli/main.go | 4 +- services/project/resourceAccess/utils_test.go | 40 ------------------- .../project_filesystem.go} | 14 +++---- .../project_filesystem_test.go} | 10 ++--- .../{resourceAccess => resources}/utils.go | 2 +- services/project/resources/utils_test.go | 40 +++++++++++++++++++ 6 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 services/project/resourceAccess/utils_test.go rename services/project/{resourceAccess/fileSystem.go => resources/project_filesystem.go} (52%) rename services/project/{resourceAccess/fileSystem_test.go => resources/project_filesystem_test.go} (64%) rename services/project/{resourceAccess => resources}/utils.go (97%) create mode 100644 services/project/resources/utils_test.go diff --git a/clients/cli/main.go b/clients/cli/main.go index b4f72dd..1baf396 100644 --- a/clients/cli/main.go +++ b/clients/cli/main.go @@ -8,7 +8,7 @@ import ( "github.com/andygeiss/method2go/services/project" "github.com/andygeiss/method2go/services/project/engines" - "github.com/andygeiss/method2go/services/project/resourceaccess" + "github.com/andygeiss/method2go/services/project/resources" ) var ( @@ -69,7 +69,7 @@ func main() { } ensureDefaults() name := os.Args[1] - ra := resourceaccess.NewFileSystem(name, files) + ra := resources.NewProjectResourceAccessFileSystem(name, files) te := engines.NewDefaultTemplateEngine(&content, ".configs", files) pm := project.NewManager(te, ra) _ = pm.CreateByName(context.Background(), name) diff --git a/services/project/resourceAccess/utils_test.go b/services/project/resourceAccess/utils_test.go deleted file mode 100644 index 3349b0a..0000000 --- a/services/project/resourceAccess/utils_test.go +++ /dev/null @@ -1,40 +0,0 @@ -package resourceaccess_test - -import ( - "os" - "path/filepath" - "testing" - - "github.com/andygeiss/method2go/services/project/resourceaccess" - assert "github.com/andygeiss/utilities/testing" -) - -func TestCreateFolders_Should_Create_One_Folder(t *testing.T) { - os.RemoveAll("foo") - err := resourceaccess.CreateFolders("foo") - assert.That("err should be nil", t, err, nil) - assert.That("project folder exists", t, resourceaccess.HasFolder("foo"), true) -} - -func TestCreateFolders_Should_Create_Two_Folders(t *testing.T) { - err := resourceaccess.CreateFolders("foo", filepath.Join("foo", "bar")) - assert.That("err should be nil", t, err, nil) - assert.That("folder [foo] exists", t, resourceaccess.HasFolder("foo"), true) - assert.That("folder [foo/bar] exists", t, resourceaccess.HasFolder(filepath.Join("foo", "bar")), true) - os.RemoveAll("foo") -} - -func TestCreateFoldersByFile_Should_Create_One_Folder(t *testing.T) { - err := resourceaccess.CreateFoldersByFile(filepath.Join("foo", "bar.go")) - assert.That("err should be nil", t, err, nil) - assert.That("folder [foo] exists", t, resourceaccess.HasFolder("foo"), true) - os.RemoveAll("foo") -} - -func TestCreateFoldersByFile_Should_Create_Two_Folders(t *testing.T) { - err := resourceaccess.CreateFoldersByFile(filepath.Join("foo", "bar.go")) - assert.That("err should be nil", t, err, nil) - assert.That("folder [foo] exists", t, resourceaccess.HasFolder("foo"), true) - assert.That("folder [foo/bar] does not exists", t, resourceaccess.HasFolder(filepath.Join("foo", "bar.go")), false) - os.RemoveAll("foo") -} diff --git a/services/project/resourceAccess/fileSystem.go b/services/project/resources/project_filesystem.go similarity index 52% rename from services/project/resourceAccess/fileSystem.go rename to services/project/resources/project_filesystem.go index 48fdbd6..4ba2adc 100644 --- a/services/project/resourceAccess/fileSystem.go +++ b/services/project/resources/project_filesystem.go @@ -1,4 +1,4 @@ -package resourceaccess +package resources import ( "os" @@ -7,13 +7,13 @@ import ( "github.com/andygeiss/method2go/services/project" ) -// FileSystem ... -type FileSystem struct { +// ProjectResourceAccessFileSystem ... +type ProjectResourceAccessFileSystem struct { files []string path string } -func (a *FileSystem) GenerateProjectStructure(p *project.Project) (err error) { +func (a *ProjectResourceAccessFileSystem) GenerateProjectStructure(p *project.Project) (err error) { for _, file := range a.files { dst := filepath.Join(a.path, file) data := []byte(p.Contents[file]) @@ -27,9 +27,9 @@ func (a *FileSystem) GenerateProjectStructure(p *project.Project) (err error) { return nil } -// NewFileSystem ... -func NewFileSystem(path string, files []string) project.ProjectResourceAccess { - return &FileSystem{ +// NewProjectResourceAccessFileSystem ... +func NewProjectResourceAccessFileSystem(path string, files []string) project.ProjectResourceAccess { + return &ProjectResourceAccessFileSystem{ files: files, path: path, } diff --git a/services/project/resourceAccess/fileSystem_test.go b/services/project/resources/project_filesystem_test.go similarity index 64% rename from services/project/resourceAccess/fileSystem_test.go rename to services/project/resources/project_filesystem_test.go index b354073..2c1e466 100644 --- a/services/project/resourceAccess/fileSystem_test.go +++ b/services/project/resources/project_filesystem_test.go @@ -1,4 +1,4 @@ -package resourceaccess_test +package resources_test import ( "os" @@ -6,20 +6,20 @@ import ( "testing" "github.com/andygeiss/method2go/services/project" - "github.com/andygeiss/method2go/services/project/resourceaccess" + "github.com/andygeiss/method2go/services/project/resources" assert "github.com/andygeiss/utilities/testing" ) func TestFileSystem_GenerateProjectStructure_Should_Return_Without_An_Error(t *testing.T) { os.RemoveAll("testdata") - repository := resourceaccess.NewFileSystem("testdata", []string{"foo/bar/foo.txt"}) + access := resources.NewProjectResourceAccessFileSystem("testdata", []string{"foo/bar/foo.txt"}) project := &project.Project{ Contents: map[string]string{ "foo/bar/foo.txt": "bar", }, } - err := repository.GenerateProjectStructure(project) - exists := resourceaccess.HasFile(filepath.Join("testdata", "foo", "bar", "foo.txt")) + err := access.GenerateProjectStructure(project) + exists := resources.HasFile(filepath.Join("testdata", "foo", "bar", "foo.txt")) assert.That("error should be nil", t, err, nil) assert.That("project should not be nil", t, project == nil, false) assert.That("foo/bar/main.go should exists", t, exists, true) diff --git a/services/project/resourceAccess/utils.go b/services/project/resources/utils.go similarity index 97% rename from services/project/resourceAccess/utils.go rename to services/project/resources/utils.go index 606f823..0de7329 100644 --- a/services/project/resourceAccess/utils.go +++ b/services/project/resources/utils.go @@ -1,4 +1,4 @@ -package resourceaccess +package resources import ( "os" diff --git a/services/project/resources/utils_test.go b/services/project/resources/utils_test.go new file mode 100644 index 0000000..13940d0 --- /dev/null +++ b/services/project/resources/utils_test.go @@ -0,0 +1,40 @@ +package resources_test + +import ( + "os" + "path/filepath" + "testing" + + "github.com/andygeiss/method2go/services/project/resources" + assert "github.com/andygeiss/utilities/testing" +) + +func TestCreateFolders_Should_Create_One_Folder(t *testing.T) { + os.RemoveAll("foo") + err := resources.CreateFolders("foo") + assert.That("err should be nil", t, err, nil) + assert.That("project folder exists", t, resources.HasFolder("foo"), true) +} + +func TestCreateFolders_Should_Create_Two_Folders(t *testing.T) { + err := resources.CreateFolders("foo", filepath.Join("foo", "bar")) + assert.That("err should be nil", t, err, nil) + assert.That("folder [foo] exists", t, resources.HasFolder("foo"), true) + assert.That("folder [foo/bar] exists", t, resources.HasFolder(filepath.Join("foo", "bar")), true) + os.RemoveAll("foo") +} + +func TestCreateFoldersByFile_Should_Create_One_Folder(t *testing.T) { + err := resources.CreateFoldersByFile(filepath.Join("foo", "bar.go")) + assert.That("err should be nil", t, err, nil) + assert.That("folder [foo] exists", t, resources.HasFolder("foo"), true) + os.RemoveAll("foo") +} + +func TestCreateFoldersByFile_Should_Create_Two_Folders(t *testing.T) { + err := resources.CreateFoldersByFile(filepath.Join("foo", "bar.go")) + assert.That("err should be nil", t, err, nil) + assert.That("folder [foo] exists", t, resources.HasFolder("foo"), true) + assert.That("folder [foo/bar] does not exists", t, resources.HasFolder(filepath.Join("foo", "bar.go")), false) + os.RemoveAll("foo") +}