Skip to content

Commit b40e879

Browse files
arekkasarekkas
authored
all: improve test exports (#521)
1 parent d91305b commit b40e879

File tree

5 files changed

+86
-95
lines changed

5 files changed

+86
-95
lines changed

‎client/manager_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/julienschmidt/httprouter"
1212
_ "github.com/lib/pq"
13-
"github.com/ory/dockertest"
1413
"github.com/ory/fosite"
1514
"github.com/ory/herodot"
1615
. "github.com/ory/hydra/client"
@@ -57,9 +56,6 @@ func init() {
5756
}
5857
}
5958

60-
var resources []*dockertest.Resource
61-
var pool *dockertest.Pool
62-
6359
func TestMain(m *testing.M) {
6460
connectToPG()
6561
connectToMySQL()

‎client/manager_test_helpers.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package client
22

33
import (
44
"testing"
5-
"time"
65

76
"github.com/ory/fosite"
87
"github.com/stretchr/testify/assert"
@@ -52,23 +51,18 @@ func TestHelperCreateGetDeleteClient(k string, m Storage) func(t *testing.T) {
5251
TermsOfServiceURI: "foo",
5352
}
5453

55-
err = m.CreateClient(c)
56-
assert.NoError(t, err)
54+
assert.NoError(t, m.CreateClient(c))
5755
if err == nil {
5856
compare(t, c, k)
5957
}
6058

61-
err = m.CreateClient(&Client{
59+
assert.NoError(t, m.CreateClient(&Client{
6260
ID: "2-1234",
6361
Name: "name",
6462
Secret: "secret",
6563
RedirectURIs: []string{"http://redirect"},
6664
TermsOfServiceURI: "foo",
67-
})
68-
assert.NoError(t, err)
69-
70-
// RethinkDB delay
71-
time.Sleep(100 * time.Millisecond)
65+
}))
7266

7367
d, err := m.GetClient(nil, "1234")
7468
assert.NoError(t, err)
@@ -90,7 +84,6 @@ func TestHelperCreateGetDeleteClient(k string, m Storage) func(t *testing.T) {
9084
TermsOfServiceURI: "bar",
9185
})
9286
assert.NoError(t, err)
93-
time.Sleep(100 * time.Millisecond)
9487

9588
nc, err := m.GetConcreteClient("2-1234")
9689
assert.NoError(t, err)
@@ -107,9 +100,6 @@ func TestHelperCreateGetDeleteClient(k string, m Storage) func(t *testing.T) {
107100
err = m.DeleteClient("1234")
108101
assert.NoError(t, err)
109102

110-
// RethinkDB delay
111-
time.Sleep(100 * time.Millisecond)
112-
113103
_, err = m.GetClient(nil, "1234")
114104
assert.NotNil(t, err)
115105
}

‎oauth2/fosite_store_test.go‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package oauth2
22

33
import (
4-
"context"
54
"fmt"
65
"os"
76
"testing"
8-
"time"
97

108
"github.com/Sirupsen/logrus"
119
"github.com/ory/fosite"
1210
"github.com/ory/hydra/client"
1311
"github.com/ory/hydra/integration"
1412
"github.com/ory/hydra/pkg"
15-
"github.com/pborman/uuid"
16-
"github.com/stretchr/testify/assert"
17-
"github.com/stretchr/testify/require"
1813
)
1914

2015
var clientManagers = map[string]pkg.FositeStorer{}
@@ -77,82 +72,19 @@ func TestCreateGetDeleteAccessTokenSession(t *testing.T) {
7772
}
7873

7974
func TestCreateGetDeleteOpenIDConnectSession(t *testing.T) {
80-
ctx := context.Background()
8175
for k, m := range clientManagers {
82-
t.Run(fmt.Sprintf("case=%s", k), func(t *testing.T) {
83-
_, err := m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{})
84-
assert.NotNil(t, err)
85-
86-
err = m.CreateOpenIDConnectSession(ctx, "4321", &defaultRequest)
87-
require.Nil(t, err)
88-
89-
res, err := m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{Session: &fosite.DefaultSession{}})
90-
require.Nil(t, err)
91-
AssertObjectKeysEqual(t, &defaultRequest, res, "Scopes", "GrantedScopes", "Form", "Session")
92-
93-
err = m.DeleteOpenIDConnectSession(ctx, "4321")
94-
require.Nil(t, err)
95-
96-
time.Sleep(100 * time.Millisecond)
97-
98-
_, err = m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{})
99-
assert.NotNil(t, err)
100-
})
76+
t.Run(fmt.Sprintf("case=%s", k), TestHelperCreateGetDeleteOpenIDConnectSession(m))
10177
}
10278
}
10379

