Review changes

.github/workflows/build-test.yml

@@ -65,7 +65,7 @@ jobs:
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category.suites }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: ci\\test_windows.bat
 
@@ -100,7 +100,7 @@ jobs:
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category.suites }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: /usr/local/bin/bash ./ci/test_mac.sh
 
@@ -126,7 +126,7 @@ jobs:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.cloud }}
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category.suites }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: ./ci/test.sh
 
@@ -150,6 +150,6 @@ jobs:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.cloud }}
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category.suites }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 is_old_driver: ${{ matrix.is_old_driver }}
               run: ./ci/test.sh

FIPS/pom.xml

@@ -699,7 +699,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <version>${version.plugin.failsafe}</version>
@@ -750,7 +750,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <version>${version.plugin.failsafe}</version>

FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java

@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.Test;
 
 
-//@Category(TestCategoryFips.class)
 @Tag("fips")
 public class ConnectionFipsIT extends AbstractDriverIT {
   private static final String JCE_PROVIDER_BOUNCY_CASTLE_FIPS = "BCFIPS";

TestOnly/pom.xml

@@ -19,6 +19,7 @@
     <jacoco.skip.instrument>true</jacoco.skip.instrument>
     <jna.version>5.13.0</jna.version>
     <junit.version>5.11.1</junit.version>
+    <surefire.version>3.5.1</surefire.version>
     <mockito.version>3.5.6</mockito.version>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
   </properties>
@@ -423,10 +424,10 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit-platform</artifactId>
-            <version>3.5.1</version>
+            <version>${surefire.version}</version>
           </dependency>
         </dependencies>
-        <version>3.5.1</version>
+        <version>${surefire.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -435,10 +436,10 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit-platform</artifactId>
-            <version>3.5.1</version>
+            <version>${surefire.version}</version>
           </dependency>
         </dependencies>
-        <version>3.5.1</version>
+        <version>${surefire.version}</version>
       </plugin>
     </plugins>
   </build>

ci/container/test_component.sh

@@ -83,12 +83,12 @@ if [[ "$is_old_driver" == "true" ]]; then
         $MVNW_EXE -DjenkinsIT \
             -Djava.io.tmpdir=$WORKSPACE \
             -Djacoco.skip.instrument=false \
-            -DintegrationTestSuites="$JDBC_TEST_CATEGORY" \
+            -DintegrationTestSuites="$JDBC_TEST_SUITES" \
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
             verify \
             --batch-mode --show-version
     popd >& /dev/null
-elif [[ "$JDBC_TEST_CATEGORY" == "FipsTestSuite" ]]; then
+elif [[ "$JDBC_TEST_SUITES" == "FipsTestSuite" ]]; then
     pushd FIPS >& /dev/null
         echo "[INFO] Run Fips tests"
         $MVNW_EXE -DjenkinsIT \
@@ -101,11 +101,11 @@ elif [[ "$JDBC_TEST_CATEGORY" == "FipsTestSuite" ]]; then
             --batch-mode --show-version
     popd >& /dev/null
 else
-    echo "[INFO] Run $JDBC_TEST_CATEGORY tests"
+    echo "[INFO] Run $JDBC_TEST_SUITES tests"
     $MVNW_EXE -DjenkinsIT \
         -Djava.io.tmpdir=$WORKSPACE \
         -Djacoco.skip.instrument=false \
-        -DintegrationTestSuites="$JDBC_TEST_CATEGORY" \
+        -DintegrationTestSuites="$JDBC_TEST_SUITES" \
         -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
         -Dnot-self-contained-jar $ADDITIONAL_MAVEN_PROFILE \
         verify \

ci/test.sh

@@ -30,8 +30,8 @@ else
     exit 2
 fi
 
-if [[ -z "$JDBC_TEST_CATEGORY" ]]; then
-    echo "[ERROR] Set JDBC_TEST_CATEGORY to the JDBC test category."
+if [[ -z "$JDBC_TEST_SUITES" ]]; then
+    echo "[ERROR] Set JDBC_TEST_SUITES to the JDBC test category."
     find $THIS_DIR/../src/test/java -type f -exec grep -E "^import net.snowflake.client.category" {} \; | sort | uniq | awk -F. '{print $NF}' | awk -F\; '{print $1}'
     exit 2
 fi
@@ -56,7 +56,7 @@ for name in "${!TARGET_TEST_IMAGES[@]}"; do
         -e RUNNER_TRACKING_ID \
         -e JOB_NAME \
         -e BUILD_NUMBER \
-        -e JDBC_TEST_CATEGORY \
+        -e JDBC_TEST_SUITES \
         -e ADDITIONAL_MAVEN_PROFILE \
         -e CLOUD_PROVIDER \
         -e is_old_driver \

ci/test_windows.bat

@@ -111,7 +111,7 @@ echo "MAVEN OPTIONS %MAVEN_OPTS%"
 REM Avoid connection timeout on plugin dependency fetch or fail-fast when dependency cannot be fetched
 cmd /c %MVNW_EXE% --batch-mode --show-version dependency:go-offline
 
-if "%JDBC_TEST_CATEGORY%"=="FipsTestSuite" (
+if "%JDBC_TEST_SUITES%"=="FipsTestSuite" (
     pushd FIPS
     echo "[INFO] Run Fips tests"
     cmd /c %MVNW_EXE% -B -DjenkinsIT ^
@@ -133,11 +133,11 @@ if "%JDBC_TEST_CATEGORY%"=="FipsTestSuite" (
     )
     popd
 ) else (
-    echo "[INFO] Run %JDBC_TEST_CATEGORY% tests"
+    echo "[INFO] Run %JDBC_TEST_SUITES% tests"
     cmd /c %MVNW_EXE% -B -DjenkinsIT ^
         -Djava.io.tmpdir=%GITHUB_WORKSPACE% ^
         -Djacoco.skip.instrument=false ^
-        -DintegrationTestSuites="%JDBC_TEST_CATEGORY%" ^
+        -DintegrationTestSuites="%JDBC_TEST_SUITES%" ^
         -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn ^
         -Dnot-self-contained-jar %ADDITIONAL_MAVEN_PROFILE% ^
         verify ^

pom.xml

@@ -110,7 +110,7 @@
             <dependency>
               <groupId>org.apache.maven.surefire</groupId>
               <artifactId>surefire-junit-platform</artifactId>
-              <version>3.5.1</version>
+              <version>${version.plugin.surefire}</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -157,7 +157,7 @@
             <dependency>
               <groupId>org.apache.maven.surefire</groupId>
               <artifactId>surefire-junit-platform</artifactId>
-              <version>3.5.1</version>
+              <version>${version.plugin.surefire}</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -1185,7 +1185,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <executions>
@@ -1343,7 +1343,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <executions>
@@ -1395,7 +1395,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <executions>
@@ -1441,7 +1441,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit-platform</artifactId>
-                <version>3.5.1</version>
+                <version>${version.plugin.surefire}</version>
               </dependency>
             </dependencies>
             <executions>

src/test/java/net/snowflake/client/annotations/RunOnTestaccount.java → src/test/java/net/snowflake/client/annotations/RunOnTestaccountNotOnGithubActions.java

@@ -14,4 +14,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @EnabledIfEnvironmentVariable(named = "SNOWFLAKE_TEST_ACCOUNT", matches = "testaccount")
 @DisabledIfEnvironmentVariable(named = "GITHUB_ACTIONS", matches = ".*")
-public @interface RunOnTestaccount {}
+public @interface RunOnTestaccountNotOnGithubActions {}

src/test/java/net/snowflake/client/core/IncidentUtilLatestIT.java

@@ -20,7 +20,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-// @Category(TestCategoryCore.class)
 @Tag(TestTags.CORE)
 public class IncidentUtilLatestIT extends BaseJDBCTest {
   @TempDir private File tmpFolder;
@@ -50,8 +49,8 @@ public void testDumpVmMetrics() throws IOException {
         EventUtil.getDumpPathPrefix() + "/" + INC_DUMP_FILE_NAME + incidentId + INC_DUMP_FILE_EXT;
 
     // Read back the file contents
-    try (FileInputStream fis = new FileInputStream(targetVMFileLocation)) {
-      GZIPInputStream gzip = new GZIPInputStream(fis);
+    try (FileInputStream fis = new FileInputStream(targetVMFileLocation);
+         GZIPInputStream gzip = new GZIPInputStream(fis)) {
       StringWriter sWriter = new StringWriter();
       IOUtils.copy(gzip, sWriter, "UTF-8");
       String output = sWriter.toString();

src/test/java/net/snowflake/client/core/OCSPCacheServerTest.java

@@ -67,9 +67,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) th
     }
   }
 
-  // @Parameterized.Parameters(
-  //  name = "For host {0} cache server fetch url should be {1} and retry url {2}")
-
   @ParameterizedTest(name = "For host {0} cache server fetch url should be {1} and retry url {2}")
   @ArgumentsSource(URLProvider.class)
   public void shouldChooseOcspCacheServerUrls(

src/test/java/net/snowflake/client/core/SFArrowResultSetIT.java

@@ -66,7 +66,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-// @Category(TestCategoryArrow.class)
 @Tag(TestTags.ARROW)
 public class SFArrowResultSetIT extends BaseJDBCWithSharedConnectionIT {
   private Random random = new Random();

src/test/java/net/snowflake/client/core/SFTrustManagerIT.java

@@ -40,7 +40,6 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-// @Category(TestCategoryCore.class)
 @Tag(TestTags.CORE)
 public class SFTrustManagerIT extends BaseJDBCTest {
   private static final SFLogger logger = SFLoggerFactory.getLogger(SFTrustManagerIT.class);

src/test/java/net/snowflake/client/core/SFTrustManagerMockitoMockLatestIT.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.MockedStatic;
 
-// @Category(TestCategoryCore.class)
 @Tag(TestTags.CORE)
 public class SFTrustManagerMockitoMockLatestIT {
 

src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java

@@ -40,7 +40,6 @@
 import org.mockito.MockedStatic.Verification;
 import org.mockito.Mockito;
 
-// @Category(TestCategoryCore.class)
 @Tag(TestTags.CORE)
 public class SessionUtilLatestIT extends BaseJDBCTest {
 

src/test/java/net/snowflake/client/core/StmtUtilTest.java

@@ -23,7 +23,6 @@
 import org.mockito.MockedStatic.Verification;
 import org.mockito.Mockito;
 
-// @Category(TestCategoryCore.class)
 @Tag(TestTags.CORE)
 public class StmtUtilTest extends BaseJDBCTest {
 

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

@@ -4,7 +4,6 @@
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-// import static org.junit.jupiter.api.Assumptions.assumeNoException;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class BindUploaderIT extends BaseJDBCTest {
   BindUploader bindUploader;

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

@@ -38,7 +38,6 @@
  * tests still is not applicable. If it is applicable, move tests to BindUploaderIT so that both the
  * latest and oldest supported driver run the tests.
  */
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class BindUploaderLatestIT extends BaseJDBCTest {
   BindUploader bindUploader;

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

@@ -43,7 +43,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-// @Category(TestCategoryResultSet.class)
 @Tag(TestTags.RESULT_SET)
 public class BindingAndInsertingStructuredTypesLatestIT extends BaseJDBCTest {
   public Connection init(ResultSetFormatType queryResultFormat) throws SQLException {

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

@@ -32,7 +32,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 /** Integration tests for binding variable */
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class BindingDataIT extends BaseJDBCWithSharedConnectionIT {
   static TimeZone timeZone;

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

@@ -28,7 +28,6 @@
  * to examine if the tests still are not applicable. If it is applicable, move tests to
  * BindingDataIT so that both the latest and oldest supported driver run the tests.
  */
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class BindingDataLatestIT extends AbstractDriverIT {
   TimeZone origTz = TimeZone.getDefault();

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

@@ -27,7 +27,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-// @Category(TestCategoryStatement.class)
 @Tag(TestTags.STATEMENT)
 public class CallableStatementIT extends CallableStatementITBase {
 

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

@@ -17,7 +17,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-// @Category(TestCategoryStatement.class)
 @Tag(TestTags.STATEMENT)
 public class CallableStatementLatestIT extends CallableStatementITBase {
 

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

@@ -24,7 +24,6 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class ChunkDownloaderS3RetryUrlLatestIT extends AbstractDriverIT {
 

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

@@ -20,7 +20,6 @@
 /**
  * @author azhan attempts to test the CLIENT_MEMORY_LIMIT working in multi-threading
  */
-// @Category(TestCategoryOthers.class)
 @Tag(TestTags.OTHERS)
 public class ClientMemoryLimitParallelIT extends BaseJDBCWithSharedConnectionIT {
   private static Logger LOGGER =

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

@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-// @Category(TestCategoryConnection.class)
 @Tag(TestTags.CONNECTION)
 public class ConnectionAlreadyClosedIT extends BaseJDBCTest {
 

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

@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-// @Category(TestCategoryConnection.class)
 @Tag(TestTags.CONNECTION)
 public class ConnectionFeatureNotSupportedIT extends BaseJDBCTest {
   @Test