SNOW-1693588 Upgrade to JUnit5

TestOnly/pom.xml

@@ -18,6 +18,8 @@
     <jacoco.version>0.8.4</jacoco.version>
     <jacoco.skip.instrument>true</jacoco.skip.instrument>
     <jna.version>5.13.0</jna.version>
+    <junit.version>5.11.1</junit.version>
+    <junit4.version>4.13.2</junit4.version>
     <mockito.version>3.5.6</mockito.version>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
     <testCategory>net.snowflake.client.category.AllTestCategory</testCategory>
@@ -40,11 +42,28 @@
       <version>3.0.0-M1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <type>jar</type>
+      <version>${junit4.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

parent-pom.xml

@@ -59,7 +59,8 @@
     <jna.version>5.13.0</jna.version>
     <joda.time.version>2.8.1</joda.time.version>
     <json.smart.version>2.4.9</json.smart.version>
-    <junit.version>4.13.2</junit.version>
+    <junit.version>5.11.1</junit.version>
+    <junit4.version>4.13.2</junit4.version>
     <jsoup.version>1.15.3</jsoup.version>
     <logback.version>1.3.6</logback.version>
     <metrics.version>2.2.0</metrics.version>
@@ -257,10 +258,28 @@
         <artifactId>opencensus-api</artifactId>
         <version>${opencensus.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
+        <version>${junit4.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -719,6 +738,18 @@
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

src/test/java/com/snowflake/client/jdbc/SnowflakeDriverIT.java

@@ -5,7 +5,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import net.snowflake.client.AbstractDriverIT;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SnowflakeDriverIT extends AbstractDriverIT {
 

src/test/java/net/snowflake/client/AbstractDriverIT.java

@@ -24,12 +24,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
-import org.junit.Rule;
 
 /** Base test class with common constants, data structures and methods */
 public class AbstractDriverIT {
-  // This is required to use ConditionalIgnore annotation.
-  @Rule public ConditionalIgnoreRule rule = new ConditionalIgnoreRule();
 
   public static final String DRIVER_CLASS = "net.snowflake.client.jdbc.SnowflakeDriver";
   public static final String DRIVER_CLASS_COM = "com.snowflake.client.jdbc.SnowflakeDriver";

src/test/java/net/snowflake/client/ConditionalIgnoreRule.java

@@ -26,6 +26,7 @@
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 
+@Deprecated
 public class ConditionalIgnoreRule implements MethodRule {
 
   public interface IgnoreCondition {

src/test/java/net/snowflake/client/RunningNotOnAWS.java

@@ -4,6 +4,7 @@
 package net.snowflake.client;
 
 /** Run tests only on specified cloud provider or ignore */
+@Deprecated
 public class RunningNotOnAWS implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     String cloudProvider = TestUtil.systemGetEnv("CLOUD_PROVIDER");

src/test/java/net/snowflake/client/RunningNotOnAzure.java

@@ -4,6 +4,7 @@
 package net.snowflake.client;
 
 /** Run tests only on specified cloud provider or ignore */
+@Deprecated
 public class RunningNotOnAzure implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     String cloudProvider = TestUtil.systemGetEnv("CLOUD_PROVIDER");

src/test/java/net/snowflake/client/RunningNotOnGCP.java

@@ -4,6 +4,7 @@
 package net.snowflake.client;
 
 /** Run tests only on specified cloud provider or ignore */
+@Deprecated
 public class RunningNotOnGCP implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     String cloudProvider = TestUtil.systemGetEnv("CLOUD_PROVIDER");

src/test/java/net/snowflake/client/RunningNotOnGithubActionsMac.java

@@ -5,6 +5,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningNotOnGithubActionsMac implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return isRunningOnGithubActionsMac();

src/test/java/net/snowflake/client/RunningNotOnJava21.java

@@ -2,6 +2,7 @@
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
 
+@Deprecated
 public class RunningNotOnJava21 implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return isRunningOnJava21();

src/test/java/net/snowflake/client/RunningNotOnJava8.java

@@ -2,6 +2,7 @@
 
 import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
 
+@Deprecated
 public class RunningNotOnJava8 implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return isRunningOnJava8();

src/test/java/net/snowflake/client/RunningNotOnLinux.java

@@ -2,6 +2,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningNotOnLinux implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return Constants.getOS() != Constants.OS.LINUX;

src/test/java/net/snowflake/client/RunningNotOnLinuxMac.java

@@ -2,6 +2,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningNotOnLinuxMac implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return Constants.getOS() != Constants.OS.LINUX && Constants.getOS() != Constants.OS.MAC;

src/test/java/net/snowflake/client/RunningNotOnTestaccount.java

@@ -2,6 +2,7 @@
 
 import static net.snowflake.client.RunningOnGithubAction.isRunningOnGithubAction;
 
+@Deprecated
 public class RunningNotOnTestaccount implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return (!("testaccount".equals(TestUtil.systemGetEnv("SNOWFLAKE_TEST_ACCOUNT")))

src/test/java/net/snowflake/client/RunningNotOnWin.java

@@ -2,6 +2,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningNotOnWin implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return Constants.getOS() != Constants.OS.WINDOWS;

src/test/java/net/snowflake/client/RunningNotOnWinMac.java

@@ -2,6 +2,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningNotOnWinMac implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return Constants.getOS() != Constants.OS.MAC && Constants.getOS() != Constants.OS.WINDOWS;

src/test/java/net/snowflake/client/RunningOnGithubAction.java

@@ -4,6 +4,7 @@
 package net.snowflake.client;
 
 /** Run tests on CI */
+@Deprecated
 public class RunningOnGithubAction implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return TestUtil.systemGetEnv("GITHUB_ACTIONS") != null;

src/test/java/net/snowflake/client/RunningOnTestaccount.java

@@ -1,5 +1,6 @@
 package net.snowflake.client;
 
+@Deprecated
 public class RunningOnTestaccount implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return TestUtil.systemGetEnv("SNOWFLAKE_TEST_ACCOUNT").contains("testaccount");

src/test/java/net/snowflake/client/RunningOnWin.java

@@ -2,6 +2,7 @@
 
 import net.snowflake.client.core.Constants;
 
+@Deprecated
 public class RunningOnWin implements ConditionalIgnoreRule.IgnoreCondition {
   public boolean isSatisfied() {
     return Constants.getOS() == Constants.OS.WINDOWS;

src/test/java/net/snowflake/client/SkipOnThinJar.java

@@ -4,6 +4,7 @@
 package net.snowflake.client;
 
 /** Skip tests on CI when thin jar is tested */
+@Deprecated
 public class SkipOnThinJar implements ConditionalIgnoreRule.IgnoreCondition {
   @Override
   public boolean isSatisfied() {

src/test/java/net/snowflake/client/annotations/DontRunOnGithubActions.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfEnvironmentVariable(named = "GITHUB_ACTIONS", matches = ".*")
+public @interface DontRunOnGithubActions {}

src/test/java/net/snowflake/client/annotations/DontRunOnJava21.java

@@ -0,0 +1,13 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledOnJre(JRE.JAVA_21)
+public @interface DontRunOnJava21 {}

src/test/java/net/snowflake/client/annotations/DontRunOnJava8.java

@@ -0,0 +1,13 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledOnJre(JRE.JAVA_8)
+public @interface DontRunOnJava8 {}

src/test/java/net/snowflake/client/annotations/DontRunOnTestaccount.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfEnvironmentVariable(named = "SNOWFLAKE_TEST_ACCOUNT", matches = "testaccount")
+public @interface DontRunOnTestaccount {}

src/test/java/net/snowflake/client/annotations/DontRunOnThinJar.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfEnvironmentVariable(named = "ADDITIONAL_MAVEN_PROFILE", matches = "-Dthin-jar")
+public @interface DontRunOnThinJar {}

src/test/java/net/snowflake/client/annotations/DontRunOnWindows.java

@@ -0,0 +1,13 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledOnOs(OS.WINDOWS)
+public @interface DontRunOnWindows {}

src/test/java/net/snowflake/client/annotations/RunOnAWS.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledIfEnvironmentVariable(named = "CLOUD_PROVIDER", matches = "(?i)AWS(?-i)")
+public @interface RunOnAWS {}

src/test/java/net/snowflake/client/annotations/RunOnAzure.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfEnvironmentVariable(named = "CLOUD_PROVIDER", matches = "(?i)Azure(?-i)")
+public @interface RunOnAzure {}

src/test/java/net/snowflake/client/annotations/RunOnGCP.java

@@ -0,0 +1,12 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfEnvironmentVariable(named = "CLOUD_PROVIDER", matches = "(?i)GCP(?-i)")
+public @interface RunOnGCP {}

src/test/java/net/snowflake/client/annotations/RunOnGithubActionsNotMac.java

@@ -0,0 +1,15 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.junit.jupiter.api.condition.OS;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledIfEnvironmentVariable(named = "GITHUB_ACTIONS", matches = ".*")
+@DisabledOnOs(OS.MAC)
+public @interface RunOnGithubActionsNotMac {}

src/test/java/net/snowflake/client/annotations/RunOnLinux.java

@@ -0,0 +1,13 @@
+package net.snowflake.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledOnOs({OS.LINUX, OS.AIX})
+public @interface RunOnLinux {}