diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 67b24cd76..f50bcfab3 100644 --- a/.github/workflows/build-test.yml +++ b/.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 diff --git a/FIPS/pom.xml b/FIPS/pom.xml index bdd819694..d38e60888 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -699,7 +699,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} ${version.plugin.failsafe} @@ -750,7 +750,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} ${version.plugin.failsafe} diff --git a/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java b/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java index 7e0270c9c..0204e9a5d 100644 --- a/FIPS/src/test/java/net/snowflake/client/jdbc/ConnectionFipsIT.java +++ b/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"; diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml index feb0edd13..8dff8695f 100644 --- a/TestOnly/pom.xml +++ b/TestOnly/pom.xml @@ -19,6 +19,7 @@ true 5.13.0 5.11.1 + 3.5.1 3.5.6 net.snowflake.client.jdbc.internal @@ -423,10 +424,10 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${surefire.version} - 3.5.1 + ${surefire.version} org.apache.maven.plugins @@ -435,10 +436,10 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${surefire.version} - 3.5.1 + ${surefire.version} diff --git a/ci/container/test_component.sh b/ci/container/test_component.sh index 9bfe33f6c..65efed88d 100755 --- a/ci/container/test_component.sh +++ b/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 \ diff --git a/ci/test.sh b/ci/test.sh index 03c66c502..125e91d1f 100755 --- a/ci/test.sh +++ b/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 \ diff --git a/ci/test_windows.bat b/ci/test_windows.bat index f293a530d..0234b105c 100644 --- a/ci/test_windows.bat +++ b/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 ^ diff --git a/pom.xml b/pom.xml index 582b8e5b9..74143ecef 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} @@ -157,7 +157,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} @@ -1185,7 +1185,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} @@ -1343,7 +1343,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} @@ -1395,7 +1395,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} @@ -1441,7 +1441,7 @@ org.apache.maven.surefire surefire-junit-platform - 3.5.1 + ${version.plugin.surefire} diff --git a/src/test/java/net/snowflake/client/annotations/RunOnTestaccount.java b/src/test/java/net/snowflake/client/annotations/RunOnTestaccountNotOnGithubActions.java similarity index 92% rename from src/test/java/net/snowflake/client/annotations/RunOnTestaccount.java rename to src/test/java/net/snowflake/client/annotations/RunOnTestaccountNotOnGithubActions.java index 4106d3216..6dacdb993 100644 --- a/src/test/java/net/snowflake/client/annotations/RunOnTestaccount.java +++ b/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 {} diff --git a/src/test/java/net/snowflake/client/core/IncidentUtilLatestIT.java b/src/test/java/net/snowflake/client/core/IncidentUtilLatestIT.java index c8f50db90..bfc39cabe 100644 --- a/src/test/java/net/snowflake/client/core/IncidentUtilLatestIT.java +++ b/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(); diff --git a/src/test/java/net/snowflake/client/core/OCSPCacheServerTest.java b/src/test/java/net/snowflake/client/core/OCSPCacheServerTest.java index f6c065970..37bfea5c6 100644 --- a/src/test/java/net/snowflake/client/core/OCSPCacheServerTest.java +++ b/src/test/java/net/snowflake/client/core/OCSPCacheServerTest.java @@ -67,9 +67,6 @@ public Stream 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( diff --git a/src/test/java/net/snowflake/client/core/SFArrowResultSetIT.java b/src/test/java/net/snowflake/client/core/SFArrowResultSetIT.java index d7ea2faac..8be8fd471 100644 --- a/src/test/java/net/snowflake/client/core/SFArrowResultSetIT.java +++ b/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(); diff --git a/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java b/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java index 51f5c6690..2645277b1 100644 --- a/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java +++ b/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); diff --git a/src/test/java/net/snowflake/client/core/SFTrustManagerMockitoMockLatestIT.java b/src/test/java/net/snowflake/client/core/SFTrustManagerMockitoMockLatestIT.java index e561f9acd..077ec6829 100644 --- a/src/test/java/net/snowflake/client/core/SFTrustManagerMockitoMockLatestIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java b/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java index 49507f8c7..57dde2a7b 100644 --- a/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/core/StmtUtilTest.java b/src/test/java/net/snowflake/client/core/StmtUtilTest.java index a64cbfcec..7075416e4 100644 --- a/src/test/java/net/snowflake/client/core/StmtUtilTest.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java b/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java index f36f55eb5..e3c206fec 100644 --- a/src/test/java/net/snowflake/client/jdbc/BaseWiremockTest.java +++ b/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; diff --git a/src/test/java/net/snowflake/client/jdbc/BindUploaderIT.java b/src/test/java/net/snowflake/client/jdbc/BindUploaderIT.java index 4fbe0d9fa..80bd20724 100644 --- a/src/test/java/net/snowflake/client/jdbc/BindUploaderIT.java +++ b/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; diff --git a/src/test/java/net/snowflake/client/jdbc/BindUploaderLatestIT.java b/src/test/java/net/snowflake/client/jdbc/BindUploaderLatestIT.java index a5c34ef2b..badd3fee0 100644 --- a/src/test/java/net/snowflake/client/jdbc/BindUploaderLatestIT.java +++ b/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; diff --git a/src/test/java/net/snowflake/client/jdbc/BindingAndInsertingStructuredTypesLatestIT.java b/src/test/java/net/snowflake/client/jdbc/BindingAndInsertingStructuredTypesLatestIT.java index 97ce1b6b8..55cdf9996 100644 --- a/src/test/java/net/snowflake/client/jdbc/BindingAndInsertingStructuredTypesLatestIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/BindingDataIT.java b/src/test/java/net/snowflake/client/jdbc/BindingDataIT.java index ce50540de..86a3b4613 100644 --- a/src/test/java/net/snowflake/client/jdbc/BindingDataIT.java +++ b/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; diff --git a/src/test/java/net/snowflake/client/jdbc/BindingDataLatestIT.java b/src/test/java/net/snowflake/client/jdbc/BindingDataLatestIT.java index 4ba35a672..58298df8a 100644 --- a/src/test/java/net/snowflake/client/jdbc/BindingDataLatestIT.java +++ b/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(); diff --git a/src/test/java/net/snowflake/client/jdbc/CallableStatementIT.java b/src/test/java/net/snowflake/client/jdbc/CallableStatementIT.java index 0fe155727..1c2900958 100644 --- a/src/test/java/net/snowflake/client/jdbc/CallableStatementIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/CallableStatementLatestIT.java b/src/test/java/net/snowflake/client/jdbc/CallableStatementLatestIT.java index 54a9f304e..af33e102c 100644 --- a/src/test/java/net/snowflake/client/jdbc/CallableStatementLatestIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/ChunkDownloaderS3RetryUrlLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ChunkDownloaderS3RetryUrlLatestIT.java index 2cb847e6b..7824c9a01 100644 --- a/src/test/java/net/snowflake/client/jdbc/ChunkDownloaderS3RetryUrlLatestIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java b/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java index d7179e130..b90868b39 100644 --- a/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java +++ b/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 = diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionAlreadyClosedIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionAlreadyClosedIT.java index 89b57f558..98826eaa8 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionAlreadyClosedIT.java +++ b/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 { diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionFeatureNotSupportedIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionFeatureNotSupportedIT.java index 6881d7327..b0b120683 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionFeatureNotSupportedIT.java +++ b/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 diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java index 244a478c7..0ca3c2e3e 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java @@ -45,7 +45,7 @@ import net.snowflake.client.AssumptionUtils; import net.snowflake.client.TestUtil; import net.snowflake.client.annotations.DontRunOnGithubActions; -import net.snowflake.client.annotations.RunOnTestaccount; +import net.snowflake.client.annotations.RunOnTestaccountNotOnGithubActions; import net.snowflake.client.category.TestTags; import net.snowflake.client.core.SFSession; import net.snowflake.common.core.SqlState; @@ -56,7 +56,6 @@ import org.junit.jupiter.api.io.TempDir; /** Connection integration tests */ -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class ConnectionIT extends BaseJDBCWithSharedConnectionIT { // create a local constant for this code for testing purposes (already defined in GS) @@ -840,7 +839,7 @@ public void testResultSetsClosedByStatement() throws SQLException { } @Test - @RunOnTestaccount + @RunOnTestaccountNotOnGithubActions public void testOKTAConnection() throws Throwable { Map params = getConnectionParameters(); Properties properties = new Properties(); @@ -857,7 +856,7 @@ public void testOKTAConnection() throws Throwable { } @Test - @RunOnTestaccount + @RunOnTestaccountNotOnGithubActions public void testOKTAConnectionWithOktauserParam() throws Throwable { Map params = getConnectionParameters(); Properties properties = new Properties(); diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java index 71837ffea..b959ec5d1 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java @@ -85,7 +85,6 @@ * if the tests still is not applicable. If it is applicable, move tests to ConnectionIT so that * both the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class ConnectionLatestIT extends BaseJDBCTest { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionPoolingIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionPoolingIT.java index da6aef32e..a539dc7f9 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionPoolingIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionPoolingIT.java @@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test; /** Connection pool interface test */ -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class ConnectionPoolingIT { private BasicDataSource bds = null; diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java index 464adabe6..96b896247 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java @@ -37,7 +37,6 @@ * *

