Fix tests for scopeStore.
Update all our tests to use the PG_TEST_DB environment variable if set, and use
that to control whether or not the postgres tests get run. testing.Short() just
wasn't working.
Update ErrScopeNotFound and ErrScopeAlreadyExists to be variables instead of
types, because PostgreSQL (annoyingly) offers no way to determine which specific
row insertion caused the problem, and I anticipate this being a problem that is
ongoing. So it's really just not worth it.
Stop getScopes from returning an ErrScopeNotFound. Let's return what we find,
and let the absence of what we didn't find speak for itself.
Fix an error with generating the SQL for the postgres.createScopes call. We used
to generate it in a way that was invalid (not joining values with ",") when more
than one set of values was supplied. Hooray, testing!
Update the postgres scopeStore to return ErrScopeNotFound and
ErrScopeAlreadyExists errors, as appropriate.
Update our tests to reflect that ErrScopeNotFound and ErrScopeAlreadyExists are
now variables, not types.
7 "code.secondbit.org/uuid.hg"
10 var sessionStores = []sessionStore{NewMemstore()}
12 func compareSessions(session1, session2 Session) (success bool, field string, val1, val2 interface{}) {
13 if session1.ID != session2.ID {
14 return false, "ID", session1.ID, session2.ID
16 if session1.IP != session2.IP {
17 return false, "IP", session1.IP, session2.IP
19 if session1.UserAgent != session2.UserAgent {
20 return false, "UserAgent", session1.UserAgent, session2.UserAgent
22 if !session1.ProfileID.Equal(session2.ProfileID) {
23 return false, "ProfileID", session1.ProfileID, session2.ProfileID
25 if !session1.Created.Equal(session2.Created) {
26 return false, "Created", session1.Created, session2.Created
28 if !session1.Expires.Equal(session2.Expires) {
29 return false, "Expires", session1.Expires, session2.Expires
31 if session1.Login != session2.Login {
32 return false, "Login", session1.Login, session2.Login
34 if session1.Active != session2.Active {
35 return false, "Active", session1.Active, session2.Active
37 if session1.CSRFToken != session2.CSRFToken {
38 return false, "CSRFToken", session1.CSRFToken, session2.CSRFToken
40 return true, "", nil, nil
43 func TestSessionStoreSuccess(t *testing.T) {
46 ID: uuid.NewID().String() + uuid.NewID().String(),
48 UserAgent: "TestRunner",
49 ProfileID: uuid.NewID(),
50 Created: time.Now().Round(time.Millisecond),
51 Login: "test@example.com",
54 for _, store := range sessionStores {
55 context := Context{sessions: store}
56 err := context.CreateSession(session)
58 t.Errorf("Error saving session to %T: %s", store, err)
60 err = context.CreateSession(session)
61 if err != ErrSessionAlreadyExists {
62 t.Errorf("Expected ErrSessionAlreadyExists from %T, got %s", store, err)
64 retrieved, err := context.GetSession(session.ID)
66 t.Errorf("Error retrieving session from %T: %s", store, err)
68 success, field, expectation, result := compareSessions(session, retrieved)
70 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
72 retrievedList, err := context.ListSessions(session.ProfileID, time.Time{}, 10)
74 t.Errorf("Error retrieving sessions by profile from %T: %s", store, err)
76 if len(retrievedList) != 1 {
77 t.Errorf("Expected 1 session retrieved by profile from %T, got %d", store, len(retrievedList))
79 success, field, expectation, result = compareSessions(session, retrievedList[0])
81 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
83 err = context.RemoveSession(session.ID)
85 t.Errorf("Error removing session from %T: %s", store, err)
87 retrieved, err = context.GetSession(session.ID)
88 if err != ErrSessionNotFound {
89 t.Errorf("Expected ErrSessionNotFound from %T, got %s", store, err)
91 retrievedList, err = context.ListSessions(session.ProfileID, time.Time{}, 10)
93 t.Errorf("Error retrieving sessions by profile from %T: %s", store, err)
95 if len(retrievedList) != 0 {
96 t.Errorf("Expected 0 sessions retrieved by profile from %T, got %d", store, len(retrievedList))
98 err = context.RemoveSession(session.ID)
99 if err != ErrSessionNotFound {
100 t.Errorf("Expected ErrSessionNotFound from %T, got %s", store, err)
105 // BUG(paddy): We need to test the CreateSessionHandler.
106 // BUG(paddy): We need to test the credentialsValidate function.