fixed tests by stopping mock server

Author: chernser

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

@@ -803,64 +803,68 @@ public void testBearerTokenAuth() throws Exception {
                 .options().port(9090).notifier(new ConsoleNotifier(false)));
         mockServer.start();
 
-        String jwtToken1 = Arrays.stream(
-                new String[]{"header", "payload", "signature"})
-                .map(s -> Base64.getEncoder().encodeToString(s.getBytes(StandardCharsets.UTF_8)))
-                .reduce((s1, s2) -> s1 + "." + s2).get();
-        try (Client client = new Client.Builder().addEndpoint(Protocol.HTTP, "localhost", mockServer.port(), false)
-                .useBearerTokenAuth(jwtToken1)
-                .compressServerResponse(false)
-                .build()) {
-
-            mockServer.addStubMapping(WireMock.post(WireMock.anyUrl())
-                    .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken1))
-                    .willReturn(WireMock.aResponse()
-                            .withHeader("X-ClickHouse-Summary",
-                                    "{ \"read_bytes\": \"10\", \"read_rows\": \"1\"}")).build());
+        try {
+            String jwtToken1 = Arrays.stream(
+                            new String[]{"header", "payload", "signature"})
+                    .map(s -> Base64.getEncoder().encodeToString(s.getBytes(StandardCharsets.UTF_8)))
+                    .reduce((s1, s2) -> s1 + "." + s2).get();
+            try (Client client = new Client.Builder().addEndpoint(Protocol.HTTP, "localhost", mockServer.port(), false)
+                    .useBearerTokenAuth(jwtToken1)
+                    .compressServerResponse(false)
+                    .build()) {
 
-            try (QueryResponse response = client.query("SELECT 1").get(1, TimeUnit.SECONDS)) {
-                Assert.assertEquals(response.getReadBytes(), 10);
-            } catch (Exception e) {
-                Assert.fail("Unexpected exception", e);
+                mockServer.addStubMapping(WireMock.post(WireMock.anyUrl())
+                        .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken1))
+                        .willReturn(WireMock.aResponse()
+                                .withHeader("X-ClickHouse-Summary",
+                                        "{ \"read_bytes\": \"10\", \"read_rows\": \"1\"}")).build());
+
+                try (QueryResponse response = client.query("SELECT 1").get(1, TimeUnit.SECONDS)) {
+                    Assert.assertEquals(response.getReadBytes(), 10);
+                } catch (Exception e) {
+                    Assert.fail("Unexpected exception", e);
+                }
             }
-        }
-
-        String jwtToken2 = Arrays.stream(
-                        new String[]{"header2", "payload2", "signature2"})
-                .map(s -> Base64.getEncoder().encodeToString(s.getBytes(StandardCharsets.UTF_8)))
-                .reduce((s1, s2) -> s1 + "." + s2).get();
-        
-        mockServer.resetAll();
-        mockServer.addStubMapping(WireMock.post(WireMock.anyUrl())
-                .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken1))
-                .willReturn(WireMock.aResponse()
-                        .withStatus(HttpStatus.SC_UNAUTHORIZED))
-                .build());
 
-        try (Client client = new Client.Builder().addEndpoint(Protocol.HTTP, "localhost", mockServer.port(), false)
-                .useBearerTokenAuth(jwtToken1)
-                .compressServerResponse(false)
-                .build()) {
-
-            try {
-                client.execute("SELECT 1").get();
-                fail("Exception expected");
-            } catch (ServerException e) {
-                Assert.assertEquals(e.getTransportProtocolCode(), HttpStatus.SC_UNAUTHORIZED);
-            }
+            String jwtToken2 = Arrays.stream(
+                            new String[]{"header2", "payload2", "signature2"})
+                    .map(s -> Base64.getEncoder().encodeToString(s.getBytes(StandardCharsets.UTF_8)))
+                    .reduce((s1, s2) -> s1 + "." + s2).get();
 
             mockServer.resetAll();
             mockServer.addStubMapping(WireMock.post(WireMock.anyUrl())
-                    .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken2))
+                    .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken1))
                     .willReturn(WireMock.aResponse()
-                            .withHeader("X-ClickHouse-Summary",
-                                    "{ \"read_bytes\": \"10\", \"read_rows\": \"1\"}"))
-
+                            .withStatus(HttpStatus.SC_UNAUTHORIZED))
                     .build());
 
-            client.updateBearerToken(jwtToken2);
+            try (Client client = new Client.Builder().addEndpoint(Protocol.HTTP, "localhost", mockServer.port(), false)
+                    .useBearerTokenAuth(jwtToken1)
+                    .compressServerResponse(false)
+                    .build()) {
+
+                try {
+                    client.execute("SELECT 1").get();
+                    fail("Exception expected");
+                } catch (ServerException e) {
+                    Assert.assertEquals(e.getTransportProtocolCode(), HttpStatus.SC_UNAUTHORIZED);
+                }
+
+                mockServer.resetAll();
+                mockServer.addStubMapping(WireMock.post(WireMock.anyUrl())
+                        .withHeader("Authorization", WireMock.equalTo("Bearer " + jwtToken2))
+                        .willReturn(WireMock.aResponse()
+                                .withHeader("X-ClickHouse-Summary",
+                                        "{ \"read_bytes\": \"10\", \"read_rows\": \"1\"}"))
+
+                        .build());
 
-            client.execute("SELECT 1").get();
+                client.updateBearerToken(jwtToken2);
+
+                client.execute("SELECT 1").get();
+            }
+        } finally {
+            mockServer.stop();
         }
     }
 }