summaryrefslogtreecommitdiff
path: root/tests/cracha.go
diff options
context:
space:
mode:
Diffstat (limited to 'tests/cracha.go')
-rw-r--r--tests/cracha.go58
1 files changed, 29 insertions, 29 deletions
diff --git a/tests/cracha.go b/tests/cracha.go
index 9421a30..6bb0c53 100644
--- a/tests/cracha.go
+++ b/tests/cracha.go
@@ -9,7 +9,7 @@ import (
"time"
"golite"
- "guuid"
+ "uuid"
"scrypt"
g "gobang"
)
@@ -17,7 +17,7 @@ import (
type userDataT struct{
- userID guuid.UUID
+ userID uuid.UUID
email string
salt []byte
pwhash []byte
@@ -34,7 +34,7 @@ func mksalt() []byte {
func newUser() userDataT {
return userDataT{
- userID: guuid.New(),
+ userID: uuid.New(),
email: string(mksalt()),
salt: mksalt(),
pwhash: mksalt(),
@@ -193,7 +193,7 @@ func test_registerStmt() {
g.Testing("users can't have the same uuid", func() {
u1 := newUser()
u2 := newUser()
- userID := guuid.New()
+ userID := uuid.New()
_, err1 := register(userID, u1.email, u1.salt, u1.pwhash)
_, err2 := register(userID, u2.email, u2.salt, u2.pwhash)
@@ -275,7 +275,7 @@ func test_sendTokenStmt() {
g.Testing("can't send a token to a non-existent user", func() {
- err := sendToken(guuid.New(), "some token")
+ err := sendToken(uuid.New(), "some token")
g.TAssertEqual(
err.(golite.Error).ExtendedCode,
golite.ErrConstraintNotNull,
@@ -398,13 +398,13 @@ func test_confirmStmt() {
g.Testing("can't confirm a token that doesn't exist", func() {
- _, err := confirm(string(mksalt()), guuid.New())
+ _, err := confirm(string(mksalt()), uuid.New())
g.TAssertEqual(err, sql.ErrNoRows)
})
g.Testing("otherwise it creates a confirmation and a session", func() {
u := newUser()
- sessionID := guuid.New()
+ sessionID := uuid.New()
_, err := register(u.userID, u.email, u.salt, u.pwhash)
g.TErrorIf(err)
@@ -427,8 +427,8 @@ func test_confirmStmt() {
g.TErrorIf(sendToken(u.userID, u.token))
- _, err1 := confirm(u.token, guuid.New())
- _, err2 := confirm(u.token, guuid.New())
+ _, err1 := confirm(u.token, uuid.New())
+ _, err2 := confirm(u.token, uuid.New())
g.TErrorIf(err1)
g.TAssertEqual(
err2.(golite.Error).ExtendedCode,
@@ -449,8 +449,8 @@ func test_confirmStmt() {
sendToken(u.userID, token2),
))
- _, err1 := confirm(token1, guuid.New())
- _, err2 := confirm(token2, guuid.New())
+ _, err1 := confirm(token1, uuid.New())
+ _, err2 := confirm(token2, uuid.New())
g.TErrorIf(err1)
g.TAssertEqual(
err2.(golite.Error).ExtendedCode,
@@ -522,7 +522,7 @@ func test_byEmailStmt() {
user2, err := byEmail(u.email)
g.TErrorIf(err)
- _, err = confirm(u.token, guuid.New())
+ _, err = confirm(u.token, uuid.New())
g.TErrorIf(err)
user3, err := byEmail(u.email)
@@ -579,7 +579,7 @@ func test_userByUUIDStmt() {
g.Testing("error when not found", func() {
- _, err := userByUUID(guuid.New())
+ _, err := userByUUID(uuid.New())
g.TAssertEqual(err, sql.ErrNoRows)
})
@@ -597,7 +597,7 @@ func test_userByUUIDStmt() {
user2, err := userByUUID(u.userID)
g.TErrorIf(err)
- _, err = confirm(u.token, guuid.New())
+ _, err = confirm(u.token, uuid.New())
g.TErrorIf(err)
user3, err := userByUUID(u.userID)
@@ -657,7 +657,7 @@ func test_loginStmt() {
g.Testing("a user must exist to login", func() {
- _, err := login(guuid.New(), guuid.New())
+ _, err := login(uuid.New(), uuid.New())
g.TAssertEqual(
err.(golite.Error).ExtendedCode,
golite.ErrConstraintNotNull,
@@ -667,7 +667,7 @@ func test_loginStmt() {
g.Testing("sessionID must be unique globally", func() {
u1 := newUser()
u2 := newUser()
- sessionID := guuid.New()
+ sessionID := uuid.New()
_, err := register(u1.userID, u1.email, u1.salt, u1.pwhash)
g.TErrorIf(err)
@@ -691,8 +691,8 @@ func test_loginStmt() {
g.Testing("a user can have multiple active sessions", func() {
u := newUser()
- sessionID1 := guuid.New()
- sessionID2 := guuid.New()
+ sessionID1 := uuid.New()
+ sessionID2 := uuid.New()
_, err := register(u.userID, u.email, u.salt, u.pwhash)
g.TErrorIf(err)
@@ -712,8 +712,8 @@ func test_loginStmt() {
g.Testing("multiple users can be logged in", func() {
u1 := newUser()
u2 := newUser()
- sessionID1 := guuid.New()
- sessionID2 := guuid.New()
+ sessionID1 := uuid.New()
+ sessionID2 := uuid.New()
_, err := register(u1.userID, u1.email, u1.salt, u1.pwhash)
g.TErrorIf(err)
@@ -737,7 +737,7 @@ func test_loginStmt() {
_, err := register(u.userID, u.email, u.salt, u.pwhash)
g.TErrorIf(err)
- _, err = login(u.userID, guuid.New())
+ _, err = login(u.userID, uuid.New())
g.TErrorIf(err)
})
@@ -749,14 +749,14 @@ func test_loginStmt() {
g.TErrorIf(sendToken(u.userID, u.token))
- _, err = confirm(u.token, guuid.New())
+ _, err = confirm(u.token, uuid.New())
g.TErrorIf(err)
user, err := byEmail(u.email)
g.TErrorIf(err)
g.TAssertEqual(user.confirmed, true)
- _, err = login(u.userID, guuid.New())
+ _, err = login(u.userID, uuid.New())
g.TErrorIf(err)
})
@@ -820,14 +820,14 @@ func test_refreshStmt() {
err := sendToken(u.userID, u.token)
g.TErrorIf(err)
- session, err := confirm(u.token, guuid.New())
+ session, err := confirm(u.token, uuid.New())
g.TErrorIf(err)
return session
}
g.Testing("a session needs to exist be be refreshed", func() {
- _, err := refresh(guuid.New(), guuid.New())
+ _, err := refresh(uuid.New(), uuid.New())
g.TAssertEqual(
err.(golite.Error).ExtendedCode,
golite.ErrConstraintNotNull,
@@ -836,8 +836,8 @@ func test_refreshStmt() {
g.Testing("we can refresh the session of an unconfirmed user", func() {
u := newUser()
- sessionID1 := guuid.New()
- sessionID2 := guuid.New()
+ sessionID1 := uuid.New()
+ sessionID2 := uuid.New()
reg(u)
@@ -861,8 +861,8 @@ func test_refreshStmt() {
g.Testing("we can refresh the session of a confirmed user", func() {
u := newUser()
- sessionID1 := guuid.New()
- sessionID2 := guuid.New()
+ sessionID1 := uuid.New()
+ sessionID2 := uuid.New()
reg(u)
session1 := conf(u)