10480
func TestCreateGetDeleteRefreshTokenSession(t *testing.T) {
105-
ctx := context.Background()
10681
for k, m := range clientManagers {
107-
t.Run(fmt.Sprintf("case=%s", k), func(t *testing.T) {
108-
_, err := m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
109-
assert.NotNil(t, err)
110-
111-
err = m.CreateRefreshTokenSession(ctx, "4321", &defaultRequest)
112-
require.Nil(t, err)
113-
114-
res, err := m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
115-
require.Nil(t, err)
116-
AssertObjectKeysEqual(t, &defaultRequest, res, "Scopes", "GrantedScopes", "Form", "Session")
117-
118-
err = m.DeleteRefreshTokenSession(ctx, "4321")
119-
require.Nil(t, err)
120-
121-
time.Sleep(100 * time.Millisecond)
122-
123-
_, err = m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
124-
assert.NotNil(t, err)
125-
})
82+
t.Run(fmt.Sprintf("case=%s", k), TestHelperCreateGetDeleteRefreshTokenSession(m))
12683
}
12784
}
12885

12986
func TestRevokeRefreshToken(t *testing.T) {
130-
ctx := context.Background()
131-
id := uuid.New()
13287
for k, m := range clientManagers {
133-
t.Run(fmt.Sprintf("case=%s", k), func(t *testing.T) {
134-
_, err := m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
135-
assert.NotNil(t, err)
136-
137-
err = m.CreateRefreshTokenSession(ctx, "1111", &fosite.Request{ID: id, Client: &client.Client{ID: "foobar"}, RequestedAt: time.Now().Round(time.Second)})
138-
require.Nil(t, err)
139-
140-
err = m.CreateRefreshTokenSession(ctx, "1122", &fosite.Request{ID: id, Client: &client.Client{ID: "foobar"}, RequestedAt: time.Now().Round(time.Second)})
141-
require.Nil(t, err)
142-
143-
_, err = m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
144-
require.Nil(t, err)
145-
146-
err = m.RevokeRefreshToken(ctx, id)
147-
require.Nil(t, err)
148-
149-
time.Sleep(100 * time.Millisecond)
150-
151-
_, err = m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
152-
assert.NotNil(t, err)
153-
154-
_, err = m.GetRefreshTokenSession(ctx, "1122", &fosite.DefaultSession{})
155-
assert.NotNil(t, err)
156-
})
88+
t.Run(fmt.Sprintf("case=%s", k), TestHelperRevokeRefreshToken(m))
15789
}
15890
}

‎oauth2/fosite_store_test_helpers.go‎

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import (
44
"context"
55
"testing"
66

7+
"net/url"
8+
"time"
9+
710
"github.com/ory/fosite"
11+
"github.com/ory/hydra/client"
812
"github.com/ory/hydra/pkg"
13+
"github.com/pborman/uuid"
914
"github.com/stretchr/testify/assert"
1015
"github.com/stretchr/testify/require"
11-
"net/url"
12-
"time"
13-
"github.com/ory/hydra/client"
1416
)
1517

