m

Author: Laurie T. Malau

components/common-go/db/dbtest/conn.go

@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package dbtest
+package db
 
 import (
 	"context"

components/common-go/db/dbtest/personal_access_token.go renamed to components/gitpod-db/go/personal_access_token.go

@@ -2,21 +2,23 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package dbtest
+package db_test
 
 import (
 	"context"
 	"testing"
 	"time"
 
+	db "github.com/gitpod-io/gitpod/components/gitpod-db/go"
+	"github.com/gitpod-io/gitpod/components/gitpod-db/go/dbtest"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
 
 func TestPersonalAccessToken_Get(t *testing.T) {
-	conn := ConnectForTests(t)
+	conn := dbtest.ConnectForTests(t)
 
-	token := PersonalAccessToken{
+	token := db.PersonalAccessToken{
 		ID:             uuid.New(),
 		UserID:         uuid.New(),
 		Hash:           "some-secure-hash",
@@ -31,15 +33,15 @@ func TestPersonalAccessToken_Get(t *testing.T) {
 	tx := conn.Create(token)
 	require.NoError(t, tx.Error)
 
-	result, err := GetToken(context.Background(), conn, token.ID)
+	result, err := db.GetToken(context.Background(), conn, token.ID)
 	require.NoError(t, err)
 	require.Equal(t, token.ID, result.ID)
 }
 
 func TestPersonalAccessToken_Create(t *testing.T) {
-	conn := ConnectForTests(t)
+	conn := dbtest.ConnectForTests(t)
 
-	request := PersonalAccessToken{
+	request := db.PersonalAccessToken{
 		ID:             uuid.New(),
 		UserID:         uuid.New(),
 		Hash:           "another-secure-hash",
@@ -51,7 +53,7 @@ func TestPersonalAccessToken_Create(t *testing.T) {
 		LastModified:   time.Now(),
 	}
 
-	result, err := CreateToken(context.Background(), conn, request)
+	result, err := db.CreateToken(context.Background(), conn, request)
 	require.NoError(t, err)
 
 	require.Equal(t, request.ID, result.ID)