hang_webserver.py 12345 */ -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class ConnectionWithOCSPModeIT extends BaseJDBCTest { private final String testUser = "fakeuser"; diff --git a/src/test/java/net/snowflake/client/jdbc/CustomProxyLatestIT.java b/src/test/java/net/snowflake/client/jdbc/CustomProxyLatestIT.java index 85e593924..2673d543c 100644 --- a/src/test/java/net/snowflake/client/jdbc/CustomProxyLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/CustomProxyLatestIT.java @@ -36,7 +36,6 @@ // 2.) Enter your own username and password for the account you're connecting to // 3.) Adjust parameters like role, database, schema, etc to match with account accordingly -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class CustomProxyLatestIT { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataIT.java index 37c3fbce0..71b347a2a 100644 --- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataIT.java @@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test; /** Database Metadata IT */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DatabaseMetaDataIT extends BaseJDBCWithSharedConnectionIT { private static final Pattern VERSION_PATTERN = diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java index 00dc3ab20..00838fd1b 100644 --- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test; /** Database Metadata IT */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DatabaseMetaDataInternalIT extends BaseJDBCTest { private Connection connection; diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java index 6cb11d438..622f94a0a 100644 --- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java @@ -30,7 +30,6 @@ * tests still is not applicable. If it is applicable, move tests to DatabaseMetaDataIT so that both * the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DatabaseMetaDataInternalLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java index 89e731f83..c1f1e43dd 100644 --- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java @@ -46,7 +46,6 @@ * tests still is not applicable. If it is applicable, move tests to DatabaseMetaDataIT so that both * the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DatabaseMetaDataLatestIT extends BaseJDBCWithSharedConnectionIT { private static final String TEST_PROC = diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataResultsetIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataResultsetIT.java index f0a0557b4..605ca3698 100644 --- a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataResultsetIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataResultsetIT.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DatabaseMetaDataResultsetIT extends BaseJDBCWithSharedConnectionIT { private static final int columnCount = 9; diff --git a/src/test/java/net/snowflake/client/jdbc/DellBoomiCloudIT.java b/src/test/java/net/snowflake/client/jdbc/DellBoomiCloudIT.java index bd5223870..bd2680be1 100644 --- a/src/test/java/net/snowflake/client/jdbc/DellBoomiCloudIT.java +++ b/src/test/java/net/snowflake/client/jdbc/DellBoomiCloudIT.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Test; /** A simple run on fetch result under boomi cloud environment's policy file */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class DellBoomiCloudIT extends AbstractDriverIT { @BeforeEach diff --git a/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java b/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java index d2cfe896a..a116a794b 100644 --- a/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java @@ -50,7 +50,6 @@ import org.junit.jupiter.api.Test; /** Tests for SnowflakeFileTransferAgent that require an active connection */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class FileUploaderLatestIT extends FileUploaderPrep { private static final String OBJ_META_STAGE = "testObjMeta"; diff --git a/src/test/java/net/snowflake/client/jdbc/HeartbeatAsyncLatestIT.java b/src/test/java/net/snowflake/client/jdbc/HeartbeatAsyncLatestIT.java index 350a9faf8..5dda21d55 100644 --- a/src/test/java/net/snowflake/client/jdbc/HeartbeatAsyncLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/HeartbeatAsyncLatestIT.java @@ -22,7 +22,6 @@ * Test class for using heartbeat with asynchronous querying. This is a "Latest" class because old * driver versions do not contain the asynchronous querying API. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class HeartbeatAsyncLatestIT extends HeartbeatIT { private static Logger logger = Logger.getLogger(HeartbeatAsyncLatestIT.class.getName()); diff --git a/src/test/java/net/snowflake/client/jdbc/HeartbeatIT.java b/src/test/java/net/snowflake/client/jdbc/HeartbeatIT.java index 832fe7a63..c335432c7 100644 --- a/src/test/java/net/snowflake/client/jdbc/HeartbeatIT.java +++ b/src/test/java/net/snowflake/client/jdbc/HeartbeatIT.java @@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test; /** This test assumes that GS has been set up */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class HeartbeatIT extends AbstractDriverIT { private static Logger logger = Logger.getLogger(HeartbeatIT.class.getName()); diff --git a/src/test/java/net/snowflake/client/jdbc/LobSizeLatestIT.java b/src/test/java/net/snowflake/client/jdbc/LobSizeLatestIT.java index 4cc006a2c..eb2bdfeb1 100644 --- a/src/test/java/net/snowflake/client/jdbc/LobSizeLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/LobSizeLatestIT.java @@ -36,7 +36,6 @@ import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class LobSizeLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java b/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java index 39ea6002b..65118cec6 100644 --- a/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java +++ b/src/test/java/net/snowflake/client/jdbc/MockConnectionTest.java @@ -58,7 +58,6 @@ * and ResultSet. These tests will query Snowflake normally, retrieve the JSON result, and replay it * back using a custom implementation of these objects that simply echoes a given JSON response. */ -// @Category(TestCategoryConnection.class) // TODO: SNOW-1821554 // @Tag(TestTags.CONNECTION) public class MockConnectionTest extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/MultiStatementArrowIT.java b/src/test/java/net/snowflake/client/jdbc/MultiStatementArrowIT.java index 51283592a..5ea3b3f27 100644 --- a/src/test/java/net/snowflake/client/jdbc/MultiStatementArrowIT.java +++ b/src/test/java/net/snowflake/client/jdbc/MultiStatementArrowIT.java @@ -3,7 +3,6 @@ import net.snowflake.client.category.TestTags; import org.junit.jupiter.api.Tag; -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class MultiStatementArrowIT extends MultiStatementIT { diff --git a/src/test/java/net/snowflake/client/jdbc/MultiStatementIT.java b/src/test/java/net/snowflake/client/jdbc/MultiStatementIT.java index 9e50c32d5..f4e9da56d 100644 --- a/src/test/java/net/snowflake/client/jdbc/MultiStatementIT.java +++ b/src/test/java/net/snowflake/client/jdbc/MultiStatementIT.java @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test; /** Multi Statement tests */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class MultiStatementIT extends BaseJDBCWithSharedConnectionIT { protected static String queryResultFormat = "json"; diff --git a/src/test/java/net/snowflake/client/jdbc/MultiStatementLatestIT.java b/src/test/java/net/snowflake/client/jdbc/MultiStatementLatestIT.java index b578824bf..849742ef9 100644 --- a/src/test/java/net/snowflake/client/jdbc/MultiStatementLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/MultiStatementLatestIT.java @@ -23,7 +23,6 @@ * if the tests still is not applicable. If it is applicable, move tests to MultiStatementIT so that * both the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class MultiStatementLatestIT extends BaseJDBCWithSharedConnectionIT { protected static String queryResultFormat = "json"; diff --git a/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncIT.java b/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncIT.java index 3054e65c8..f8ca2f48a 100644 --- a/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncIT.java +++ b/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncIT.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.Test; /** Test OpenGroup CLI */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class OpenGroupCLIFuncIT extends BaseJDBCWithSharedConnectionIT { diff --git a/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncLatestIT.java b/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncLatestIT.java index 8fb72c646..3b79dc616 100644 --- a/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/OpenGroupCLIFuncLatestIT.java @@ -17,7 +17,6 @@ * examine if the tests still are not applicable. If it is applicable, move tests to * OpenGroupCLIFuncIT so that both the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class OpenGroupCLIFuncLatestIT extends BaseJDBCTest { /** diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedMultiStmtIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedMultiStmtIT.java index 325e63e98..adb92036d 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedMultiStmtIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedMultiStmtIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedMultiStmtIT extends BaseJDBCWithSharedConnectionIT { private static SnowflakeConnectionV1 sfConnectionV1; diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatement1IT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatement1IT.java index e3eac2119..d0074230d 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatement1IT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatement1IT.java @@ -34,7 +34,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatement1IT extends PreparedStatement0IT { diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatement1LatestIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatement1LatestIT.java index 01c41f892..9c316edba 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatement1LatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatement1LatestIT.java @@ -32,7 +32,6 @@ * if the tests still are not applicable. If it is applicable, move tests to PreparedStatement1IT so * that both the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatement1LatestIT extends PreparedStatement0IT { diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatement2IT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatement2IT.java index 932258b84..96765131a 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatement2IT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatement2IT.java @@ -36,7 +36,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatement2IT extends PreparedStatement0IT { @ParameterizedTest diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatement2LatestIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatement2LatestIT.java index a4fc631e8..563406d23 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatement2LatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatement2LatestIT.java @@ -30,7 +30,6 @@ * if the tests still are not applicable. If it is applicable, move tests to PreparedStatement2IT so * that both the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatement2LatestIT extends PreparedStatement0IT { diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatementFeatureNotSupportedIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatementFeatureNotSupportedIT.java index 86673c152..be20395a5 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatementFeatureNotSupportedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatementFeatureNotSupportedIT.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatementFeatureNotSupportedIT extends BaseJDBCTest { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatementLargeUpdateLatestIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatementLargeUpdateLatestIT.java index b37cb4793..c12242af8 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatementLargeUpdateLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatementLargeUpdateLatestIT.java @@ -18,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class PreparedStatementLargeUpdateLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/ProxyLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ProxyLatestIT.java index f098ed85f..85f1e1a28 100644 --- a/src/test/java/net/snowflake/client/jdbc/ProxyLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ProxyLatestIT.java @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class ProxyLatestIT extends BaseWiremockTest { diff --git a/src/test/java/net/snowflake/client/jdbc/PutFileWithSpaceIncludedIT.java b/src/test/java/net/snowflake/client/jdbc/PutFileWithSpaceIncludedIT.java index 622d03a97..940ab44e2 100644 --- a/src/test/java/net/snowflake/client/jdbc/PutFileWithSpaceIncludedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PutFileWithSpaceIncludedIT.java @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class PutFileWithSpaceIncludedIT extends BaseJDBCTest { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/PutUnescapeBackslashIT.java b/src/test/java/net/snowflake/client/jdbc/PutUnescapeBackslashIT.java index a2881061f..5de4ec5bf 100644 --- a/src/test/java/net/snowflake/client/jdbc/PutUnescapeBackslashIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PutUnescapeBackslashIT.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 PutUnescapeBackslashIT extends AbstractDriverIT { @BeforeAll diff --git a/src/test/java/net/snowflake/client/jdbc/RestRequestWiremockLatestIT.java b/src/test/java/net/snowflake/client/jdbc/RestRequestWiremockLatestIT.java index 9198bb4a1..505af0b53 100644 --- a/src/test/java/net/snowflake/client/jdbc/RestRequestWiremockLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/RestRequestWiremockLatestIT.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class RestRequestWiremockLatestIT extends BaseWiremockTest { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSet0IT.java b/src/test/java/net/snowflake/client/jdbc/ResultSet0IT.java index 67751ca82..bebe0a54e 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSet0IT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSet0IT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Tag; /** Result set test base class. */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSet0IT extends BaseJDBCWithSharedConnectionIT { public Connection init(Properties paramProperties, String queryResultFormat) throws SQLException { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetAlreadyClosedIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetAlreadyClosedIT.java index b1cd8dafe..091c7928e 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetAlreadyClosedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetAlreadyClosedIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetAlreadyClosedIT extends BaseJDBCWithSharedConnectionIT { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceLTZMultiTimeZoneIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceLTZMultiTimeZoneIT.java index 4322833ae..a612870a5 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceLTZMultiTimeZoneIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceLTZMultiTimeZoneIT.java @@ -20,7 +20,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Compare json and arrow resultSet behaviors 1/2 */ -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class ResultSetArrowForceLTZMultiTimeZoneIT extends ResultSetArrowForce0MultiTimeZone { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceTZMultiTimeZoneIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceTZMultiTimeZoneIT.java index f0684e063..db0984081 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceTZMultiTimeZoneIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetArrowForceTZMultiTimeZoneIT.java @@ -18,7 +18,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Compare json and arrow resultSet behaviors 2/2 */ -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class ResultSetArrowForceTZMultiTimeZoneIT extends ResultSetArrowForce0MultiTimeZone { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncIT.java index cd0b8f5c4..b86a65c95 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncIT.java @@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test; /** Test AsyncResultSet */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetAsyncIT extends BaseJDBCWithSharedConnectionIT { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncLatestIT.java index 37c82b7b3..9bcbd83b4 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetAsyncLatestIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Test; /** Test AsyncResultSet */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetAsyncLatestIT extends BaseJDBCTest { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetFeatureNotSupportedIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetFeatureNotSupportedIT.java index e97e60e0c..8f9da34e1 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetFeatureNotSupportedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetFeatureNotSupportedIT.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetFeatureNotSupportedIT extends BaseJDBCWithSharedConnectionIT { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetIT.java index 9f7ebd402..760d83a75 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetIT.java @@ -38,7 +38,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Test ResultSet */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetIT extends ResultSet0IT { private final String selectAllSQL = "select * from test_rs"; diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowIT.java index 553af2298..91ff5137d 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowIT.java @@ -37,7 +37,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Completely compare json and arrow resultSet behaviors */ -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class ResultSetJsonVsArrowIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowMultiTZIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowMultiTZIT.java index ad3b4f630..d89cebfc6 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowMultiTZIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetJsonVsArrowMultiTZIT.java @@ -28,7 +28,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Completely compare json and arrow resultSet behaviors */ -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class ResultSetJsonVsArrowMultiTZIT extends BaseJDBCWithSharedConnectionIT { static String originalTz; diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java index 4e8c82f18..ab7a6e081 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetLatestIT.java @@ -69,7 +69,6 @@ * if the tests still is not applicable. If it is applicable, move tests to ResultSetIT so that both * the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetLatestIT extends ResultSet0IT { private static void setQueryResultFormat(Statement stmt, String queryResultFormat) diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneIT.java index 57ebf40b5..93266290c 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneIT.java @@ -39,7 +39,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** Test ResultSet */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetMultiTimeZoneIT extends BaseJDBCTest { static TimeZone ogTz; diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneLatestIT.java index 58175fee9..2d0bbd6b6 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetMultiTimeZoneLatestIT.java @@ -31,7 +31,6 @@ /** * ResultSet multi timezone tests for the latest JDBC driver. This cannot run for the old driver. */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetMultiTimeZoneLatestIT extends BaseJDBCWithSharedConnectionIT { diff --git a/src/test/java/net/snowflake/client/jdbc/ResultSetVectorLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ResultSetVectorLatestIT.java index eea7a496b..23cdc5b6b 100644 --- a/src/test/java/net/snowflake/client/jdbc/ResultSetVectorLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ResultSetVectorLatestIT.java @@ -26,7 +26,6 @@ * If it is applicable, move tests to ResultSetVectorIT so that both the latest and oldest supported * driver run the tests. */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetVectorLatestIT extends ResultSet0IT { @@ -162,7 +161,7 @@ public void testGetVectorViaGetStringIsEqualToTheGetObject(String queryResultFor assertTrue(resultSet.next()); assertGetObjectAndGetStringBeTheSame(resultSet, "[-1,5]", 1); String floatArrayRepresentation = - "JSON".equals(queryResultFormat) + "json".equalsIgnoreCase(queryResultFormat) // in json we have slightly different format that we accept in the result ? "[-1.200000,5.100000,15.870000]" : "[-1.2,5.1,15.87]"; diff --git a/src/test/java/net/snowflake/client/jdbc/SessionVariablesIT.java b/src/test/java/net/snowflake/client/jdbc/SessionVariablesIT.java index 7115ef07e..c5f3c8a1f 100644 --- a/src/test/java/net/snowflake/client/jdbc/SessionVariablesIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SessionVariablesIT.java @@ -18,7 +18,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public final class SessionVariablesIT extends AbstractDriverIT { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeAzureClientHandleExceptionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeAzureClientHandleExceptionLatestIT.java index b1d975000..b57bdc86b 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeAzureClientHandleExceptionLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeAzureClientHandleExceptionLatestIT.java @@ -31,7 +31,6 @@ import org.mockito.Mockito; /** Test for SnowflakeAzureClient handle exception function */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class SnowflakeAzureClientHandleExceptionLatestIT extends AbstractDriverIT { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java index 49fd1b7e5..b245f8c0b 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverIT.java @@ -65,7 +65,6 @@ import org.junit.jupiter.api.io.TempDir; /** General integration tests */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class SnowflakeDriverIT extends BaseJDBCTest { private static final int MAX_CONCURRENT_QUERIES_PER_USER = 50; diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java index 0007a9c5a..fde744f15 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverLatestIT.java @@ -69,7 +69,6 @@ * is not applicable. If it is applicable, move tests to SnowflakeDriverIT so that both the latest * and oldest supported driver run the tests. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class SnowflakeDriverLatestIT extends BaseJDBCTest { @TempDir private File tmpFolder; @@ -1491,7 +1490,7 @@ public void testNoSpaceLeftOnDeviceException() throws SQLException { } @Test - @Disabled // ignored until SNOW-1616480 is resolved + @Disabled // TODO: ignored until SNOW-1616480 is resolved public void testUploadWithGCSPresignedUrlWithoutConnection() throws Throwable { File destFolder = new File(tmpFolder, "dest"); destFolder.mkdirs(); diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeGcsClientHandleExceptionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeGcsClientHandleExceptionLatestIT.java index 144424c36..fd6ee0d81 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeGcsClientHandleExceptionLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeGcsClientHandleExceptionLatestIT.java @@ -28,7 +28,6 @@ import org.mockito.Mockito; /** Test for SnowflakeGcsClient handle exception function, only work with latest driver */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class SnowflakeGcsClientHandleExceptionLatestIT extends AbstractDriverIT { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableIT.java index 3c42ec3ad..c5ad5405c 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableIT.java @@ -31,7 +31,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource; /** SnowflakeResultSetSerializable tests */ -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class SnowflakeResultSetSerializableIT extends BaseJDBCTest { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeS3ClientHandleExceptionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeS3ClientHandleExceptionLatestIT.java index ec7356eed..e104abc66 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeS3ClientHandleExceptionLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeS3ClientHandleExceptionLatestIT.java @@ -35,7 +35,6 @@ import org.mockito.Mockito; /** Test for SnowflakeS3Client handle exception function */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class SnowflakeS3ClientHandleExceptionLatestIT extends AbstractDriverIT { @TempDir private File tmpFolder; diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeUtilTest.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeUtilTest.java index f31680d3d..054aef9fe 100644 --- a/src/test/java/net/snowflake/client/jdbc/SnowflakeUtilTest.java +++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeUtilTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class SnowflakeUtilTest extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/StatementAlreadyClosedIT.java b/src/test/java/net/snowflake/client/jdbc/StatementAlreadyClosedIT.java index 8b4e3497c..268173e92 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementAlreadyClosedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementAlreadyClosedIT.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementAlreadyClosedIT extends BaseJDBCTest { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/StatementArrowIT.java b/src/test/java/net/snowflake/client/jdbc/StatementArrowIT.java index 25ab86c88..f66bbb7c2 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementArrowIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementArrowIT.java @@ -3,7 +3,6 @@ import net.snowflake.client.category.TestTags; import org.junit.jupiter.api.Tag; -// @Category(TestCategoryArrow.class) @Tag(TestTags.ARROW) public class StatementArrowIT extends StatementIT { public StatementArrowIT() { diff --git a/src/test/java/net/snowflake/client/jdbc/StatementFeatureNotSupportedIT.java b/src/test/java/net/snowflake/client/jdbc/StatementFeatureNotSupportedIT.java index 9b5e1d233..b6c62ddc1 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementFeatureNotSupportedIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementFeatureNotSupportedIT.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementFeatureNotSupportedIT extends BaseJDBCTest { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/StatementIT.java b/src/test/java/net/snowflake/client/jdbc/StatementIT.java index 12496d70a..075889834 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementIT.java @@ -36,7 +36,6 @@ import org.junit.jupiter.api.io.TempDir; /** Statement tests */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementIT extends BaseJDBCWithSharedConnectionIT { protected static String queryResultFormat = "json"; diff --git a/src/test/java/net/snowflake/client/jdbc/StatementLargeUpdateIT.java b/src/test/java/net/snowflake/client/jdbc/StatementLargeUpdateIT.java index d61b945b9..b0eefd096 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementLargeUpdateIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementLargeUpdateIT.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; /** Large update test. No JSON/ARROW specific test case is required. */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementLargeUpdateIT extends BaseJDBCTest { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java b/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java index 09df2ba31..e2f030464 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java @@ -38,7 +38,6 @@ * if the tests still is not applicable. If it is applicable, move tests to StatementIT so that both * the latest and oldest supported driver run the tests. */ -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementLatestIT extends BaseJDBCWithSharedConnectionIT { protected static String queryResultFormat = "json"; diff --git a/src/test/java/net/snowflake/client/jdbc/StatementNoOpLatestIT.java b/src/test/java/net/snowflake/client/jdbc/StatementNoOpLatestIT.java index 1d86632d6..22b58584d 100644 --- a/src/test/java/net/snowflake/client/jdbc/StatementNoOpLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StatementNoOpLatestIT.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryStatement.class) @Tag(TestTags.STATEMENT) public class StatementNoOpLatestIT { @Test diff --git a/src/test/java/net/snowflake/client/jdbc/StreamIT.java b/src/test/java/net/snowflake/client/jdbc/StreamIT.java index fdff0306a..e6407c16c 100644 --- a/src/test/java/net/snowflake/client/jdbc/StreamIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StreamIT.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; /** Stream interface tests. Snowflake JDBC specific API */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class StreamIT extends BaseJDBCTest { /** diff --git a/src/test/java/net/snowflake/client/jdbc/StreamLatestIT.java b/src/test/java/net/snowflake/client/jdbc/StreamLatestIT.java index e10a0be97..af7c8eea3 100644 --- a/src/test/java/net/snowflake/client/jdbc/StreamLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/StreamLatestIT.java @@ -33,7 +33,6 @@ * is not applicable. If it is applicable, move tests to StreamIT so that both the latest and oldest * supported driver run the tests. */ -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class StreamLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/cloud/storage/CloudStorageClientLatestIT.java b/src/test/java/net/snowflake/client/jdbc/cloud/storage/CloudStorageClientLatestIT.java index 7c5abdca6..d09182860 100644 --- a/src/test/java/net/snowflake/client/jdbc/cloud/storage/CloudStorageClientLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/cloud/storage/CloudStorageClientLatestIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -// @Category(TestCategoryOthers.class) @Tag(TestTags.OTHERS) public class CloudStorageClientLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContextLatestIT.java b/src/test/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContextLatestIT.java index 88d8dd5dd..8df4f988e 100644 --- a/src/test/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContextLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContextLatestIT.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryDiagnostic.class) @Tag(TestTags.DIAGNOSTIC) public class DiagnosticContextLatestIT { diff --git a/src/test/java/net/snowflake/client/jdbc/structuredtypes/ResultSetStructuredTypesLatestIT.java b/src/test/java/net/snowflake/client/jdbc/structuredtypes/ResultSetStructuredTypesLatestIT.java index e3ed64a59..1660ea57d 100644 --- a/src/test/java/net/snowflake/client/jdbc/structuredtypes/ResultSetStructuredTypesLatestIT.java +++ b/src/test/java/net/snowflake/client/jdbc/structuredtypes/ResultSetStructuredTypesLatestIT.java @@ -46,7 +46,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class ResultSetStructuredTypesLatestIT extends BaseJDBCTest { @BeforeEach diff --git a/src/test/java/net/snowflake/client/jdbc/structuredtypes/StructuredTypesGetStringArrowJsonCompatibilityIT.java b/src/test/java/net/snowflake/client/jdbc/structuredtypes/StructuredTypesGetStringArrowJsonCompatibilityIT.java index 2245a2647..c3ae5fdd8 100644 --- a/src/test/java/net/snowflake/client/jdbc/structuredtypes/StructuredTypesGetStringArrowJsonCompatibilityIT.java +++ b/src/test/java/net/snowflake/client/jdbc/structuredtypes/StructuredTypesGetStringArrowJsonCompatibilityIT.java @@ -20,7 +20,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsSource; -// @Category(TestCategoryResultSet.class) @Tag(TestTags.RESULT_SET) public class StructuredTypesGetStringArrowJsonCompatibilityIT extends StructuredTypesGetStringBaseIT { diff --git a/src/test/java/net/snowflake/client/jdbc/telemetry/TelemetryIT.java b/src/test/java/net/snowflake/client/jdbc/telemetry/TelemetryIT.java index 5dfe7f505..302146801 100644 --- a/src/test/java/net/snowflake/client/jdbc/telemetry/TelemetryIT.java +++ b/src/test/java/net/snowflake/client/jdbc/telemetry/TelemetryIT.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class TelemetryIT extends AbstractDriverIT { private Connection connection = null; diff --git a/src/test/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryServiceIT.java b/src/test/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryServiceIT.java index e3999bf6a..347bc97e3 100644 --- a/src/test/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryServiceIT.java +++ b/src/test/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryServiceIT.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.TimeUnit; -import net.snowflake.client.annotations.RunOnTestaccount; +import net.snowflake.client.annotations.RunOnTestaccountNotOnGithubActions; import net.snowflake.client.category.TestTags; import net.snowflake.client.core.SFSession; import net.snowflake.client.jdbc.BaseJDBCTest; @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test; /** Standalone test cases for the out of band telemetry service */ -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class TelemetryServiceIT extends BaseJDBCTest { private static final int WAIT_FOR_TELEMETRY_REPORT_IN_MILLISECS = 5000; @@ -230,7 +229,7 @@ private int generateSQLFeatureNotSupportedException() throws SQLFeatureNotSuppor * @throws SQLException */ @Test - @RunOnTestaccount + @RunOnTestaccountNotOnGithubActions public void testSnowflakeSQLLoggedExceptionOOBTelemetry() throws SQLException, InterruptedException { // make a connection to initialize telemetry instance @@ -265,7 +264,7 @@ public void testSnowflakeSQLLoggedExceptionOOBTelemetry() * @throws SQLException */ @Test - @RunOnTestaccount + @RunOnTestaccountNotOnGithubActions public void testSQLFeatureNotSupportedOOBTelemetry() throws InterruptedException { // with null session, OOB telemetry will be thrown try { diff --git a/src/test/java/net/snowflake/client/loader/FlatfileReadMultithreadIT.java b/src/test/java/net/snowflake/client/loader/FlatfileReadMultithreadIT.java index 1283e3e51..dae7fc196 100644 --- a/src/test/java/net/snowflake/client/loader/FlatfileReadMultithreadIT.java +++ b/src/test/java/net/snowflake/client/loader/FlatfileReadMultithreadIT.java @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryLoader.class) @Tag(TestTags.LOADER) public class FlatfileReadMultithreadIT { private final int NUM_RECORDS = 100000; diff --git a/src/test/java/net/snowflake/client/loader/LoaderIT.java b/src/test/java/net/snowflake/client/loader/LoaderIT.java index 6f0cd57e9..7f4e3ee97 100644 --- a/src/test/java/net/snowflake/client/loader/LoaderIT.java +++ b/src/test/java/net/snowflake/client/loader/LoaderIT.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test; /** Loader IT */ -// @Category(TestCategoryLoader.class) @Tag(TestTags.LOADER) public class LoaderIT extends LoaderBase { @Test diff --git a/src/test/java/net/snowflake/client/loader/LoaderLatestIT.java b/src/test/java/net/snowflake/client/loader/LoaderLatestIT.java index f9c68550b..72212171b 100644 --- a/src/test/java/net/snowflake/client/loader/LoaderLatestIT.java +++ b/src/test/java/net/snowflake/client/loader/LoaderLatestIT.java @@ -23,7 +23,6 @@ * is not applicable. If it is applicable, move tests to LoaderIT so that both the latest and oldest * supported driver run the tests. */ -// @Category(TestCategoryLoader.class) @Tag(TestTags.LOADER) public class LoaderLatestIT extends LoaderBase { @Test diff --git a/src/test/java/net/snowflake/client/loader/LoaderMultipleBatchIT.java b/src/test/java/net/snowflake/client/loader/LoaderMultipleBatchIT.java index 832f6bf2e..a01dfffa5 100644 --- a/src/test/java/net/snowflake/client/loader/LoaderMultipleBatchIT.java +++ b/src/test/java/net/snowflake/client/loader/LoaderMultipleBatchIT.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryLoader.class) @Tag(TestTags.LOADER) public class LoaderMultipleBatchIT extends LoaderBase { @Test diff --git a/src/test/java/net/snowflake/client/loader/LoaderTimestampIT.java b/src/test/java/net/snowflake/client/loader/LoaderTimestampIT.java index d82c2b518..9c418c421 100644 --- a/src/test/java/net/snowflake/client/loader/LoaderTimestampIT.java +++ b/src/test/java/net/snowflake/client/loader/LoaderTimestampIT.java @@ -18,7 +18,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryLoader.class) @Tag(TestTags.LOADER) public class LoaderTimestampIT extends LoaderBase { @Test diff --git a/src/test/java/net/snowflake/client/log/AbstractLoggerIT.java b/src/test/java/net/snowflake/client/log/AbstractLoggerIT.java index 98c568e91..15ee56e6a 100644 --- a/src/test/java/net/snowflake/client/log/AbstractLoggerIT.java +++ b/src/test/java/net/snowflake/client/log/AbstractLoggerIT.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test; /** A base class for testing implementations of {@link SFLogger} */ -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public abstract class AbstractLoggerIT { public static final String fakeCreds = diff --git a/src/test/java/net/snowflake/client/log/JDK14JCLWrapperLatestIT.java b/src/test/java/net/snowflake/client/log/JDK14JCLWrapperLatestIT.java index a77e7a03a..b8c2b63e5 100644 --- a/src/test/java/net/snowflake/client/log/JDK14JCLWrapperLatestIT.java +++ b/src/test/java/net/snowflake/client/log/JDK14JCLWrapperLatestIT.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class JDK14JCLWrapperLatestIT { JDK14JCLWrapper wrapper = new JDK14JCLWrapper(JDK14JCLWrapperLatestIT.class.getName()); diff --git a/src/test/java/net/snowflake/client/log/JDK14LoggerLatestIT.java b/src/test/java/net/snowflake/client/log/JDK14LoggerLatestIT.java index fe609ac51..54d21f4e6 100644 --- a/src/test/java/net/snowflake/client/log/JDK14LoggerLatestIT.java +++ b/src/test/java/net/snowflake/client/log/JDK14LoggerLatestIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Tag; /** A class for testing {@link JDK14Logger} */ -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class JDK14LoggerLatestIT extends AbstractLoggerIT { /** {@link JDK14Logger} instance that will be tested in this class */ diff --git a/src/test/java/net/snowflake/client/log/SLF4JJJCLWrapperLatestIT.java b/src/test/java/net/snowflake/client/log/SLF4JJJCLWrapperLatestIT.java index 43aefd9e9..008f356a0 100644 --- a/src/test/java/net/snowflake/client/log/SLF4JJJCLWrapperLatestIT.java +++ b/src/test/java/net/snowflake/client/log/SLF4JJJCLWrapperLatestIT.java @@ -18,7 +18,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class SLF4JJJCLWrapperLatestIT { diff --git a/src/test/java/net/snowflake/client/log/SLF4JLoggerLatestIT.java b/src/test/java/net/snowflake/client/log/SLF4JLoggerLatestIT.java index 7c1d31ed8..9e515b03a 100644 --- a/src/test/java/net/snowflake/client/log/SLF4JLoggerLatestIT.java +++ b/src/test/java/net/snowflake/client/log/SLF4JLoggerLatestIT.java @@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory; /** A class for testing {@link SLF4JLogger} */ -// @Category(TestCategoryCore.class) @Tag(TestTags.CORE) public class SLF4JLoggerLatestIT extends AbstractLoggerIT { /** {@link SLF4JLogger} instance that will be tested in this class */ diff --git a/src/test/java/net/snowflake/client/pooling/ConnectionPoolingDataSourceIT.java b/src/test/java/net/snowflake/client/pooling/ConnectionPoolingDataSourceIT.java index 2622676e5..09ffe213a 100644 --- a/src/test/java/net/snowflake/client/pooling/ConnectionPoolingDataSourceIT.java +++ b/src/test/java/net/snowflake/client/pooling/ConnectionPoolingDataSourceIT.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class ConnectionPoolingDataSourceIT extends AbstractDriverIT { @Test diff --git a/src/test/java/net/snowflake/client/pooling/LogicalConnectionAlreadyClosedLatestIT.java b/src/test/java/net/snowflake/client/pooling/LogicalConnectionAlreadyClosedLatestIT.java index b031340a8..268989657 100644 --- a/src/test/java/net/snowflake/client/pooling/LogicalConnectionAlreadyClosedLatestIT.java +++ b/src/test/java/net/snowflake/client/pooling/LogicalConnectionAlreadyClosedLatestIT.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 LogicalConnectionAlreadyClosedLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/pooling/LogicalConnectionFeatureNotSupportedLatestIT.java b/src/test/java/net/snowflake/client/pooling/LogicalConnectionFeatureNotSupportedLatestIT.java index 5e50f0916..d3d19c8cf 100644 --- a/src/test/java/net/snowflake/client/pooling/LogicalConnectionFeatureNotSupportedLatestIT.java +++ b/src/test/java/net/snowflake/client/pooling/LogicalConnectionFeatureNotSupportedLatestIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class LogicalConnectionFeatureNotSupportedLatestIT extends BaseJDBCTest { diff --git a/src/test/java/net/snowflake/client/pooling/LogicalConnectionLatestIT.java b/src/test/java/net/snowflake/client/pooling/LogicalConnectionLatestIT.java index 6dc342c4f..70afaf2bc 100644 --- a/src/test/java/net/snowflake/client/pooling/LogicalConnectionLatestIT.java +++ b/src/test/java/net/snowflake/client/pooling/LogicalConnectionLatestIT.java @@ -34,7 +34,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -// @Category(TestCategoryConnection.class) @Tag(TestTags.CONNECTION) public class LogicalConnectionLatestIT extends BaseJDBCTest { Map properties = getConnectionParameters();