1618
var defaultRequest = fosite.Request{
@@ -22,6 +24,76 @@ var defaultRequest = fosite.Request{
2224
Session: &fosite.DefaultSession{Subject: "bar"},
2325
}
2426

27+
func TestHelperCreateGetDeleteOpenIDConnectSession(m pkg.FositeStorer) func(t *testing.T) {
28+
return func(t *testing.T) {
29+
ctx := context.Background()
30+
_, err := m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{})
31+
assert.NotNil(t, err)
32+
33+
err = m.CreateOpenIDConnectSession(ctx, "4321", &defaultRequest)
34+
require.NoError(t, err)
35+
36+
res, err := m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{Session: &fosite.DefaultSession{}})
37+
require.NoError(t, err)
38+
AssertObjectKeysEqual(t, &defaultRequest, res, "Scopes", "GrantedScopes", "Form", "Session")
39+
40+
err = m.DeleteOpenIDConnectSession(ctx, "4321")
41+
require.NoError(t, err)
42+
43+
_, err = m.GetOpenIDConnectSession(ctx, "4321", &fosite.Request{})
44+
assert.NotNil(t, err)
45+
}
46+
}
47+
48+
func TestHelperCreateGetDeleteRefreshTokenSession(m pkg.FositeStorer) func(t *testing.T) {
49+
return func(t *testing.T) {
50+
ctx := context.Background()
51+
_, err := m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
52+
assert.NotNil(t, err)
53+
54+
err = m.CreateRefreshTokenSession(ctx, "4321", &defaultRequest)
55+
require.NoError(t, err)
56+
57+
res, err := m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
58+
require.NoError(t, err)
59+
AssertObjectKeysEqual(t, &defaultRequest, res, "Scopes", "GrantedScopes", "Form", "Session")
60+
61+
err = m.DeleteRefreshTokenSession(ctx, "4321")
62+
require.NoError(t, err)
63+
64+
_, err = m.GetRefreshTokenSession(ctx, "4321", &fosite.DefaultSession{})
65+
assert.NotNil(t, err)
66+
}
67+
68+
}
69+
func TestHelperRevokeRefreshToken(m pkg.FositeStorer) func(t *testing.T) {
70+
return func(t *testing.T) {
71+
ctx := context.Background()
72+
id := uuid.New()
73+
_, err := m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
74+
assert.NotNil(t, err)
75+
76+
err = m.CreateRefreshTokenSession(ctx, "1111", &fosite.Request{ID: id, Client: &client.Client{ID: "foobar"}, RequestedAt: time.Now().Round(time.Second)})
77+
require.NoError(t, err)
78+
79+
err = m.CreateRefreshTokenSession(ctx, "1122", &fosite.Request{ID: id, Client: &client.Client{ID: "foobar"}, RequestedAt: time.Now().Round(time.Second)})
80+
require.NoError(t, err)
81+
82+
_, err = m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
83+
require.NoError(t, err)
84+
85+
err = m.RevokeRefreshToken(ctx, id)
86+
require.NoError(t, err)
87+
88+
_, err = m.GetRefreshTokenSession(ctx, "1111", &fosite.DefaultSession{})
89+
assert.NotNil(t, err)
90+
91+
_, err = m.GetRefreshTokenSession(ctx, "1122", &fosite.DefaultSession{})
92+
assert.NotNil(t, err)
93+
94+
}
95+
96+
}
2597
func TestHelperCreateGetDeleteAuthorizeCodes(m pkg.FositeStorer) func(t *testing.T) {
2698
return func(t *testing.T) {
2799
ctx := context.Background()

‎oauth2/oauth2_auth_code_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ import (
88

99
"net/http/cookiejar"
1010

11+
"net/url"
12+
"strings"
13+
1114
"github.com/dgrijalva/jwt-go"
1215
"github.com/julienschmidt/httprouter"
1316
ejwt "github.com/ory/fosite/token/jwt"
1417
"github.com/ory/hydra/jwk"
1518
. "github.com/ory/hydra/oauth2"
1619
"github.com/ory/hydra/pkg"
1720
"github.com/pkg/errors"
21+
"github.com/stretchr/testify/assert"
1822
"github.com/stretchr/testify/require"
1923
"golang.org/x/oauth2"
20-
"github.com/stretchr/testify/assert"
21-
"net/url"
22-
"strings"
2324
)
2425

2526
func TestAuthCode(t *testing.T) {
@@ -95,4 +96,4 @@ func testRefresh(t *testing.T, token *oauth2.Token) (*http.Response, error) {
9596
req.SetBasicAuth(oauthClientConfig.ClientID, oauthClientConfig.ClientSecret)
9697

9798
return http.DefaultClient.Do(req)
98-
}
99+
}

0 commit comments

Comments
 (0)