piwigo/PiwigoDirectoryUploader
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

added some tests for createMissingCategories

Browse Source 
fixed finding found in createMissingCategories
This commit is contained in:
Philipp Häfelfinger 2019-04-05 23:59:31 +02:00
parent fa54c63712
commit 528e74b9fe
2 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/pkg/category/category.go
View File

@ -115,6 +115,11 @@ func createMissingCategories(piwigoApi piwigo.PiwigoCategoryApi, db datastore.Ca
return err return err
} }
if len(missingCategories) == 0 {
logrus.Info("No categories missing on piwigo.")
return nil
}
logrus.Infof("Creating %d categories", len(missingCategories)) logrus.Infof("Creating %d categories", len(missingCategories))
for _, category := range missingCategories { for _, category := range missingCategories {

57
internal/pkg/category/category_test.go
View File

@ -51,13 +51,7 @@ func Test_updatePiwigoCategoriesFromServer_updates_a_category(t *testing.T) {
Name: "oldName", Name: "oldName",
} }
expectedCategory := datastore.CategoryData{ expectedCategory := createDbRootCategory()
PiwigoId: 1,
PiwigoParentId: 0,
CategoryId: 1,
Name: "2019",
Key: "2019",
}
dbmock := NewMockCategoryProvider(mockCtrl) dbmock := NewMockCategoryProvider(mockCtrl)
dbmock.EXPECT().GetCategoryByPiwigoId(1).Return(oldCategory, nil).Times(1) dbmock.EXPECT().GetCategoryByPiwigoId(1).Return(oldCategory, nil).Times(1)
@ -74,11 +68,52 @@ func Test_updatePiwigoCategoriesFromServer_updates_a_category(t *testing.T) {
} }
} }
func Test_createMissingCategories_does_not_call_piwigo_if_there_is_no_category_missing(t *testing.T) {
mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish()
var categoriesToCreate []datastore.CategoryData
dbmock := NewMockCategoryProvider(mockCtrl)
dbmock.EXPECT().GetCategoriesToCreate().Return(categoriesToCreate, nil).Times(1)
piwigoMock := NewMockPiwigoCategoryApi(mockCtrl)
piwigoMock.EXPECT().CreateCategory(gomock.Any(), gomock.Any()).Times(0)
err := createMissingCategories(piwigoMock, dbmock)
if err != nil {
t.Error(err)
}
}
func Test_createMissingCategories_calls_piwigo_api_and_saves_returned_id(t *testing.T) {
mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish()
expectedCategory := createDbRootCategory()
category := createDbRootCategory()
category.PiwigoId = 0
categoriesToCreate := []datastore.CategoryData{category}
dbmock := NewMockCategoryProvider(mockCtrl)
dbmock.EXPECT().GetCategoriesToCreate().Return(categoriesToCreate, nil).Times(1)
dbmock.EXPECT().SaveCategory(expectedCategory).Return(nil).Times(1)
piwigoMock := NewMockPiwigoCategoryApi(mockCtrl)
piwigoMock.EXPECT().CreateCategory(0, category.Name).Return(1, nil).Times(1)
err := createMissingCategories(piwigoMock, dbmock)
if err != nil {
t.Error(err)
}
}
func Test_getParentId_returns_0_for_root_nodes(t *testing.T) { func Test_getParentId_returns_0_for_root_nodes(t *testing.T) {
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
category := crateDbRootCategory() category := createDbRootCategory()
dbmock := NewMockCategoryProvider(mockCtrl) dbmock := NewMockCategoryProvider(mockCtrl)
dbmock.EXPECT().GetCategoryByKey(gomock.Any()).Times(0) dbmock.EXPECT().GetCategoryByKey(gomock.Any()).Times(0)
@ -115,7 +150,7 @@ func Test_getParentId_returns_error_if_key_invalid(t *testing.T) {
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
category := crateDbRootCategory() category := createDbRootCategory()
category.Key = "." category.Key = "."
dbmock := NewMockCategoryProvider(mockCtrl) dbmock := NewMockCategoryProvider(mockCtrl)
@ -134,7 +169,7 @@ func Test_getParentId_finds_the_exptected_parent_id(t *testing.T) {
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
parentCategory := crateDbRootCategory() parentCategory := createDbRootCategory()
category := createDbSubCategory() category := createDbSubCategory()
dbmock := NewMockCategoryProvider(mockCtrl) dbmock := NewMockCategoryProvider(mockCtrl)
@ -150,7 +185,7 @@ func Test_getParentId_finds_the_exptected_parent_id(t *testing.T) {
} }
} }
func crateDbRootCategory() datastore.CategoryData { func createDbRootCategory() datastore.CategoryData {
parentCategory := datastore.CategoryData{ parentCategory := datastore.CategoryData{
PiwigoId: 1, PiwigoId: 1,
PiwigoParentId: 0, PiwigoParentId: 0,