SNOW-748294 Fix test failures (#1287)

moving test to latestIT, fixing gcs tests

Author: sfc-gh-mknister

src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java

@@ -125,7 +125,9 @@ public void testGetObjectMetadataWithGCS() throws Exception {
   public void testGetObjectMetadataFileNotFoundWithGCS() throws Exception {
     Connection connection = null;
     try {
-      connection = getConnection("gcpaccount");
+      Properties paramProperties = new Properties();
+      paramProperties.put("GCS_USE_DOWNSCOPED_CREDENTIAL", true);
+      connection = getConnection("gcpaccount", paramProperties);
       Statement statement = connection.createStatement();
       statement.execute("CREATE OR REPLACE STAGE " + OBJ_META_STAGE);
 
@@ -151,6 +153,7 @@ public void testGetObjectMetadataFileNotFoundWithGCS() throws Exception {
       assertTrue(
           "Wrong type of exception. Message: " + ex.getMessage(),
           ex instanceof StorageProviderException);
+      assertTrue(ex.getMessage().matches(".*Blob.*not found in bucket.*"));
     } finally {
       if (connection != null) {
         connection.createStatement().execute("DROP STAGE if exists " + OBJ_META_STAGE);
@@ -164,7 +167,9 @@ public void testGetObjectMetadataFileNotFoundWithGCS() throws Exception {
   public void testGetObjectMetadataStorageExceptionWithGCS() throws Exception {
     Connection connection = null;
     try {
-      connection = getConnection("gcpaccount");
+      Properties paramProperties = new Properties();
+      paramProperties.put("GCS_USE_DOWNSCOPED_CREDENTIAL", true);
+      connection = getConnection("gcpaccount", paramProperties);
       Statement statement = connection.createStatement();
       statement.execute("CREATE OR REPLACE STAGE " + OBJ_META_STAGE);
 
@@ -189,6 +194,7 @@ public void testGetObjectMetadataStorageExceptionWithGCS() throws Exception {
       assertTrue(
           "Wrong type of exception. Message: " + ex.getMessage(),
           ex instanceof StorageProviderException);
+      assertTrue(ex.getMessage().matches(".*Permission.*denied.*"));
     } finally {
       if (connection != null) {
         connection.createStatement().execute("DROP STAGE if exists " + OBJ_META_STAGE);

src/test/java/net/snowflake/client/jdbc/StreamIT.java

@@ -3,7 +3,8 @@
  */
 package net.snowflake.client.jdbc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 import java.io.StringWriter;

src/test/java/net/snowflake/client/jdbc/StreamLatestIT.java

@@ -3,16 +3,14 @@
  */
 package net.snowflake.client.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Properties;
 import net.snowflake.client.ConditionalIgnoreRule;
 import net.snowflake.client.RunningOnGithubAction;
 import net.snowflake.client.category.TestCategoryOthers;
@@ -91,28 +89,30 @@ public void testUnusualStageName() throws Throwable {
 
   @Test
   @ConditionalIgnoreRule.ConditionalIgnore(condition = RunningOnGithubAction.class)
-  public void testDownloadToStreamBlobNotFound() throws SQLException {
+  public void testDownloadToStreamBlobNotFoundGCS() throws SQLException {
     final String DEST_PREFIX = TEST_UUID + "/testUploadStream";
     Connection connection = null;
     Statement statement = null;
-    List<String> supportedAccounts = Arrays.asList("gcpaccount", "s3testaccount", "azureaccount");
-    for (String accountName : supportedAccounts) {
-      try {
-        connection = getConnection(accountName);
-        statement = connection.createStatement();
-        connection
-            .unwrap(SnowflakeConnection.class)
-            .downloadStream("~", DEST_PREFIX + "/abc.gz", true);
-        fail("should throw an exception for blob/key not found");
-      } catch (Exception ex) {
-        System.out.println("Negative test to hit expected exception: " + ex.getMessage());
-      } finally {
-        if (statement != null) {
-          statement.execute("rm @~/" + DEST_PREFIX);
-          statement.close();
-        }
-        closeSQLObjects(statement, connection);
+    try {
+      Properties paramProperties = new Properties();
+      paramProperties.put("GCS_USE_DOWNSCOPED_CREDENTIAL", true);
+      connection = getConnection("gcpaccount", paramProperties);
+      statement = connection.createStatement();
+      connection
+          .unwrap(SnowflakeConnection.class)
+          .downloadStream("~", DEST_PREFIX + "/abc.gz", true);
+      fail("should throw a storage provider exception for blob not found");
+    } catch (Exception ex) {
+      assertTrue(ex instanceof SQLException);
+      assertTrue(
+          "Wrong exception message: " + ex.getMessage(),
+          ex.getMessage().matches(".*Blob.*not found in bucket.*"));
+    } finally {
+      if (statement != null) {
+        statement.execute("rm @~/" + DEST_PREFIX);
+        statement.close();
       }
+      closeSQLObjects(statement, connection);
     }
   }
 }