From c2f54aa9ceec69e568aa8fce725082c63c6fb2c6 Mon Sep 17 00:00:00 2001 From: TATSUNO Yasuhiro Date: Sun, 29 Jan 2023 13:49:49 +0900 Subject: [PATCH] Avoid assertion in finally block --- .../treasuredata/client/TestProxyAccess.java | 19 +++++------- .../client/TestSSLProxyAccess.java | 31 +++++++------------ 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/test/java/com/treasuredata/client/TestProxyAccess.java b/src/test/java/com/treasuredata/client/TestProxyAccess.java index 67ad9535..ea4c0c42 100644 --- a/src/test/java/com/treasuredata/client/TestProxyAccess.java +++ b/src/test/java/com/treasuredata/client/TestProxyAccess.java @@ -159,19 +159,16 @@ protected PasswordAuthentication getPasswordAuthentication() public void proxyApiAccess() { TDClient client = TDClient.newBuilder().setProxy(proxyBaseConfig()).build(); - try { - client.serverStatus(); + client.serverStatus(); - List tableList = client.listTables("sample_datasets"); - assertTrue(tableList.size() >= 2); + List tableList = client.listTables("sample_datasets"); + assertTrue(tableList.size() >= 2); - TDJobList jobList = client.listJobs(); - assertTrue(jobList.getJobs().size() > 0); - } - finally { - logger.debug("proxy access count: {}", proxyAccessCount); - assertEquals(1, proxyAccessCount.get()); - } + TDJobList jobList = client.listJobs(); + assertTrue(jobList.getJobs().size() > 0); + + logger.debug("proxy access count: {}", proxyAccessCount); + assertEquals(1, proxyAccessCount.get()); } @Test diff --git a/src/test/java/com/treasuredata/client/TestSSLProxyAccess.java b/src/test/java/com/treasuredata/client/TestSSLProxyAccess.java index 58d3bc4c..a91dc8dc 100644 --- a/src/test/java/com/treasuredata/client/TestSSLProxyAccess.java +++ b/src/test/java/com/treasuredata/client/TestSSLProxyAccess.java @@ -36,8 +36,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * @@ -99,19 +99,15 @@ public void proxyApiAccess() proxy.setUser(PROXY_USER); proxy.setPassword(PROXY_PASS); TDClient client = TDClient.newBuilder().setProxy(proxy.createProxyConfig()).build(); - try { - client.serverStatus(); + client.serverStatus(); - List tableList = client.listTables("sample_datasets"); - assertTrue(tableList.size() >= 2); + List tableList = client.listTables("sample_datasets"); + assertTrue(tableList.size() >= 2); - TDJobList jobList = client.listJobs(); - assertTrue(jobList.getJobs().size() > 0); - } - finally { - logger.debug("proxy access count: {}", proxyAccessCount); - assertEquals(1, proxyAccessCount.get()); - } + TDJobList jobList = client.listJobs(); + assertTrue(jobList.getJobs().size() > 0); + logger.debug("proxy access count: {}", proxyAccessCount); + assertEquals(1, proxyAccessCount.get()); } @Test @@ -124,13 +120,10 @@ public void wrongPassword() proxy.setUser(PROXY_USER); proxy.setPassword(PROXY_PASS + "---"); // Use an wrong password TDClient client = TDClient.newBuilder().setProxy(proxy.createProxyConfig()).build(); - try { + TDClientException e = assertThrows(TDClientException.class, () -> { client.listTables("sample_datasets"); - fail("should not reach here"); - } - catch (TDClientException e) { - logger.debug(e.getMessage()); - assertEquals(TDClientException.ErrorType.PROXY_AUTHENTICATION_FAILURE, e.getErrorType()); - } + }); + logger.debug(e.getMessage()); + assertEquals(TDClientException.ErrorType.PROXY_AUTHENTICATION_FAILURE, e.getErrorType()); } }