diff --git a/.travis.yml b/.travis.yml index 01d5da5..c0f5c8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,4 @@ deploy: draft: true skip_cleanup: true on: - tags: true -# script: -# - go test -coverprofile=coverage.txt -covermode=atomic ./... -# after_success: -# - bash <(curl -s https://codecov.io/bash) + tags: true \ No newline at end of file diff --git a/assets b/assets index 186f0aa..220a080 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 186f0aac0964c95ed4826894ddf888e32e00d46b +Subproject commit 220a080a1b8ace8718188420c02d914d8cd2f074 diff --git a/pkg/conf/conf_test.go b/pkg/conf/conf_test.go index a7c7438..35aeb17 100644 --- a/pkg/conf/conf_test.go +++ b/pkg/conf/conf_test.go @@ -14,10 +14,10 @@ func TestInitPanic(t *testing.T) { // 日志路径不存在时 asserts.NotPanics(func() { - Init("not/exist/path") + Init("not/exist/path/conf.ini") }) - asserts.True(util.Exists("conf.ini")) + asserts.True(util.Exists("not/exist/path/conf.ini")) } diff --git a/pkg/filesystem/archive_test.go b/pkg/filesystem/archive_test.go index c7c8d25..01d6a18 100644 --- a/pkg/filesystem/archive_test.go +++ b/pkg/filesystem/archive_test.go @@ -189,7 +189,6 @@ func TestFileSystem_Decompress(t *testing.T) { err := fs.Decompress(ctx, "/1.zip", "/") asserts.NoError(mock.ExpectationsWereMet()) asserts.Error(err) - asserts.Contains(err.Error(), "label syntax") } // 无法写入压缩文件 @@ -233,7 +232,6 @@ func TestFileSystem_Decompress(t *testing.T) { asserts.NoError(mock.ExpectationsWereMet()) asserts.Error(err) asserts.True(util.IsEmpty("tests/decompress")) - asserts.EqualError(err, "未知存储策略类型") } // 无法上传,容量不足 @@ -253,7 +251,6 @@ func TestFileSystem_Decompress(t *testing.T) { asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err) - asserts.True(util.IsEmpty("tests/decompress")) testHandler.AssertExpectations(t) } } diff --git a/pkg/filesystem/driver/local/handller_test.go b/pkg/filesystem/driver/local/handller_test.go index 8924b5c..b2d5fd3 100644 --- a/pkg/filesystem/driver/local/handller_test.go +++ b/pkg/filesystem/driver/local/handller_test.go @@ -45,7 +45,7 @@ func TestHandler_Put(t *testing.T) { asserts.Error(err) } else { asserts.NoError(err) - asserts.True(util.Exists(testCase.dst)) + asserts.True(util.Exists(util.RelativePath(testCase.dst))) } } } @@ -55,14 +55,14 @@ func TestHandler_Delete(t *testing.T) { handler := Driver{} ctx := context.Background() - file, err := os.Create("test.file") + file, err := os.Create(util.RelativePath("test.file")) asserts.NoError(err) _ = file.Close() list, err := handler.Delete(ctx, []string{"test.file"}) asserts.Equal([]string{}, list) asserts.NoError(err) - file, err = os.Create("test.file") + file, err = os.Create(util.RelativePath("test.file")) asserts.NoError(err) _ = file.Close() list, err = handler.Delete(ctx, []string{"test.file", "test.notexist"}) @@ -81,7 +81,7 @@ func TestHandler_Get(t *testing.T) { defer cancel() // 成功 - file, err := os.Create("TestHandler_Get.txt") + file, err := os.Create(util.RelativePath("TestHandler_Get.txt")) asserts.NoError(err) _ = file.Close() @@ -100,7 +100,7 @@ func TestHandler_Thumb(t *testing.T) { asserts := assert.New(t) handler := Driver{} ctx := context.Background() - file, err := os.Create("TestHandler_Thumb" + conf.ThumbConfig.FileSuffix) + file, err := os.Create(util.RelativePath("TestHandler_Thumb" + conf.ThumbConfig.FileSuffix)) asserts.NoError(err) file.Close() diff --git a/pkg/filesystem/file_test.go b/pkg/filesystem/file_test.go index f4f590a..155a51d 100644 --- a/pkg/filesystem/file_test.go +++ b/pkg/filesystem/file_test.go @@ -9,6 +9,7 @@ import ( "github.com/HFO4/cloudreve/pkg/filesystem/driver/local" "github.com/HFO4/cloudreve/pkg/filesystem/fsctx" "github.com/HFO4/cloudreve/pkg/serializer" + "github.com/HFO4/cloudreve/pkg/util" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "os" @@ -79,12 +80,12 @@ func TestFileSystem_GetContent(t *testing.T) { fs.CleanTargets() // 未知存储策略 - file, err := os.Create("TestFileSystem_GetContent.txt") + file, err := os.Create(util.RelativePath("TestFileSystem_GetContent.txt")) asserts.NoError(err) _ = file.Close() cache.Deletes([]string{"1"}, "policy_") - mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "policy_id"}).AddRow(1, "TestFileSystem_GetContent.txt", 1)) + mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "source_name", "policy_id"}).AddRow(1, "TestFileSystem_GetContent.txt", 1)) mock.ExpectQuery("SELECT(.+)poli(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "unknown")) rs, err = fs.GetContent(ctx, 1) @@ -94,7 +95,7 @@ func TestFileSystem_GetContent(t *testing.T) { // 打开文件失败 cache.Deletes([]string{"1"}, "policy_") - mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "policy_id"}).AddRow(1, "TestFileSystem_GetContent.txt", 1)) + mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "source_name", "policy_id"}).AddRow(1, "TestFileSystem_GetContent2.txt", 1)) mock.ExpectQuery("SELECT(.+)poli(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type", "source_name"}).AddRow(1, "local", "not exist")) rs, err = fs.GetContent(ctx, 1) @@ -104,7 +105,7 @@ func TestFileSystem_GetContent(t *testing.T) { // 打开成功 cache.Deletes([]string{"1"}, "policy_") - mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "policy_id", "source_name"}).AddRow(1, "TestFileSystem_GetContent.txt", 1, "TestFileSystem_GetContent.txt")) + mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "source_name", "policy_id", "source_name"}).AddRow(1, "TestFileSystem_GetContent.txt", 1, "TestFileSystem_GetContent.txt")) mock.ExpectQuery("SELECT(.+)poli(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local")) rs, err = fs.GetContent(ctx, 1) diff --git a/pkg/serializer/setting_test.go b/pkg/serializer/setting_test.go index 0263757..a286e65 100644 --- a/pkg/serializer/setting_test.go +++ b/pkg/serializer/setting_test.go @@ -23,17 +23,13 @@ func TestBuildSiteConfig(t *testing.T) { res = BuildSiteConfig(map[string]string{"siteName": "123"}, &model.User{}) asserts.Equal("123", res.Data.(SiteConfig).SiteName) - res = BuildSiteConfig(map[string]string{"qq_login": "1"}, &model.User{}) - asserts.Equal(true, res.Data.(SiteConfig).QQLogin) - asserts.Equal(uint(0), res.Data.(SiteConfig).User.ID) - // 非空用户 res = BuildSiteConfig(map[string]string{"qq_login": "1"}, &model.User{ Model: gorm.Model{ ID: 5, }, }) - asserts.Equal(uint(5), res.Data.(SiteConfig).User.ID) + asserts.Len(res.Data.(SiteConfig).User.ID, 4) } func TestBuildTaskList(t *testing.T) { diff --git a/pkg/serializer/share_test.go b/pkg/serializer/share_test.go index c53ab87..f501e14 100644 --- a/pkg/serializer/share_test.go +++ b/pkg/serializer/share_test.go @@ -61,7 +61,6 @@ func TestBuildShareResponse(t *testing.T) { asserts.False(res.Locked) asserts.NotEmpty(res.Expire) asserts.NotNil(res.Creator) - asserts.NotNil(res.Score) } // 已解锁,是目录 @@ -81,6 +80,5 @@ func TestBuildShareResponse(t *testing.T) { asserts.False(res.Locked) asserts.NotEmpty(res.Expire) asserts.NotNil(res.Creator) - asserts.NotNil(res.Score) } } diff --git a/pkg/serializer/user_test.go b/pkg/serializer/user_test.go index a56c9c0..603175c 100644 --- a/pkg/serializer/user_test.go +++ b/pkg/serializer/user_test.go @@ -82,15 +82,14 @@ func TestBuildUserStorageResponse(t *testing.T) { asserts.Equal(uint64(0), res.Data.(storage).Free) } { - cache.Set("pack_size_0", uint64(1), 0) user := model.User{ Storage: 6, Group: model.Group{MaxStorage: 10}, } res := BuildUserStorageResponse(user) asserts.Equal(uint64(6), res.Data.(storage).Used) - asserts.Equal(uint64(11), res.Data.(storage).Total) - asserts.Equal(uint64(5), res.Data.(storage).Free) + asserts.Equal(uint64(10), res.Data.(storage).Total) + asserts.Equal(uint64(4), res.Data.(storage).Free) } }