From 940d51499e99018ccdfe5077479dd09afbf088cd Mon Sep 17 00:00:00 2001 From: Piotr Bulawa Date: Tue, 20 Aug 2024 14:42:49 +0200 Subject: [PATCH] SNOW-1625156: Fix keypair tests (#1871) --- .../snowflake/client/jdbc/ConnectionIT.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java index 2e0a9f13e..8ad59f59e 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java @@ -459,13 +459,17 @@ public void testConnectUsingKeyPair() throws Exception { String encodePublicKey2 = Base64.encodeBase64String(publicKey2.getEncoded()); statement.execute( String.format("alter user %s set rsa_public_key_2='%s'", testUser, encodePublicKey2)); - } finally { - try (Connection connection = DriverManager.getConnection(uri, properties); - Statement statement = connection.createStatement()) { - statement.execute("use role accountadmin"); - statement.execute(String.format("alter user %s unset rsa_public_key", testUser)); - statement.execute(String.format("alter user %s unset rsa_public_key_2", testUser)); - } + } + + try (Connection connection = DriverManager.getConnection(uri, properties)) { + assertFalse(connection.isClosed()); + } + + try (Connection connection = getConnection(); + Statement statement = connection.createStatement()) { + statement.execute("use role accountadmin"); + statement.execute(String.format("alter user %s unset rsa_public_key", testUser)); + statement.execute(String.format("alter user %s unset rsa_public_key_2", testUser)); } } @@ -541,8 +545,13 @@ public void testDifferentKeyLength() throws Exception { // test correct private key one properties.put("privateKey", privateKey); - try (Connection connection = DriverManager.getConnection(uri, properties); + try (Connection connection = DriverManager.getConnection(uri, properties)) { + assertFalse(connection.isClosed()); + } + + try (Connection connection = getConnection(); Statement statement = connection.createStatement()) { + statement.execute("use role accountadmin"); statement.execute(String.format("alter user %s unset rsa_public_key", testUser)); } }