Fix test

Author: lunny

integrations/delete_user_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
-	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/models/unittest"
+	user_model "code.gitea.io/gitea/models/user"
 )
 
 func assertUserDeleted(t *testing.T, userID int64) {

models/user/follow_test.go

@@ -7,15 +7,16 @@ package user
 import (
 	"testing"
 
-	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/unittest"
+
 	"github.com/stretchr/testify/assert"
 )
 
 func TestIsFollowing(t *testing.T) {
-	assert.NoError(t, db.PrepareTestDatabase())
+	assert.NoError(t, unittest.PrepareTestDatabase())
 	assert.True(t, IsFollowing(4, 2))
 	assert.False(t, IsFollowing(2, 4))
-	assert.False(t, IsFollowing(5, db.NonexistentID))
-	assert.False(t, IsFollowing(db.NonexistentID, 5))
-	assert.False(t, IsFollowing(db.NonexistentID, db.NonexistentID))
+	assert.False(t, IsFollowing(5, unittest.NonexistentID))
+	assert.False(t, IsFollowing(unittest.NonexistentID, 5))
+	assert.False(t, IsFollowing(unittest.NonexistentID, unittest.NonexistentID))
 }

models/user_test.go

@@ -562,36 +562,36 @@ func TestNewUserRedirect3(t *testing.T) {
 }
 
 func TestFollowUser(t *testing.T) {
-	assert.NoError(t, db.PrepareTestDatabase())
+	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	testSuccess := func(followerID, followedID int64) {
 		assert.NoError(t, user_model.FollowUser(followerID, followedID))
-		db.AssertExistsAndLoadBean(t, &user_model.Follow{UserID: followerID, FollowID: followedID})
+		unittest.AssertExistsAndLoadBean(t, &user_model.Follow{UserID: followerID, FollowID: followedID})
 	}
 	testSuccess(4, 2)
 	testSuccess(5, 2)
 
 	assert.NoError(t, user_model.FollowUser(2, 2))
 
-	CheckConsistencyFor(t, &User{})
+	unittest.CheckConsistencyFor(t, &User{})
 }
 
 func TestUnfollowUser(t *testing.T) {
-	assert.NoError(t, db.PrepareTestDatabase())
+	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	testSuccess := func(followerID, followedID int64) {
 		assert.NoError(t, user_model.UnfollowUser(followerID, followedID))
-		db.AssertNotExistsBean(t, &user_model.Follow{UserID: followerID, FollowID: followedID})
+		unittest.AssertNotExistsBean(t, &user_model.Follow{UserID: followerID, FollowID: followedID})
 	}
 	testSuccess(4, 2)
 	testSuccess(5, 2)
 	testSuccess(2, 2)
 
-	CheckConsistencyFor(t, &User{})
+	unittest.CheckConsistencyFor(t, &User{})
 }
 
 func TestGetUserByOpenID(t *testing.T) {
-	assert.NoError(t, db.PrepareTestDatabase())
+	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	_, err := GetUserByOpenID("https://unknown")
 	if assert.Error(t, err) {