mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Move some files into models' sub packages (#20262)
* Move some files into models' sub packages * Move functions * merge main branch * Fix check * fix check * Fix some tests * Fix lint * Fix lint * Revert lint changes * Fix error comments * Fix lint Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
		| @@ -2,11 +2,12 @@ | ||||
| // Use of this source code is governed by a MIT-style | ||||
| // license that can be found in the LICENSE file. | ||||
|  | ||||
| package admin | ||||
| package admin_test | ||||
|  | ||||
| import ( | ||||
| 	"testing" | ||||
|  | ||||
| 	"code.gitea.io/gitea/models/admin" | ||||
| 	"code.gitea.io/gitea/models/db" | ||||
| 	"code.gitea.io/gitea/models/unittest" | ||||
|  | ||||
| @@ -14,8 +15,8 @@ import ( | ||||
| ) | ||||
|  | ||||
| func TestNotice_TrStr(t *testing.T) { | ||||
| 	notice := &Notice{ | ||||
| 		Type:        NoticeRepository, | ||||
| 	notice := &admin.Notice{ | ||||
| 		Type:        admin.NoticeRepository, | ||||
| 		Description: "test description", | ||||
| 	} | ||||
| 	assert.Equal(t, "admin.notices.type_1", notice.TrStr()) | ||||
| @@ -24,24 +25,24 @@ func TestNotice_TrStr(t *testing.T) { | ||||
| func TestCreateNotice(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	noticeBean := &Notice{ | ||||
| 		Type:        NoticeRepository, | ||||
| 	noticeBean := &admin.Notice{ | ||||
| 		Type:        admin.NoticeRepository, | ||||
| 		Description: "test description", | ||||
| 	} | ||||
| 	unittest.AssertNotExistsBean(t, noticeBean) | ||||
| 	assert.NoError(t, CreateNotice(db.DefaultContext, noticeBean.Type, noticeBean.Description)) | ||||
| 	assert.NoError(t, admin.CreateNotice(db.DefaultContext, noticeBean.Type, noticeBean.Description)) | ||||
| 	unittest.AssertExistsAndLoadBean(t, noticeBean) | ||||
| } | ||||
|  | ||||
| func TestCreateRepositoryNotice(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	noticeBean := &Notice{ | ||||
| 		Type:        NoticeRepository, | ||||
| 	noticeBean := &admin.Notice{ | ||||
| 		Type:        admin.NoticeRepository, | ||||
| 		Description: "test description", | ||||
| 	} | ||||
| 	unittest.AssertNotExistsBean(t, noticeBean) | ||||
| 	assert.NoError(t, CreateRepositoryNotice(noticeBean.Description)) | ||||
| 	assert.NoError(t, admin.CreateRepositoryNotice(noticeBean.Description)) | ||||
| 	unittest.AssertExistsAndLoadBean(t, noticeBean) | ||||
| } | ||||
|  | ||||
| @@ -49,20 +50,20 @@ func TestCreateRepositoryNotice(t *testing.T) { | ||||
|  | ||||
| func TestCountNotices(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 	assert.Equal(t, int64(3), CountNotices()) | ||||
| 	assert.Equal(t, int64(3), admin.CountNotices()) | ||||
| } | ||||
|  | ||||
| func TestNotices(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	notices, err := Notices(1, 2) | ||||
| 	notices, err := admin.Notices(1, 2) | ||||
| 	assert.NoError(t, err) | ||||
| 	if assert.Len(t, notices, 2) { | ||||
| 		assert.Equal(t, int64(3), notices[0].ID) | ||||
| 		assert.Equal(t, int64(2), notices[1].ID) | ||||
| 	} | ||||
|  | ||||
| 	notices, err = Notices(2, 2) | ||||
| 	notices, err = admin.Notices(2, 2) | ||||
| 	assert.NoError(t, err) | ||||
| 	if assert.Len(t, notices, 1) { | ||||
| 		assert.Equal(t, int64(1), notices[0].ID) | ||||
| @@ -72,45 +73,45 @@ func TestNotices(t *testing.T) { | ||||
| func TestDeleteNotice(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	assert.NoError(t, DeleteNotice(3)) | ||||
| 	unittest.AssertNotExistsBean(t, &Notice{ID: 3}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| 	assert.NoError(t, admin.DeleteNotice(3)) | ||||
| 	unittest.AssertNotExistsBean(t, &admin.Notice{ID: 3}) | ||||
| } | ||||
|  | ||||
| func TestDeleteNotices(t *testing.T) { | ||||
| 	// delete a non-empty range | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	assert.NoError(t, DeleteNotices(1, 2)) | ||||
| 	unittest.AssertNotExistsBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertNotExistsBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| 	assert.NoError(t, admin.DeleteNotices(1, 2)) | ||||
| 	unittest.AssertNotExistsBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertNotExistsBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| } | ||||
|  | ||||
| func TestDeleteNotices2(t *testing.T) { | ||||
| 	// delete an empty range | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	assert.NoError(t, DeleteNotices(3, 2)) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| 	assert.NoError(t, admin.DeleteNotices(3, 2)) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| } | ||||
|  | ||||
| func TestDeleteNoticesByIDs(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 3}) | ||||
| 	assert.NoError(t, DeleteNoticesByIDs([]int64{1, 3})) | ||||
| 	unittest.AssertNotExistsBean(t, &Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Notice{ID: 2}) | ||||
| 	unittest.AssertNotExistsBean(t, &Notice{ID: 3}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 3}) | ||||
| 	assert.NoError(t, admin.DeleteNoticesByIDs([]int64{1, 3})) | ||||
| 	unittest.AssertNotExistsBean(t, &admin.Notice{ID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &admin.Notice{ID: 2}) | ||||
| 	unittest.AssertNotExistsBean(t, &admin.Notice{ID: 3}) | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user