From 7d5016ae401f71da3174b71ca5eca292716dda30 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Wed, 27 Nov 2019 19:16:13 +0800 Subject: [PATCH] Test: same folder check --- pkg/filesystem/path_test.go | 7 +++++++ service/explorer/directory.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/filesystem/path_test.go b/pkg/filesystem/path_test.go index 718de10..44cd1ee 100644 --- a/pkg/filesystem/path_test.go +++ b/pkg/filesystem/path_test.go @@ -153,6 +153,13 @@ func TestFileSystem_CreateDirectory(t *testing.T) { asserts.Equal(ErrFileExisted, err) asserts.NoError(mock.ExpectationsWereMet()) + // 存在同名目录 + mock.ExpectQuery("SELECT(.+)folders").WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).AddRow(1, "ab")) + mock.ExpectQuery("SELECT(.+)folders").WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).AddRow(1, "ab")) + err = fs.CreateDirectory(ctx, "/ad/ab") + asserts.Equal(ErrFolderExisted, err) + asserts.NoError(mock.ExpectationsWereMet()) + // 成功创建 mock.ExpectQuery("SELECT(.+)folders").WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).AddRow(1, "ab")) mock.ExpectQuery("SELECT(.+)files").WillReturnRows(sqlmock.NewRows([]string{"id", "name"})) diff --git a/service/explorer/directory.go b/service/explorer/directory.go index 7c8e340..60c91ab 100644 --- a/service/explorer/directory.go +++ b/service/explorer/directory.go @@ -36,7 +36,7 @@ func (service *DirectoryService) ListDirectory(c *gin.Context) serializer.Respon } } -// CreateDirectory 创建目录 TODO:test +// CreateDirectory 创建目录 func (service *DirectoryService) CreateDirectory(c *gin.Context) serializer.Response { // 创建文件系统 fs, err := filesystem.NewFileSystemFromContext(c)