Move db related basic functions to models/db (#17075)

* Move db related basic functions to models/db

* Fix lint

* Fix lint

* Fix test

* Fix lint

* Fix lint

* revert unnecessary change

* Fix test

* Fix wrong replace string

* Use *Context

* Correct committer spelling and fix wrong replaced words

Co-authored-by: zeripath <art27@cantab.net>

1 files changed, 11 insertions, 10 deletions

diff --git a/models/token_test.go b/models/token_test.go
index 0f24c7527d..21d827ea61 100644
--- a/models/token_test.go
+++ b/models/token_test.go
@@ -7,17 +7,18 @@ package models
 import (
 	"testing"
 
+	"code.gitea.io/gitea/models/db"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestNewAccessToken(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 	token := &AccessToken{
 		UID:  3,
 		Name: "Token C",
 	}
 	assert.NoError(t, NewAccessToken(token))
-	AssertExistsAndLoadBean(t, token)
+	db.AssertExistsAndLoadBean(t, token)
 
 	invalidToken := &AccessToken{
 		ID:   token.ID, // duplicate
@@ -30,7 +31,7 @@ func TestNewAccessToken(t *testing.T) {
 func TestAccessTokenByNameExists(t *testing.T) {
 	name := "Token Gitea"
 
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 	token := &AccessToken{
 		UID:  3,
 		Name: name,
@@ -43,7 +44,7 @@ func TestAccessTokenByNameExists(t *testing.T) {
 
 	// Save it to the database
 	assert.NoError(t, NewAccessToken(token))
-	AssertExistsAndLoadBean(t, token)
+	db.AssertExistsAndLoadBean(t, token)
 
 	// This token must be found by name in the DB now
 	exist, err = AccessTokenByNameExists(token)
@@ -63,7 +64,7 @@ func TestAccessTokenByNameExists(t *testing.T) {
 }
 
 func TestGetAccessTokenBySHA(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 	token, err := GetAccessTokenBySHA("d2c6c1ba3890b309189a8e618c72a162e4efbf36")
 	assert.NoError(t, err)
 	assert.Equal(t, int64(1), token.UID)
@@ -81,7 +82,7 @@ func TestGetAccessTokenBySHA(t *testing.T) {
 }
 
 func TestListAccessTokens(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 	tokens, err := ListAccessTokens(ListAccessTokensOptions{UserID: 1})
 	assert.NoError(t, err)
 	if assert.Len(t, tokens, 2) {
@@ -104,24 +105,24 @@ func TestListAccessTokens(t *testing.T) {
 }
 
 func TestUpdateAccessToken(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 	token, err := GetAccessTokenBySHA("4c6f36e6cf498e2a448662f915d932c09c5a146c")
 	assert.NoError(t, err)
 	token.Name = "Token Z"
 
 	assert.NoError(t, UpdateAccessToken(token))
-	AssertExistsAndLoadBean(t, token)
+	db.AssertExistsAndLoadBean(t, token)
 }
 
 func TestDeleteAccessTokenByID(t *testing.T) {
-	assert.NoError(t, PrepareTestDatabase())
+	assert.NoError(t, db.PrepareTestDatabase())
 
 	token, err := GetAccessTokenBySHA("4c6f36e6cf498e2a448662f915d932c09c5a146c")
 	assert.NoError(t, err)
 	assert.Equal(t, int64(1), token.UID)
 
 	assert.NoError(t, DeleteAccessTokenByID(token.ID, 1))
-	AssertNotExistsBean(t, token)
+	db.AssertNotExistsBean(t, token)
 
 	err = DeleteAccessTokenByID(100, 100)
 	assert.Error(t, err)