diff --git a/src/test/java/net/snowflake/client/core/HttpUtilLatestIT.java b/src/test/java/net/snowflake/client/core/HttpUtilLatestIT.java index 00c318227f..a15b16219f 100644 --- a/src/test/java/net/snowflake/client/core/HttpUtilLatestIT.java +++ b/src/test/java/net/snowflake/client/core/HttpUtilLatestIT.java @@ -10,10 +10,12 @@ import java.net.SocketTimeoutException; import java.time.Duration; import net.snowflake.client.category.TestTags; +import org.apache.http.client.methods.Configurable; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -38,16 +40,29 @@ public void shouldOverrideConnectionAndSocketTimeouts() { HttpUtil.setConnectionTimeout(100); HttpUtil.setSocketTimeout(200); + assertEquals(Duration.ofMillis(100), HttpUtil.getConnectionTimeout()); + assertEquals(Duration.ofMillis(200), HttpUtil.getSocketTimeout()); + CloseableHttpClient httpClient = HttpUtil.getHttpClient(new HttpClientSettingsKey(OCSPMode.INSECURE)); + + assertEquals(Duration.ofMillis(100), HttpUtil.getConnectionTimeout()); + assertEquals(Duration.ofMillis(200), HttpUtil.getSocketTimeout()); + + assertEquals(100, ((Configurable) httpClient).getConfig().getConnectTimeout()); + assertEquals(200, ((Configurable) httpClient).getConfig().getSocketTimeout()); + try { httpClient.execute(new HttpGet(HANG_WEBSERVER_ADDRESS)); fail("Request should fail with exception"); } catch (IOException e) { MatcherAssert.assertThat(e, CoreMatchers.instanceOf(SocketTimeoutException.class)); - } finally { - HttpUtil.setConnectionTimeout(60000); - HttpUtil.setSocketTimeout(300000); } } + + @AfterEach + public void cleanup() { + HttpUtil.setConnectionTimeout(60000); + HttpUtil.setSocketTimeout(300000); + } }