Tests | Move Exclude Groups to Constants and finalize them

azure-pipelines.yml

@@ -10,7 +10,7 @@ jobs:
     matrix:
       SQL-2017:
         Target_SQL: 'SQL-2k17-03'
-        Ex_Groups: 'xSQLv13'
+        Ex_Groups: 'xSQLv14'
       SQL-2008R2:
         Target_SQL: 'SQL-2k8R2-SP3-1'
         Ex_Groups: 'xSQLv12'

pom.xml

@@ -40,14 +40,14 @@
 	<properties>
 		<!-- Allowed values for excluded Groups here - - - - - - - - - - - - - 
 			xSQLv12 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2014 
-			xSQLv13 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2017 
-			xSQLv14 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2019 
+			xSQLv14 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2017 
+			xSQLv15 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2019 
 			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 
 			- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 			Default testing enabled with SQL Server 2019 (SQLv14) -->
-		<excludeGroups>xSQLv14</excludeGroups>
+		<excludeGroups>xSQLv15</excludeGroups>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- Driver Dependencies -->
 		<azure.keyvault.version>1.2.0</azure.keyvault.version>

src/test/java/com/microsoft/sqlserver/jdbc/ActivityIDTest.java

@@ -68,6 +68,7 @@ public void testActivityIDPooled() throws Exception {
         CountDownLatch latchPoolOuterThread = new CountDownLatch(1);
         Thread t = new Thread(new Runnable() {
             CountDownLatch latchPool = new CountDownLatch(numPooledExecution);
+
             public void run() {
                 HikariDataSource ds = new HikariDataSource(config);
                 es.execute(() -> {

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java

@@ -73,8 +73,7 @@ public class AESetup extends AbstractTest {
     public static void setUpConnection() throws TestAbortedException, Exception {
         AETestConnectionString = connectionString + ";sendTimeAsDateTime=false";
         readFromFile(Constants.JAVA_KEY_STORE_FILENAME, "Alias name");
-        try (Connection con = PrepUtil.getConnection(AETestConnectionString);
-                Statement stmt = con.createStatement()) {
+        try (Connection con = PrepUtil.getConnection(AETestConnectionString); Statement stmt = con.createStatement()) {
             dropCEK(stmt);
             dropCMK(stmt);
         }

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java

@@ -46,9 +46,9 @@
  *
  */
 @RunWith(JUnitPlatform.class)
-@Tag("xSQLv12")
-@Tag("xAzureSQLDW")
-@Tag("xAzureSQLDB")
+@Tag(Constants.xSQLv12)
+@Tag(Constants.xAzureSQLDW)
+@Tag(Constants.xAzureSQLDB)
 public class CallableStatementTest extends AESetup {
 
     private static String multiStatementsProcedure = RandomUtil.getIdentifier("multiStatementsProcedure");

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java

@@ -35,9 +35,9 @@
  *
  */
 @RunWith(JUnitPlatform.class)
-@Tag("xSQLv12")
-@Tag("xAzureSQLDW")
-@Tag("xAzureSQLDB")
+@Tag(Constants.xSQLv12)
+@Tag(Constants.xAzureSQLDW)
+@Tag(Constants.xAzureSQLDB)
 public class JDBCEncryptionDecryptionTest extends AESetup {
 
     private boolean nullable = false;

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/PrecisionScaleTest.java

@@ -38,9 +38,9 @@
  *
  */
 @RunWith(JUnitPlatform.class)
-@Tag("xSQLv12")
-@Tag("xAzureSQLDW")
-@Tag("xAzureSQLDB")
+@Tag(Constants.xSQLv12)
+@Tag(Constants.xAzureSQLDW)
+@Tag(Constants.xAzureSQLDB)
 public class PrecisionScaleTest extends AESetup {
 
     private static java.util.Date date = null;

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java

@@ -25,9 +25,9 @@
 
 
 @RunWith(JUnitPlatform.class)
-@Tag("xSQLv12")
-@Tag("xAzureSQLDW")
-@Tag("xAzureSQLDB")
+@Tag(Constants.xSQLv12)
+@Tag(Constants.xAzureSQLDW)
+@Tag(Constants.xAzureSQLDB)
 public class RegressionAlwaysEncryptedTest extends AESetup {
 
     @Test

src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java

@@ -49,7 +49,7 @@ protected Object[][] getContents() {
             {"R_createDropAlterTableFailed", "Create/drop/alter table with preparedStatement failed!"},
             {"R_grantFailed", "grant table with preparedStatement failed!"},
             {"R_connectionIsClosed", "The connection is closed."},
-            {"R_ConnectionURLNull", "The connection URL is null." },
+            {"R_ConnectionURLNull", "The connection URL is null."},
             {"R_connectionIsNotClosed", "The connection is not closed."},
             {"R_invalidExceptionMessage", "Invalid exception message"},
             {"R_failedValidate", "failed to validate values in $0} "}, {"R_tableNotDropped", "table not dropped. "},

src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java

@@ -63,7 +63,7 @@ public class TestUtils {
     private static ArrayList<SqlType> types = null;
     private static final char[] HEXCHARS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
             'F'};
-    
+
     final static int ENGINE_EDITION_FOR_SQL_AZURE = 5;
     final static int ENGINE_EDITION_FOR_SQL_AZURE_DW = 6;
     final static int ENGINE_EDITION_FOR_SQL_AZURE_MI = 8;
@@ -90,11 +90,14 @@ public class TestUtils {
      */
     public static boolean isAzure(Connection con) {
         if (null == isAzure) {
-            try (Statement stmt = con.createStatement(); ResultSet rs = stmt.executeQuery("SELECT CAST(SERVERPROPERTY('EngineEdition') as INT)")) {
+            try (Statement stmt = con.createStatement();
+                    ResultSet rs = stmt.executeQuery("SELECT CAST(SERVERPROPERTY('EngineEdition') as INT)")) {
                 rs.next();
 
                 int engineEdition = rs.getInt(1);
-                isAzure = (engineEdition == ENGINE_EDITION_FOR_SQL_AZURE || engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_DW || engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_MI);
+                isAzure = (engineEdition == ENGINE_EDITION_FOR_SQL_AZURE
+                        || engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_DW
+                        || engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_MI);
                 isAzureDW = (engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_DW);
                 isAzureMI = (engineEdition == ENGINE_EDITION_FOR_SQL_AZURE_MI);
 
@@ -118,6 +121,7 @@ public static boolean isAzureMI(Connection con) {
         isAzure(con);
         return isAzureMI;
     }
+
     /**
      * Read variable from property files if found null try to read from env.
      * 

src/test/java/com/microsoft/sqlserver/jdbc/TimeoutTest.java

@@ -28,6 +28,7 @@
 import org.junit.runner.RunWith;
 
 import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 
 
 @RunWith(JUnitPlatform.class)
@@ -55,15 +56,15 @@ public void after() throws InterruptedException {
     }
 
     @Test
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testBasicQueryTimeout() {
         assertThrows(SQLTimeoutException.class, () -> {
             runQuery(WAIT_FOR_ONE_MINUTE_SQL, TIMEOUT_SECONDS);
         });
     }
 
     @Test
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testQueryTimeoutValid() {
         long start = System.currentTimeMillis();
         assertThrows(SQLTimeoutException.class, () -> {

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyAllTypesTest.java

@@ -18,6 +18,7 @@
 import com.microsoft.sqlserver.jdbc.SQLServerBulkCopy;
 import com.microsoft.sqlserver.jdbc.TestUtils;
 import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 import com.microsoft.sqlserver.testframework.DBConnection;
 import com.microsoft.sqlserver.testframework.DBStatement;
 import com.microsoft.sqlserver.testframework.DBTable;
@@ -36,7 +37,7 @@ public class BulkCopyAllTypesTest extends AbstractTest {
      * @throws SQLException
      */
     @Test
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testTVPResultSet() throws SQLException {
         if (isSqlAzureDW()) {
             // TODO : Fix this test to run with Azure DW

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyCSVTest.java

@@ -50,7 +50,7 @@
  */
 @RunWith(JUnitPlatform.class)
 @DisplayName("Test bulkCopy with CSV")
-@Tag("xAzureSQLDW")
+@Tag(Constants.xAzureSQLDW)
 public class BulkCopyCSVTest extends AbstractTest {
 
     static String inputFile = "BulkCopyCSVTestInput.csv";

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyColumnMappingTest.java

@@ -39,7 +39,7 @@ public class BulkCopyColumnMappingTest extends BulkCopyTestSetUp {
 
     @Test
     @DisplayName("BulkCopy:test no explicit column mapping")
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testNoExplicitCM() throws SQLException {
         try (DBConnection con = new DBConnection(connectionString); DBStatement stmt = con.createStatement()) {
             DBTable destTable = null;
@@ -62,7 +62,7 @@ public void testNoExplicitCM() throws SQLException {
 
     @Test
     @DisplayName("BulkCopy:test explicit column mapping")
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testExplicitCM() throws SQLException {
         try (DBConnection con = new DBConnection(connectionString); DBStatement stmt = con.createStatement()) {
             DBTable destTable = null;
@@ -149,7 +149,7 @@ public void testUnicodeCM() throws SQLException {
 
     @Test
     @DisplayName("BulkCopy:test repetitive column mapping")
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testRepetitiveCM() throws SQLException {
         try (DBConnection con = new DBConnection(connectionString); DBStatement stmt = con.createStatement()) {
             DBTable sourceTable1 = null;
@@ -373,8 +373,9 @@ private void validateValuesRepetitiveCM(DBConnection con, DBTable sourceTable,
         try (DBStatement srcStmt = con.createStatement(); DBStatement dstStmt = con.createStatement();
                 DBResultSet srcResultSet = srcStmt.executeQuery("SELECT * FROM " + sourceTable.getEscapedTableName()
                         + " ORDER BY" + sourceTable.getEscapedColumnName(0));
-                DBResultSet dstResultSet = dstStmt.executeQuery("SELECT * FROM "
-                        + destinationTable.getEscapedTableName() + " ORDER BY" + destinationTable.getEscapedColumnName(0))) {
+                DBResultSet dstResultSet = dstStmt
+                        .executeQuery("SELECT * FROM " + destinationTable.getEscapedTableName() + " ORDER BY"
+                                + destinationTable.getEscapedColumnName(0))) {
             ResultSetMetaData sourceMeta = ((ResultSet) srcResultSet.product()).getMetaData();
             int totalColumns = sourceMeta.getColumnCount();
 

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java

@@ -42,7 +42,7 @@ public class BulkCopyConnectionTest extends BulkCopyTestSetUp {
      * @return
      */
     @TestFactory
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public Stream<DynamicTest> generateBulkCopyConstructorTest() {
         List<BulkCopyTestWrapper> testData = createTestDatatestBulkCopyConstructor();
         // had to avoid using lambdas as we need to test against java7
@@ -66,7 +66,7 @@ public void execute() {
      * @return
      */
     @TestFactory
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public Stream<DynamicTest> generateBulkCopyOptionsTest() {
         List<BulkCopyTestWrapper> testData = createTestDatatestBulkCopyOption();
         return testData.stream().map(new Function<BulkCopyTestWrapper, DynamicTest>() {
@@ -154,7 +154,7 @@ public void execute() throws SQLException {
      */
     @Test
     @DisplayName("BulkCopy:test null SQLServerBulkCopyOptions")
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testEmptyBulkCopyOptions() {
         BulkCopyTestWrapper bulkWrapper = new BulkCopyTestWrapper(connectionString);
         bulkWrapper.setUsingConnection((0 == Constants.RANDOM.nextInt(2)) ? true : false, ds);

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java

@@ -34,7 +34,7 @@
  */
 @RunWith(JUnitPlatform.class)
 @DisplayName("Test ISQLServerBulkRecord")
-@Tag("xAzureSQLDW")
+@Tag(Constants.xAzureSQLDW)
 public class BulkCopyISQLServerBulkRecordTest extends AbstractTest {
 
     @Test

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyResultSetCursorTest.java

@@ -28,11 +28,12 @@
 import com.microsoft.sqlserver.jdbc.TestUtils;
 import com.microsoft.sqlserver.testframework.AbstractSQLGenerator;
 import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 import com.microsoft.sqlserver.testframework.PrepUtil;
 
 
 @RunWith(JUnitPlatform.class)
-@Tag("xAzureSQLDW")
+@Tag(Constants.xAzureSQLDW)
 public class BulkCopyResultSetCursorTest extends AbstractTest {
 
     static BigDecimal[] expectedBigDecimals = {new BigDecimal("12345.12345"), new BigDecimal("125.123"),

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyRowSetTest.java

@@ -27,10 +27,11 @@
 import com.microsoft.sqlserver.jdbc.TestUtils;
 import com.microsoft.sqlserver.testframework.AbstractSQLGenerator;
 import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 
 
 @RunWith(JUnitPlatform.class)
-@Tag("xAzureSQLDW")
+@Tag(Constants.xAzureSQLDW)
 public class BulkCopyRowSetTest extends AbstractTest {
 
     private static String tableName = AbstractSQLGenerator

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTimeoutTest.java

@@ -37,7 +37,7 @@ public class BulkCopyTimeoutTest extends BulkCopyTestSetUp {
      */
     @Test
     @DisplayName("BulkCopy:test zero timeout")
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testZeroTimeOut() throws SQLException {
         testBulkCopyWithTimeout(0);
     }

src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java

@@ -36,6 +36,7 @@
 import com.microsoft.sqlserver.jdbc.TestUtils;
 import com.microsoft.sqlserver.testframework.AbstractSQLGenerator;
 import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 
 
 @RunWith(JUnitPlatform.class)
@@ -82,7 +83,7 @@ public void testVarchar() throws Exception {
      * @throws Exception
      */
     @Test
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testSmalldatetime() throws Exception {
         variation = "testSmalldatetime";
         BulkData bData = new BulkData(variation);
@@ -111,7 +112,7 @@ public void testSmalldatetime() throws Exception {
      * @throws Exception
      */
     @Test
-    @Tag("xAzureSQLDW")
+    @Tag(Constants.xAzureSQLDW)
     public void testSmalldatetimeOutofRange() throws Exception {
         variation = "testSmalldatetimeOutofRange";
         BulkData bData = new BulkData(variation);