Skip to content

Commit b3a0738

Browse files
Fix SessionManagerTest: ensure router is stopped after test (#2968)
1 parent c74ea86 commit b3a0738

1 file changed

Lines changed: 17 additions & 15 deletions

File tree

core/src/test/java/com/predic8/membrane/integration/withoutinternet/SessionManagerTest.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,26 +97,28 @@ public void sessionExpires(
9797
Supplier<com.predic8.membrane.core.interceptor.session.SessionManager> smSupplier) throws Exception {
9898
var httpRouter = Util.basicRouter(Util.createServiceProxy(GATEWAY_PORT, testInterceptor(smSupplier, Duration.ZERO)));
9999

100-
HttpClientContext ctx = getHttpClientContext();
100+
try {
101+
HttpClientContext ctx = getHttpClientContext();
101102

102-
String rememberThis = UUID.randomUUID().toString();
103-
String rememberThisFromServer;
104-
try (CloseableHttpClient client = getHttpClient()) {
103+
String rememberThis = UUID.randomUUID().toString();
104+
String rememberThisFromServer;
105+
try (CloseableHttpClient client = getHttpClient()) {
105106

106-
try (CloseableHttpResponse resp = client.execute(RequestBuilder.get("http://localhost:" + GATEWAY_PORT).addHeader(REMEMBER_HEADER, rememberThis).build(), ctx)) {
107-
Arrays.stream(resp.getAllHeaders()).forEach(h -> System.out.println(h.toString()));
108-
}
107+
try (CloseableHttpResponse resp = client.execute(RequestBuilder.get("http://localhost:" + GATEWAY_PORT).addHeader(REMEMBER_HEADER, rememberThis).build(), ctx)) {
108+
Arrays.stream(resp.getAllHeaders()).forEach(h -> System.out.println(h.toString()));
109+
}
109110

110-
try (CloseableHttpResponse resp = client.execute(new HttpGet("http://localhost:" + GATEWAY_PORT), ctx)) {
111-
rememberThisFromServer = resp.getFirstHeader(REMEMBER_HEADER).getValue();
112-
Arrays.stream(resp.getAllHeaders()).forEach(h -> System.out.println(h.toString()));
111+
try (CloseableHttpResponse resp = client.execute(new HttpGet("http://localhost:" + GATEWAY_PORT), ctx)) {
112+
rememberThisFromServer = resp.getFirstHeader(REMEMBER_HEADER).getValue();
113+
Arrays.stream(resp.getAllHeaders()).forEach(h -> System.out.println(h.toString()));
114+
}
113115
}
114-
}
115-
116-
assertNotEquals(rememberThis, rememberThisFromServer);
117-
assertEquals("null", rememberThisFromServer);
118116

119-
httpRouter.stop();
117+
assertNotEquals(rememberThis, rememberThisFromServer);
118+
assertEquals("", rememberThisFromServer);
119+
} finally {
120+
httpRouter.stop();
121+
}
120122
}
121123

122124
@ParameterizedTest(name = "{0}")

0 commit comments

Comments
 (0)