From a905c2fcd2963c825c3e9a138c91ddaeeaf25ca0 Mon Sep 17 00:00:00 2001 From: lilgreenbird Date: Mon, 3 Feb 2025 15:00:21 -0800 Subject: [PATCH 1/4] add secretRequired tag --- pom.xml | 110 ++++++++++++------ .../JDBCEncryptionDecryptionTest.java | 4 + .../jdbc/AlwaysEncrypted/MSITest.java | 1 + .../AlwaysEncrypted/MultiUserAKVTest.java | 1 + .../sqlserver/jdbc/fedauth/FedauthTest.java | 19 +-- .../sqlserver/jdbc/fedauth/FedauthWithAE.java | 1 + .../jdbc/fedauth/PooledConnectionTest.java | 1 + .../sqlserver/testframework/Constants.java | 1 + 8 files changed, 94 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 026144f460..0b85892268 100644 --- a/pom.xml +++ b/pom.xml @@ -42,14 +42,16 @@ xAzureSQLDB - - - - For tests not compatible with Azure SQL Database - - xAzureSQLDW - - - - For tests not compatible with Azure Data Warehouse - xAzureSQLMI - - - - For tests not compatible with Azure SQL Managed Instance - NTLM - - - - - - - For tests using NTLM Authentication mode (excluded by default) - kerberos - - - - - For tests using Kerberos authentication (excluded by default) + NTLM - - - For tests using NTLM Authentication mode (excluded by default) + kerberos - - - - For tests using Kerberos authentication (excluded by default) reqExternalSetup - For tests requiring external setup (excluded by default) clientCertAuth - - For tests requiring client certificate authentication - setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - - + setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - - + secretRequired - For tests requiring setting up secrets manually - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default testing enabled with SQL Server 2019 (SQLv15) --> - xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos + + xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,secretsRequired -preview @@ -228,7 +230,8 @@ central - https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 + + https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 true @@ -240,7 +243,8 @@ central - https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 + + https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 true @@ -253,7 +257,8 @@ jre8 - ${project.artifactId}-${project.version}.jre8${releaseExt} + + ${project.artifactId}-${project.version}.jre8${releaseExt} org.apache.maven.plugins @@ -261,14 +266,20 @@ 3.8.0 - **/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java - **/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java + + **/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java + + **/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java + + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java - **/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java - **/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java - **/com/microsoft/sqlserver/jdbc/JDBC43Test.java + + **/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java + + **/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java + + **/com/microsoft/sqlserver/jdbc/JDBC43Test.java 1.8 1.8 @@ -287,7 +298,8 @@ 3.1.1 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -296,7 +308,8 @@ maven-surefire-plugin 3.0.0-M1 - + ${excludedGroups}, xJDBC42 @@ -306,7 +319,8 @@ jre11 - ${project.artifactId}-${project.version}.jre11${releaseExt} + + ${project.artifactId}-${project.version}.jre11${releaseExt} org.apache.maven.plugins @@ -314,7 +328,8 @@ 3.8.0 - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 11 11 @@ -326,9 +341,11 @@ 3.1.1 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - com.microsoft.sqlserver.jdbc + + com.microsoft.sqlserver.jdbc @@ -339,7 +356,8 @@ jre17 - ${project.artifactId}-${project.version}.jre17${releaseExt} + + ${project.artifactId}-${project.version}.jre17${releaseExt} org.apache.maven.plugins @@ -347,7 +365,8 @@ 3.8.0 - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 17 17 @@ -359,9 +378,11 @@ 3.1.1 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - com.microsoft.sqlserver.jdbc + + com.microsoft.sqlserver.jdbc @@ -372,7 +393,8 @@ jre21 - ${project.artifactId}-${project.version}.jre21${releaseExt} + + ${project.artifactId}-${project.version}.jre21${releaseExt} org.apache.maven.plugins @@ -380,7 +402,8 @@ 3.8.0 - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 21 21 @@ -392,9 +415,11 @@ 3.1.1 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - com.microsoft.sqlserver.jdbc + + com.microsoft.sqlserver.jdbc @@ -408,7 +433,8 @@ true - ${project.artifactId}-${project.version}.jre23${releaseExt} + + ${project.artifactId}-${project.version}.jre23${releaseExt} org.apache.maven.plugins @@ -416,7 +442,8 @@ 3.8.0 - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 23 23 @@ -428,9 +455,11 @@ 3.1.1 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - com.microsoft.sqlserver.jdbc + + com.microsoft.sqlserver.jdbc @@ -477,12 +506,16 @@ - + WARN - org.apache.maven.plugins:maven-verifier-plugin + + org.apache.maven.plugins:maven-verifier-plugin - Please consider using the maven-invoker-plugin + + Please consider using the + maven-invoker-plugin (http://maven.apache.org/plugins/maven-invoker-plugin/)! @@ -535,8 +568,10 @@ com.microsoft.sqlserver.jdbc.dataclassification, microsoft.sql - !microsoft.sql,jdk.net;resolution:=optional,* - com.microsoft.sqlserver.jdbc.osgi.Activator + + !microsoft.sql,jdk.net;resolution:=optional,* + + com.microsoft.sqlserver.jdbc.osgi.Activator @@ -573,7 +608,8 @@ true outdated-dependencies.txt - file:///${session.executionRootDirectory}/maven-version-rules.xml + + file:///${session.executionRootDirectory}/maven-version-rules.xml diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java index 6f35029339..3c5f53543c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java @@ -103,6 +103,7 @@ public void testJksName(String serverName, String url, String protocol) throws E @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) + @Tag(Constants.secretRequired) public void testAkvName(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -207,6 +208,7 @@ public void testJksBadEncryptColumnEncryptionKey(String serverName, String url, @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) + @Tag(Constants.secretRequired) public void testAkvBadEncryptColumnEncryptionKey(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -286,6 +288,7 @@ public void testJksDecryptColumnEncryptionKey(String serverName, String url, Str @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) + @Tag(Constants.secretRequired) public void testAkvDecryptColumnEncryptionKey(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -2287,6 +2290,7 @@ public void testAkvNameWithAuthCallback(String serverName, String url, String pr @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) + @Tag(Constants.secretRequired) public void testAkvNameWithTokenCredential(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java index 9aeb0da8f0..61373d2070 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java @@ -42,6 +42,7 @@ */ @RunWith(JUnitPlatform.class) @Tag(Constants.MSI) +@Tag(Constants.secretRequired) public class MSITest extends AESetup { /* diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java index 2619a79b53..da19513da0 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java @@ -59,6 +59,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class MultiUserAKVTest extends AESetup { private static Map requiredKeyStoreProvider = new HashMap<>(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java index f3e4e957fc..893c2e7b2a 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java @@ -284,6 +284,7 @@ public void testAADPasswordApplicationName() throws Exception { * @deprecated */ @Deprecated + @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthDeprecated() { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -306,6 +307,7 @@ public void testAADServicePrincipalAuthDeprecated() { * Test AAD Service Principal Authentication using username/password in connection string, data source and SSL * encryption. */ + @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuth() { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -324,6 +326,7 @@ public void testAADServicePrincipalAuth() { } } + @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthFailureOnSubsequentConnectionsWithInvalidatedTokenCacheWithInvalidSecret() throws Exception { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -366,8 +369,8 @@ public void testActiveDirectoryPasswordFailureOnSubsequentConnectionsWithInvalid public void testAADServicePrincipalCertAuthFailureOnSubsequentConnectionsWithInvalidatedTokenCacheWithInvalidPassword() throws Exception { // Should succeed on valid cert field values String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" - + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + servicePrincipalCertificateApplicationClientId - + ";clientCertificate=" + clientCertificate; + + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + + servicePrincipalCertificateApplicationClientId + ";clientCertificate=" + clientCertificate; // Should fail on invalid cert field values String invalidPasswordUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase @@ -387,6 +390,7 @@ public void testAADServicePrincipalCertAuthFailureOnSubsequentConnectionsWithInv /** * Test invalid connection property combinations when using AAD Service Principal Authentication. */ + @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthWrong() { String baseUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -428,8 +432,8 @@ public void testAADServicePrincipalAuthWrong() { public void testAADServicePrincipalCertAuth() { // certificate from AKV has no password String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" - + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + servicePrincipalCertificateApplicationClientId - + ";clientCertificate=" + clientCertificate; + + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";Username=" + + servicePrincipalCertificateApplicationClientId + ";clientCertificate=" + clientCertificate; String urlEncrypted = url + ";encrypt=false;trustServerCertificate=true;"; SQLServerDataSource ds = new SQLServerDataSource(); @@ -450,7 +454,8 @@ public void testAADServicePrincipalCertAuth() { @Test public void testAADServicePrincipalCertAuthWrong() { String baseUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" - + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";userName=" + servicePrincipalCertificateApplicationClientId; + + SqlAuthentication.ActiveDirectoryServicePrincipalCertificate + ";userName=" + + servicePrincipalCertificateApplicationClientId; // no certificate provided. String url = baseUrl; @@ -469,8 +474,8 @@ public void testAADServicePrincipalCertAuthWrong() { validateException(url, "R_readCertError"); // wrong certificate key or password - url = baseUrl + ";password=" + azurePassword + ";clientCertificate=" + clientCertificate + ";clientKey=wrongKey;" - + "clientPassword=wrongPassword"; + url = baseUrl + ";password=" + azurePassword + ";clientCertificate=" + clientCertificate + + ";clientKey=wrongKey;" + "clientPassword=wrongPassword"; validateException(url, "R_readCertError"); } diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java index 1e0112f028..3116254da6 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java @@ -95,6 +95,7 @@ public void testFedAuthWithAE_JKS() throws SQLException { } } + @Tag(Constants.secretRequired) @Test public void testFedAuthWithAE_AKV() throws SQLException { String[] charValues = {"hello world!!!", "hello world!!!", "hello world!!!", "你好啊~~~", "你好啊~~~", "你好啊~~~"}; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java index 85a232fd09..ee1a6e528e 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java @@ -58,6 +58,7 @@ @RunWith(JUnitPlatform.class) @Tag("slow") @Tag(Constants.fedAuth) +@Tag(Constants.secretRequired) public class PooledConnectionTest extends FedauthCommon { static String charTable = TestUtils.escapeSingleQuotes( diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java index 8ed4099453..f7e644514f 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java @@ -47,6 +47,7 @@ private Constants() {} public static final String reqExternalSetup = "reqExternalSetup"; public static final String clientCertAuth = "clientCertAuth"; public static final String fedAuth = "fedAuth"; + public static final String secretRequired = "secretRequired"; public static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current(); public static final Logger LOGGER = Logger.getLogger("AbstractTest"); From 309c68c7779b1a3ae1583e7624ab08715fd7c59a Mon Sep 17 00:00:00 2001 From: lilgreenbird Date: Mon, 3 Feb 2025 19:51:29 -0800 Subject: [PATCH 2/4] more --- .../BulkCopySendTemporalDataTypesAsStringAETest.java | 1 + .../sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java | 1 + .../jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java | 1 + .../jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java | 1 + .../sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java | 1 + .../jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java | 1 + .../java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java | 1 + .../microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java | 1 + .../sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java | 1 + .../com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java | 1 + .../java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java | 3 +-- 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java index 6dd177ab57..fb23023637 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java @@ -58,6 +58,7 @@ @Tag(Constants.xAzureSQLDB) @Tag(Constants.xAzureSQLDW) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class BulkCopySendTemporalDataTypesAsStringAETest extends AESetup { static String inputFile = "BulkCopyCSVSendTemporalDataTypesAsStringForBulkCopy.csv"; static String encoding = "UTF-8"; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java index d259b35a55..e97a67d94c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java @@ -54,6 +54,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class CallableStatementTest extends AESetup { private static String multiStatementsProcedure = AbstractSQLGenerator diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java index 3c5f53543c..0f6c705b00 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java @@ -65,6 +65,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class JDBCEncryptionDecryptionTest extends AESetup { private boolean nullable = false; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java index cef219d4af..76fbae700c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java @@ -33,6 +33,7 @@ @Tag(Constants.xSQLv12) @Tag(Constants.xSQLv14) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class ParameterMetaDataCacheTest extends AESetup { @BeforeAll diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java index 162fe8cef4..2ef9ff07f2 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java @@ -43,6 +43,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class PrecisionScaleTest extends AESetup { private static java.util.Date date = null; private static int offsetFromGMT = 0; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java index d8725cdbe5..f0242c50e2 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java @@ -30,6 +30,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class RegressionAlwaysEncryptedTest extends AESetup { static String numericTable[][] = {{"Bit", "bit"}, {"Tinyint", "tinyint"}, {"Smallint", "smallint"},}; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java index 5f3c1165cf..306cce8aa4 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java @@ -33,6 +33,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.secretRequired) public class EnclavePackageTest extends AbstractTest { private static String connectionStringEnclave = null; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java index 72dae99f9a..7ebae32a3c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java @@ -23,6 +23,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) +@Tag(Constants.secretRequired) public class ConcurrentLoginTest extends FedauthCommon { final AtomicReference throwableRef = new AtomicReference(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java index a1a2a5fd46..d33a5eda86 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java @@ -29,6 +29,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) +@Tag(Constants.secretRequired) public class ConnectionEncryptionTest extends FedauthCommon { static String charTable = TestUtils.escapeSingleQuotes( diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java index dd4d952399..f3ca4e0294 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java @@ -25,6 +25,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) +@Tag(Constants.secretRequired) public class ErrorMessageTest extends FedauthCommon { String badUserName = "abc" + azureUserName; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java index 893c2e7b2a..3960355e30 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java @@ -42,6 +42,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) +@Tag(Constants.secretRequired) public class FedauthTest extends FedauthCommon { static String charTable = TestUtils .escapeSingleQuotes(AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("JDBC_FedAuthTest"))); @@ -326,7 +327,6 @@ public void testAADServicePrincipalAuth() { } } - @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthFailureOnSubsequentConnectionsWithInvalidatedTokenCacheWithInvalidSecret() throws Exception { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -390,7 +390,6 @@ public void testAADServicePrincipalCertAuthFailureOnSubsequentConnectionsWithInv /** * Test invalid connection property combinations when using AAD Service Principal Authentication. */ - @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthWrong() { String baseUrl = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" From 83655e852d05afcfea921adb0c22320b2e918e57 Mon Sep 17 00:00:00 2001 From: lilgreenbird Date: Mon, 3 Feb 2025 23:28:18 -0800 Subject: [PATCH 3/4] update --- pom.xml | 4 ++-- .../BulkCopySendTemporalDataTypesAsStringAETest.java | 2 +- .../jdbc/AlwaysEncrypted/CallableStatementTest.java | 2 +- .../sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java | 1 + .../jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java | 6 +----- .../microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java | 2 +- .../sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java | 2 +- .../jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java | 2 +- .../sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java | 2 +- .../jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java | 2 +- .../com/microsoft/sqlserver/jdbc/EnclavePackageTest.java | 2 +- .../sqlserver/jdbc/fedauth/ConcurrentLoginTest.java | 2 +- .../sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java | 2 +- .../microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java | 2 +- .../com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java | 4 +--- .../com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java | 2 +- .../sqlserver/jdbc/fedauth/PooledConnectionTest.java | 2 +- .../com/microsoft/sqlserver/testframework/Constants.java | 2 +- 18 files changed, 19 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 0b85892268..321c4226d5 100644 --- a/pom.xml +++ b/pom.xml @@ -47,11 +47,11 @@ reqExternalSetup - For tests requiring external setup (excluded by default) clientCertAuth - - For tests requiring client certificate authentication setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - - - secretRequired - For tests requiring setting up secrets manually + requireSecret - For tests requiring setting up secrets manually - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default testing enabled with SQL Server 2019 (SQLv15) --> - xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,secretsRequired + xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,requireSecret -preview diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java index fb23023637..47f717f541 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/BulkCopySendTemporalDataTypesAsStringAETest.java @@ -58,7 +58,7 @@ @Tag(Constants.xAzureSQLDB) @Tag(Constants.xAzureSQLDW) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class BulkCopySendTemporalDataTypesAsStringAETest extends AESetup { static String inputFile = "BulkCopyCSVSendTemporalDataTypesAsStringForBulkCopy.csv"; static String encoding = "UTF-8"; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java index e97a67d94c..8215250ee0 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java @@ -54,7 +54,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class CallableStatementTest extends AESetup { private static String multiStatementsProcedure = AbstractSQLGenerator diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java index 4b55573afe..43dc7ed66b 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java @@ -44,6 +44,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) +@Tag(Constants.requireSecret) public class EnclaveTest extends AESetup { /** * Tests basic connection. diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java index 0f6c705b00..b7cfac5475 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java @@ -65,7 +65,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class JDBCEncryptionDecryptionTest extends AESetup { private boolean nullable = false; @@ -104,7 +104,6 @@ public void testJksName(String serverName, String url, String protocol) throws E @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) - @Tag(Constants.secretRequired) public void testAkvName(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -209,7 +208,6 @@ public void testJksBadEncryptColumnEncryptionKey(String serverName, String url, @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) - @Tag(Constants.secretRequired) public void testAkvBadEncryptColumnEncryptionKey(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -289,7 +287,6 @@ public void testJksDecryptColumnEncryptionKey(String serverName, String url, Str @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) - @Tag(Constants.secretRequired) public void testAkvDecryptColumnEncryptionKey(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); @@ -2291,7 +2288,6 @@ public void testAkvNameWithAuthCallback(String serverName, String url, String pr @ParameterizedTest @MethodSource("enclaveParams") @Tag(Constants.reqExternalSetup) - @Tag(Constants.secretRequired) public void testAkvNameWithTokenCredential(String serverName, String url, String protocol) throws Exception { setAEConnectionString(serverName, url, protocol); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java index 61373d2070..360e172a12 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java @@ -42,7 +42,7 @@ */ @RunWith(JUnitPlatform.class) @Tag(Constants.MSI) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class MSITest extends AESetup { /* diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java index da19513da0..6148956081 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java @@ -59,7 +59,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class MultiUserAKVTest extends AESetup { private static Map requiredKeyStoreProvider = new HashMap<>(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java index 76fbae700c..ca4162154a 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java @@ -33,7 +33,7 @@ @Tag(Constants.xSQLv12) @Tag(Constants.xSQLv14) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class ParameterMetaDataCacheTest extends AESetup { @BeforeAll diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java index 2ef9ff07f2..dcbe907b5f 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java @@ -43,7 +43,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class PrecisionScaleTest extends AESetup { private static java.util.Date date = null; private static int offsetFromGMT = 0; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java index f0242c50e2..c8f33573a2 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java @@ -30,7 +30,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class RegressionAlwaysEncryptedTest extends AESetup { static String numericTable[][] = {{"Bit", "bit"}, {"Tinyint", "tinyint"}, {"Smallint", "smallint"},}; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java index 306cce8aa4..174755d4bf 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/EnclavePackageTest.java @@ -33,7 +33,7 @@ @Tag(Constants.xAzureSQLDW) @Tag(Constants.xAzureSQLDB) @Tag(Constants.reqExternalSetup) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class EnclavePackageTest extends AbstractTest { private static String connectionStringEnclave = null; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java index 7ebae32a3c..7c7f2240d0 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConcurrentLoginTest.java @@ -23,7 +23,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class ConcurrentLoginTest extends FedauthCommon { final AtomicReference throwableRef = new AtomicReference(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java index d33a5eda86..b7e307654e 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionEncryptionTest.java @@ -29,7 +29,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class ConnectionEncryptionTest extends FedauthCommon { static String charTable = TestUtils.escapeSingleQuotes( diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java index f3ca4e0294..ebe87e65c5 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java @@ -25,7 +25,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class ErrorMessageTest extends FedauthCommon { String badUserName = "abc" + azureUserName; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java index 3960355e30..436ca8e17e 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthTest.java @@ -42,7 +42,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class FedauthTest extends FedauthCommon { static String charTable = TestUtils .escapeSingleQuotes(AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("JDBC_FedAuthTest"))); @@ -285,7 +285,6 @@ public void testAADPasswordApplicationName() throws Exception { * @deprecated */ @Deprecated - @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuthDeprecated() { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" @@ -308,7 +307,6 @@ public void testAADServicePrincipalAuthDeprecated() { * Test AAD Service Principal Authentication using username/password in connection string, data source and SSL * encryption. */ - @Tag(Constants.secretRequired) @Test public void testAADServicePrincipalAuth() { String url = "jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";authentication=" diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java index 3116254da6..e42cc9f568 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java @@ -37,6 +37,7 @@ @RunWith(JUnitPlatform.class) @Tag(Constants.fedAuth) +@Tag(Constants.requireSecret) public class FedauthWithAE extends FedauthCommon { static String cmkName1 = Constants.CMK_NAME + "fedauthAE1"; @@ -95,7 +96,6 @@ public void testFedAuthWithAE_JKS() throws SQLException { } } - @Tag(Constants.secretRequired) @Test public void testFedAuthWithAE_AKV() throws SQLException { String[] charValues = {"hello world!!!", "hello world!!!", "hello world!!!", "你好啊~~~", "你好啊~~~", "你好啊~~~"}; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java index ee1a6e528e..604782eabd 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java @@ -58,7 +58,7 @@ @RunWith(JUnitPlatform.class) @Tag("slow") @Tag(Constants.fedAuth) -@Tag(Constants.secretRequired) +@Tag(Constants.requireSecret) public class PooledConnectionTest extends FedauthCommon { static String charTable = TestUtils.escapeSingleQuotes( diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java index f7e644514f..3009d2213a 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java @@ -47,7 +47,7 @@ private Constants() {} public static final String reqExternalSetup = "reqExternalSetup"; public static final String clientCertAuth = "clientCertAuth"; public static final String fedAuth = "fedAuth"; - public static final String secretRequired = "secretRequired"; + public static final String requireSecret = "requireSecret"; public static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current(); public static final Logger LOGGER = Logger.getLogger("AbstractTest"); From 00fe229a2906f6018657d2838d9b1dced8a0dfd1 Mon Sep 17 00:00:00 2001 From: lilgreenbird Date: Tue, 4 Feb 2025 01:05:13 -0800 Subject: [PATCH 4/4] add test --- .../sqlserver/jdbc/fedauth/ConnectionSuspensionTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionSuspensionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionSuspensionTest.java index 94e70a1423..c9e34d8b28 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionSuspensionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ConnectionSuspensionTest.java @@ -31,6 +31,7 @@ @RunWith(JUnitPlatform.class) @Tag("slow") @Tag(Constants.fedAuth) +@Tag(Constants.requireSecret) public class ConnectionSuspensionTest extends FedauthCommon { static String charTable = TestUtils.escapeSingleQuotes(