Skip to content

Commit ac2d4ee

Browse files
committed
move start of fixedport server in test to beforeeach
1 parent 4a1d254 commit ac2d4ee

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/test/kotlin/no/nav/security/mock/oauth2/MockOAuth2ServerTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class MockOAuth2ServerTest {
3737

3838
private lateinit var server: MockOAuth2Server
3939
private lateinit var interactiveLoginServer: MockOAuth2Server
40+
private lateinit var serverWithFixedPort: MockOAuth2Server
4041

4142
@BeforeEach
4243
fun before() {
@@ -49,18 +50,20 @@ class MockOAuth2ServerTest {
4950
tokenProvider = OAuth2TokenProvider()
5051
)
5152
)
53+
serverWithFixedPort = MockOAuth2Server()
54+
serverWithFixedPort.start(1234)
5255
}
5356

5457
@AfterEach
5558
fun shutdown() {
5659
server.shutdown()
5760
interactiveLoginServer.shutdown()
61+
serverWithFixedPort.shutdown()
5862
}
5963

6064
@Test
6165
fun startServerWithFixedPort() {
62-
val serverWithFixedPort = MockOAuth2Server()
63-
serverWithFixedPort.start(1234)
66+
6467
val wellKnown: WellKnown = assertWellKnownResponseForIssuer(serverWithFixedPort, "default")
6568

6669
val tokenIssuedDirectlyFromServer: SignedJWT = serverWithFixedPort.issueToken("default", "yo", DefaultOAuth2TokenCallback())
@@ -79,7 +82,6 @@ class MockOAuth2ServerTest {
7982
val tokenResponse: OAuth2TokenResponse = jacksonObjectMapper().readValue(authCodeTokenResponse.body!!.string())
8083
val tokenFromAuthCode: SignedJWT = tokenResponse.idToken!!.let { SignedJWT.parse(it) }
8184
assertThat(tokenFromAuthCode.verifySignatureAndIssuer(Issuer(wellKnown.issuer), retrieveJwks(wellKnown.jwksUri))).isNotNull
82-
serverWithFixedPort.shutdown()
8385
}
8486

8587
@Test

0 commit comments

Comments
 (0)