From d8e1aa77c80fc7a4ad05072e23a39645d1f9256d Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Mon, 29 Apr 2019 19:23:00 -0700
Subject: [PATCH 1/4] Tests | Code Coverage improvement for DataClassification
 class + Fix conditional tests (#1041)

---
 .../resultset/DataClassificationTest.java     |  52 ++++++---
 .../sqlserver/jdbc/unit/UTF8SupportTest.java  | 109 ++++++++----------
 2 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java
index 00897f566..19b1c97cc 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java
@@ -8,6 +8,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.List;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -17,6 +18,8 @@
 import com.microsoft.sqlserver.jdbc.RandomUtil;
 import com.microsoft.sqlserver.jdbc.SQLServerResultSet;
 import com.microsoft.sqlserver.jdbc.TestUtils;
+import com.microsoft.sqlserver.jdbc.dataclassification.InformationType;
+import com.microsoft.sqlserver.jdbc.dataclassification.Label;
 import com.microsoft.sqlserver.jdbc.dataclassification.SensitivityProperty;
 import com.microsoft.sqlserver.testframework.AbstractSQLGenerator;
 import com.microsoft.sqlserver.testframework.AbstractTest;
@@ -24,6 +27,7 @@
 
 
 @RunWith(JUnitPlatform.class)
+@Tag(Constants.xAzureSQLDB)
 @Tag(Constants.xAzureSQLDW)
 @Tag(Constants.xSQLv12)
 @Tag(Constants.xSQLv14)
@@ -37,13 +41,11 @@ public class DataClassificationTest extends AbstractTest {
      */
     @Test
     public void testDataClassificationMetadata() throws Exception {
-        // Run this test only with newer SQL Servers (version>=2018) that support Data Classification
         try (Statement stmt = connection.createStatement();) {
-            if (TestUtils.serverSupportsDataClassification(stmt)) {
-                createTable(connection, stmt);
-                runTestsForServer(stmt);
-                TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(tableName), stmt);
-            }
+            assert (TestUtils.serverSupportsDataClassification(stmt));
+            createTable(connection, stmt);
+            runTestsForServer(stmt);
+            TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(tableName), stmt);
         }
     }
 
@@ -119,7 +121,7 @@ private void runTestsForServer(Statement stmt) throws Exception {
     }
 
     /**
-     * Verifies resultset received to contain data classification information as set.
+     * Verifies ResultSet received to contain data classification information as set.
      * 
      * @param rs
      * @throws SQLException
@@ -130,20 +132,36 @@ private void verifySensitivityClassification(SQLServerResultSet rs) throws SQLEx
                     columnPos++) {
                 for (SensitivityProperty sp : rs.getSensitivityClassification().getColumnSensitivities().get(columnPos)
                         .getSensitivityProperties()) {
+
+                    List<InformationType> infoTypes = rs.getSensitivityClassification().getInformationTypes();
+                    assert (infoTypes.size() == 3);
+                    for (int i = 0; i < infoTypes.size(); i++) {
+                        verifyInfoType(infoTypes.get(i), i + 1);
+                    }
+
+                    List<Label> labels = rs.getSensitivityClassification().getLabels();
+                    assert (labels.size() == 1);
+                    verifyLabel(labels.get(0));
+
                     if (columnPos == 1 || columnPos == 2 || columnPos == 6 || columnPos == 7) {
-                        assert (sp.getLabel() != null);
-                        assert (sp.getLabel().getId().equalsIgnoreCase("L1"));
-                        assert (sp.getLabel().getName().equalsIgnoreCase("PII"));
-
-                        assert (sp.getInformationType() != null);
-                        assert (sp.getInformationType().getId()
-                                .equalsIgnoreCase(columnPos == 1 ? "COMPANY" : (columnPos == 2 ? "NAME" : "CONTACT")));
-                        assert (sp.getInformationType().getName().equalsIgnoreCase(
-                                columnPos == 1 ? "Company name"
-                                               : (columnPos == 2 ? "Person Name" : "Contact Information")));
+                        verifyLabel(sp.getLabel());
+                        verifyInfoType(sp.getInformationType(), columnPos);
                     }
                 }
             }
         }
     }
+
+    private void verifyInfoType(InformationType informationType, int i) {
+        assert (informationType != null);
+        assert (informationType.getId().equalsIgnoreCase(i == 1 ? "COMPANY" : (i == 2 ? "NAME" : "CONTACT")));
+        assert (informationType.getName()
+                .equalsIgnoreCase(i == 1 ? "Company name" : (i == 2 ? "Person Name" : "Contact Information")));
+    }
+
+    private void verifyLabel(Label label) {
+        assert (label != null);
+        assert (label.getId().equalsIgnoreCase("L1"));
+        assert (label.getName().equalsIgnoreCase("PII"));
+    }
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/UTF8SupportTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/UTF8SupportTest.java
index 9aa21dad7..d09c12616 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/UTF8SupportTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/UTF8SupportTest.java
@@ -48,29 +48,27 @@ public class UTF8SupportTest extends AbstractTest {
      */
     @Test
     public void testChar() throws SQLException {
-        if (TestUtils.serverSupportsUTF8(connection)) {
-            createTable("char(10)");
-            validate("teststring");
-            // This is 10 UTF-8 bytes. D1 82 D0 B5 D1 81 D1 82 31 32
-            validate("тест12");
-            // E2 95 A1 E2 95 A4 E2 88 9E 2D
-            validate("╡╤∞-");
-
-            createTable("char(4000)");
-            validate(String.join("", Collections.nCopies(400, "teststring")));
-            validate(String.join("", Collections.nCopies(400, "тест12")));
-            validate(String.join("", Collections.nCopies(400, "╡╤∞-")));
-
-            createTable("char(4001)");
-            validate(String.join("", Collections.nCopies(400, "teststring")) + "1");
-            validate(String.join("", Collections.nCopies(400, "тест12")) + "1");
-            validate(String.join("", Collections.nCopies(400, "╡╤∞-")) + "1");
-
-            createTable("char(8000)");
-            validate(String.join("", Collections.nCopies(800, "teststring")));
-            validate(String.join("", Collections.nCopies(800, "тест12")));
-            validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
-        }
+        createTable("char(10)");
+        validate("teststring");
+        // This is 10 UTF-8 bytes. D1 82 D0 B5 D1 81 D1 82 31 32
+        validate("тест12");
+        // E2 95 A1 E2 95 A4 E2 88 9E 2D
+        validate("╡╤∞-");
+
+        createTable("char(4000)");
+        validate(String.join("", Collections.nCopies(400, "teststring")));
+        validate(String.join("", Collections.nCopies(400, "тест12")));
+        validate(String.join("", Collections.nCopies(400, "╡╤∞-")));
+
+        createTable("char(4001)");
+        validate(String.join("", Collections.nCopies(400, "teststring")) + "1");
+        validate(String.join("", Collections.nCopies(400, "тест12")) + "1");
+        validate(String.join("", Collections.nCopies(400, "╡╤∞-")) + "1");
+
+        createTable("char(8000)");
+        validate(String.join("", Collections.nCopies(800, "teststring")));
+        validate(String.join("", Collections.nCopies(800, "тест12")));
+        validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
     }
 
     /**
@@ -80,50 +78,45 @@ public void testChar() throws SQLException {
      */
     @Test
     public void testVarchar() throws SQLException {
-        if (TestUtils.serverSupportsUTF8(connection)) {
-            createTable("varchar(10)");
-            validate("teststring");
-            validate("тест12");
-            validate("╡╤∞-");
-
-            createTable("varchar(4000)");
-            validate(String.join("", Collections.nCopies(400, "teststring")));
-            validate(String.join("", Collections.nCopies(400, "тест12")));
-            validate(String.join("", Collections.nCopies(400, "╡╤∞-")));
-
-            createTable("varchar(4001)");
-            validate(String.join("", Collections.nCopies(400, "teststring")) + "1");
-            validate(String.join("", Collections.nCopies(400, "тест12")) + "1");
-            validate(String.join("", Collections.nCopies(400, "╡╤∞-")) + "1");
-
-            createTable("varchar(8000)");
-            validate(String.join("", Collections.nCopies(800, "teststring")));
-            validate(String.join("", Collections.nCopies(800, "тест12")));
-            validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
-
-            createTable("varchar(MAX)");
-            validate(String.join("", Collections.nCopies(800, "teststring")));
-            validate(String.join("", Collections.nCopies(800, "тест12")));
-            validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
-        }
+        createTable("varchar(10)");
+        validate("teststring");
+        validate("тест12");
+        validate("╡╤∞-");
+
+        createTable("varchar(4000)");
+        validate(String.join("", Collections.nCopies(400, "teststring")));
+        validate(String.join("", Collections.nCopies(400, "тест12")));
+        validate(String.join("", Collections.nCopies(400, "╡╤∞-")));
+
+        createTable("varchar(4001)");
+        validate(String.join("", Collections.nCopies(400, "teststring")) + "1");
+        validate(String.join("", Collections.nCopies(400, "тест12")) + "1");
+        validate(String.join("", Collections.nCopies(400, "╡╤∞-")) + "1");
+
+        createTable("varchar(8000)");
+        validate(String.join("", Collections.nCopies(800, "teststring")));
+        validate(String.join("", Collections.nCopies(800, "тест12")));
+        validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
+
+        createTable("varchar(MAX)");
+        validate(String.join("", Collections.nCopies(800, "teststring")));
+        validate(String.join("", Collections.nCopies(800, "тест12")));
+        validate(String.join("", Collections.nCopies(800, "╡╤∞-")));
     }
 
     @BeforeAll
     public static void setUp() throws ClassNotFoundException, SQLException {
-        if (TestUtils.serverSupportsUTF8(connection)) {
-            databaseName = RandomUtil.getIdentifier("UTF8Database");
-            tableName = RandomUtil.getIdentifier("UTF8Table");
-            createDatabaseWithUTF8Collation();
-            connection.setCatalog(databaseName);
-        }
+        assert (TestUtils.serverSupportsUTF8(connection));
+        databaseName = RandomUtil.getIdentifier("UTF8Database");
+        tableName = RandomUtil.getIdentifier("UTF8Table");
+        createDatabaseWithUTF8Collation();
+        connection.setCatalog(databaseName);
     }
 
     @AfterAll
     public static void cleanUp() throws SQLException {
         try (Statement stmt = connection.createStatement()) {
-            if (TestUtils.serverSupportsUTF8(connection)) {
-                TestUtils.dropDatabaseIfExists(databaseName, stmt);
-            }
+            TestUtils.dropDatabaseIfExists(databaseName, stmt);
         }
     }
 

From 2641aace9376ceb6764de00bf2da82a06d30db06 Mon Sep 17 00:00:00 2001
From: lilgreenbird <v-susanh@microsoft.com>
Date: Fri, 3 May 2019 10:16:38 -0700
Subject: [PATCH 2/4] Tests | Add logging stream handler for tests (#1027)

---
 .../com/microsoft/sqlserver/jdbc/Util.java    |  1 -
 .../sqlserver/testframework/AbstractTest.java | 42 +++++++++++++++----
 .../sqlserver/testframework/Constants.java    |  1 +
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
index 536498e44..4d70d41b5 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
@@ -25,7 +25,6 @@
  * Various driver utilities.
  *
  */
-
 final class Util {
     final static String SYSTEM_SPEC_VERSION = System.getProperty("java.specification.version");
     final static char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java b/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
index 0e60ce231..743a5deeb 100644
--- a/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
+++ b/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
@@ -5,6 +5,8 @@
 
 package com.microsoft.sqlserver.testframework;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -15,6 +17,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
+import java.util.logging.StreamHandler;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -61,6 +64,12 @@ public abstract class AbstractTest {
     private static boolean _isSqlAzure = false;
     private static boolean _isSqlAzureDW = false;
 
+    /**
+     * Bytearray containing streamed logging output. Content can be retrieved using toByteArray() or toString()
+     */
+    public static ByteArrayOutputStream logOutputStream = null;
+    private static PrintStream logPrintStream = null;
+
     /**
      * This will take care of all initialization before running the Test Suite.
      * 
@@ -210,8 +219,18 @@ public static void teardown() throws Exception {
             if (null != connection && !connection.isClosed()) {
                 connection.close();
             }
+
+            if (null != logOutputStream) {
+                logOutputStream.close();
+            }
+
+            if (null != logPrintStream) {
+                logPrintStream.close();
+            }
         } finally {
             connection = null;
+            logOutputStream = null;
+            logPrintStream = null;
         }
     }
 
@@ -241,35 +260,44 @@ public static String getConfiguredProperty(String key, String defaultValue) {
     public static void invokeLogging() {
         Handler handler = null;
 
-        String enableLogging = getConfiguredProperty(Constants.MSSQL_JDBC_LOGGING, Boolean.FALSE.toString());
+        // enable logging to stream by default for tests
+        String enableLogging = getConfiguredProperty(Constants.MSSQL_JDBC_LOGGING, Boolean.TRUE.toString());
 
         // If logging is not enable then return.
         if (!Boolean.TRUE.toString().equalsIgnoreCase(enableLogging)) {
             return;
         }
 
-        String loggingHandler = getConfiguredProperty(Constants.MSSQL_JDBC_LOGGING_HANDLER, "not_configured");
+        String loggingHandler = getConfiguredProperty(Constants.MSSQL_JDBC_LOGGING_HANDLER,
+                Constants.LOGGING_HANDLER_STREAM);
 
         try {
             if (Constants.LOGGING_HANDLER_CONSOLE.equalsIgnoreCase(loggingHandler)) {
                 handler = new ConsoleHandler();
+                handler.setFormatter(new SimpleFormatter());
             } else if (Constants.LOGGING_HANDLER_FILE.equalsIgnoreCase(loggingHandler)) {
                 handler = new FileHandler(Constants.DEFAULT_DRIVER_LOG);
+                handler.setFormatter(new SimpleFormatter());
                 System.out.println("Look for Driver.log file in your classpath for detail logs");
+            } else if (Constants.LOGGING_HANDLER_STREAM.equalsIgnoreCase(loggingHandler)) {
+                logOutputStream = new ByteArrayOutputStream();
+                logPrintStream = new PrintStream(logOutputStream);
+                handler = new StreamHandler(logPrintStream, new SimpleFormatter());
             }
 
             if (handler != null) {
-                handler.setFormatter(new SimpleFormatter());
                 handler.setLevel(Level.FINEST);
                 Logger.getLogger(Constants.MSSQL_JDBC_LOGGING_HANDLER).addHandler(handler);
             }
-            // By default, Loggers also send their output to their parent logger.
-            // Typically the root Logger is configured with a set of Handlers that essentially act as default handlers
-            // for all loggers.
+
+            /*
+             * By default, Loggers also send their output to their parent logger. Typically the root Logger is
+             * configured with a set of Handlers that essentially act as default handlers for all loggers.
+             */
             Logger logger = Logger.getLogger(Constants.MSSQL_JDBC_PACKAGE);
             logger.setLevel(Level.FINEST);
         } catch (Exception e) {
-            System.err.println("Some how could not invoke logging: " + e.getMessage());
+            System.err.println("Could not invoke logging: " + e.getMessage());
         }
     }
 
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
index 294a925e4..9c44133bd 100644
--- a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
+++ b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
@@ -63,6 +63,7 @@ public class Constants {
 
     public static final String LOGGING_HANDLER_FILE = "file";
     public static final String LOGGING_HANDLER_CONSOLE = "console";
+    public static final String LOGGING_HANDLER_STREAM = "stream";
 
     public final static int ENGINE_EDITION_FOR_SQL_AZURE = 5;
     public final static int ENGINE_EDITION_FOR_SQL_AZURE_DW = 6;

From 5e12d684124396881dae65001fc486443de5b0b0 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Wed, 8 May 2019 09:59:19 -0700
Subject: [PATCH 3/4] Feature | Introduce Java 12 Support to driver and build
 additional "jre12" JAR (#1050)

---
 azure-pipelines.yml                           |  31 +++--
 build.gradle                                  |  44 ++++--
 pom.xml                                       | 127 +++++++++---------
 .../microsoft/sqlserver/jdbc/JDBC43Test.java  |   7 +-
 .../DatabaseMetaDataTest.java                 |   1 +
 .../sqlserver/testframework/Constants.java    |   8 +-
 6 files changed, 128 insertions(+), 90 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5f1ac8fff..8cdb7c463 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,24 +30,29 @@ jobs:
       Remove-Item –path .\JavaKeyStoreBase.txt
     displayName: 'PowerShell Script'
   - task: Maven@3
-    displayName: 'Maven build 43'
+    displayName: 'Maven build jre12'
     inputs:
       mavenPomFile: 'pom.xml'
-      goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pbuild43 -DexcludeGroups=$(Ex_Groups)'
+      goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre12 -DexcludedGroups=$(Ex_Groups)'
       testResultsFiles: '**/TEST-*.xml'
-      testRunTitle: 'Maven build 43'
+      testRunTitle: 'Maven build jre12'
       javaHomeOption: Path
-      jdkDirectory: $(JDK11)
-      mavenAuthenticateFeed: true
-      checkStyleRunAnalysis: true
-      pmdRunAnalysis: true
+      jdkDirectory: $(JDK12)
   - task: Maven@3
-    displayName: 'Maven build 42'
+    displayName: 'Maven build jre11'
     inputs:
       mavenPomFile: 'pom.xml'
-      goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pbuild42 -DexcludeGroups=$(Ex_Groups)'
-      testRunTitle: 'Maven build 42'
+      goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre11 -DexcludedGroups=$(Ex_Groups)'
+      testResultsFiles: '**/TEST-*.xml'
+      testRunTitle: 'Maven build jre11'
+      javaHomeOption: Path
+      jdkDirectory: $(JDK12)
+  - task: Maven@3
+    displayName: 'Maven build jre8'
+    inputs:
+      mavenPomFile: 'pom.xml'
+      goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre8 -DexcludedGroups=$(Ex_Groups)'
+      testResultsFiles: '**/TEST-*.xml'
+      testRunTitle: 'Maven build jre8'
       javaHomeOption: Path
-      jdkDirectory: $(JDK11)
-      checkStyleRunAnalysis: true
-      pmdRunAnalysis: true
+      jdkDirectory: $(JDK12)
diff --git a/build.gradle b/build.gradle
index f499c89ba..6d1366acf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,14 @@
  * Gradle Scipt for Building Microsoft JDBC Driver for SQL Server
  ****************************************************************
  * Instruction for Building JDBC Driver:
- * For building jre9 version of the driver,
- * use command 'gradle build' or 'gradle build -PbuildProfile=build43'
- * Whereas, for building jre8 version of the driver,
- * use command 'gradle build -PbuildProfile=build42'
+ * For building particular version of the driver, use commands:
+ * jre12 - - PS> gradle build
+			 PS> gradle build -PbuildProfile=jre12
+ * jre11 - - PS> gradle build -PbuildProfile=jre11
+ * jre8  - - PS> gradle build -PbuildProfile=jre8
+ *
+ * For Excluding Groups in command line:
+ * PS> gradle build -PbuildProfile=jre11 "-PexcludedGroups=['xSQLv15','xGradle']"
  ****************************************************************/
 
 apply plugin: 'java'
@@ -25,7 +29,26 @@ allprojects {
     }
 }
 
-if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){
+test {
+    useJUnitPlatform {
+        excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle')
+    }
+}
+
+if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre12")){
+	
+	jreVersion = "jre12"
+	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
+	jar {
+		manifest {
+			attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
+		}
+	}
+	sourceCompatibility = 12
+	targetCompatibility = 12
+}
+
+if (hasProperty('buildProfile') && buildProfile == "jre11"){
 	
 	jreVersion = "jre11"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
@@ -38,13 +61,18 @@ if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile
 	targetCompatibility = 11
 }
 
-if((hasProperty('buildProfile') && buildProfile == "build42")) {
+if(hasProperty('buildProfile') && buildProfile == "jre8") {
 	
 	jreVersion = "jre8"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java'
 	
 	sourceCompatibility = 1.8
 	targetCompatibility = 1.8
+	test {
+		useJUnitPlatform {
+			excludeTags (hasProperty('excludedGroups') ? excludedGroups : 'xSQLv15','xGradle','xJDBC42')
+		}
+	}
 }
 
 jar.archiveName = "${archivesBaseName}-${version}.${jreVersion}-preview.jar"
@@ -55,7 +83,6 @@ jar {
         'Vendor': 'Microsoft Corporation'
 	}
 }
-
 sourceSets {
     main {
         java {
@@ -69,8 +96,7 @@ sourceSets {
     }
 	test {
 		resources {
-			srcDirs 'src/test/resources'
-			include '**/*.csv'
+			srcDirs "src/test/resources", "AE_Certificates"
 			output.resourcesDir = testOutputDir
 		}
 	}
diff --git a/pom.xml b/pom.xml
index 2fa24e203..6abf1d146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,15 +41,17 @@
 
 	<properties>
 		<!-- Allowed values for excluded Groups here - - - - - - - - - - - - - 
+			xJDBC42 - - - - - - For tests not compatible with JDBC 42 Specifications 
+			xGradle - - - - - - For tests not compatible with Gradle Script - - - - - 
 			xSQLv12 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2014 
-			xSQLv14 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2017 
-			xSQLv15 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2019 
+			xSQLv14 - - - - - - For tests not compatible with SQL Server 2016 - 2017 
+			xSQLv15 - - - - - - For tests not compatible with SQL Server 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>xSQLv15</excludeGroups>
+		<excludedGroups>xSQLv15</excludedGroups>
 
 		<!-- Driver Dependencies -->
 		<azure.keyvault.version>1.2.1</azure.keyvault.version>
@@ -181,7 +183,7 @@
 
 	<profiles>
 		<profile>
-			<id>build42</id>
+			<id>jre8</id>
 			<build>
 				<finalName>${project.artifactId}-${project.version}.jre8-preview</finalName>
 				<plugins>
@@ -214,49 +216,20 @@
 							</archive>
 						</configuration>
 					</plugin>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.3</version>
-						<executions>
-							<execution>
-								<id>pre-test</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>report</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<version>3.0.0-M1</version>
 						<configuration>
-							<argLine>
-								${argLine} --illegal-access=permit
-							</argLine>
-							<properties>
-								<excludeTags>${skipTestTag}</excludeTags>
-							</properties>
 							<!-- Exclude [xJDBC42] For tests not compatible with JDBC 4.2 Specifications -->
-							<excludedGroups>${excludeGroups}, xJDBC42</excludedGroups>
+							<excludedGroups>${excludedGroups}, xJDBC42</excludedGroups>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 		<profile>
-			<id>build43</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
+			<id>jre11</id>
 			<build>
 				<finalName>${project.artifactId}-${project.version}.jre11-preview</finalName>
 				<plugins>
@@ -285,39 +258,40 @@
 							</archive>
 						</configuration>
 					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>jre12</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<finalName>${project.artifactId}-${project.version}.jre12-preview</finalName>
+				<plugins>
 					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.3</version>
-						<executions>
-							<execution>
-								<id>pre-test</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>report</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-							</execution>
-						</executions>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>3.8.0</version>
+						<configuration>
+							<excludes>
+								<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
+							</excludes>
+							<source>12</source>
+							<target>12</target>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.1.1</version>
 						<configuration>
-							<argLine>
-								${argLine} --illegal-access=permit
-							</argLine>
-							<properties>
-								<excludeTags>${skipTestTag}</excludeTags>
-							</properties>
-							<excludedGroups>
-								${excludeGroups}</excludedGroups>
+							<archive>
+								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+								<manifestEntries>
+									<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
+								</manifestEntries>
+							</archive>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -381,6 +355,18 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M1</version>
+				<configuration>
+					<argLine>
+						${argLine} --illegal-access=permit
+					</argLine>
+					<excludedGroups>
+						${excludedGroups}</excludedGroups>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -453,6 +439,21 @@
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.8.3</version>
+				<executions>
+					<execution>
+						<id>pre-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
 				<configuration>
 					<fileSets>
 						<fileSet>
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/JDBC43Test.java b/src/test/java/com/microsoft/sqlserver/jdbc/JDBC43Test.java
index ac6ccb4c5..b5a535fff 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/JDBC43Test.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/JDBC43Test.java
@@ -16,7 +16,8 @@
 import org.junit.runner.RunWith;
 import org.opentest4j.TestAbortedException;
 
-import com.microsoft.sqlserver.testframework.AbstractTest;;
+import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.Constants;
 
 
 /**
@@ -127,7 +128,7 @@ public void connectionPoolDataSourceTest() throws TestAbortedException, SQLExcep
      * @since 1.9
      */
     @Test
-    @Tag("xJDBC42")
+    @Tag(Constants.xJDBC42)
     public void setShardingKeyIfValidTest() throws TestAbortedException, SQLException {
         try (SQLServerConnection connection43 = (SQLServerConnection43) getConnection()) {
             try {
@@ -151,7 +152,7 @@ public void setShardingKeyIfValidTest() throws TestAbortedException, SQLExceptio
      * @since 1.9
      */
     @Test
-    @Tag("xJDBC42")
+    @Tag(Constants.xJDBC42)
     public void setShardingKeyTest() throws TestAbortedException, SQLException {
         try (SQLServerConnection connection43 = (SQLServerConnection43) getConnection()) {
             try {
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
index dea51c33b..eca0cc2de 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
@@ -75,6 +75,7 @@ public void testDatabaseMetaDataWrapper() throws SQLException {
      *         IOExcption
      */
     @Test
+    @Tag(Constants.xGradle)
     public void testDriverVersion() throws SQLException, IOException {
         String manifestFile = TestUtils.getCurrentClassPath() + "META-INF/MANIFEST.MF";
         manifestFile = manifestFile.replace("test-classes", "classes");
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
index 9c44133bd..6b4d7af84 100644
--- a/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
+++ b/src/test/java/com/microsoft/sqlserver/testframework/Constants.java
@@ -14,14 +14,18 @@ public class Constants {
      * Use below tags for tests to exclude them from test group:
      * 
      * <pre>
+     * xJDBC42 - - - - - - For tests not compatible with JDBC 42 Specifications
+     * xGradle - - - - - - For tests not compatible with Gradle Script (e.g. Manifest File)
      * xSQLv12 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2014
-     * xSQLv14 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2017
-     * xSQLv15 - - - - - - For tests not compatible with SQL Server 2008 R2 - 2019
+     * xSQLv14 - - - - - - For tests not compatible with SQL Server 2016 - 2017
+     * xSQLv15 - - - - - - For tests not compatible with SQL Server 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
      * </pre>
      */
+    public static final String xJDBC42 = "xJDBC42";
+    public static final String xGradle = "xGradle";
     public static final String xSQLv12 = "xSQLv12";
     public static final String xSQLv14 = "xSQLv14";
     public static final String xSQLv15 = "xSQLv15";

From 2c965e2c13be2e39570ae6029f35ff720409f41d Mon Sep 17 00:00:00 2001
From: lilgreenbird <v-susanh@microsoft.com>
Date: Fri, 10 May 2019 17:56:08 -0700
Subject: [PATCH 4/4] Tests | Add tests for SQLServerConnection to improve code
 coverage (#1047)

moved and renamed from connection/ConnectDriverTest to add more tests calling package private methods
---
 .../microsoft/sqlserver/jdbc/IOBuffer.java    |    2 +-
 .../sqlserver/jdbc/SQLServerConnection.java   |    7 +-
 .../sqlserver/jdbc/SQLServerStatement.java    |    4 +-
 ...Test.java => SQLServerConnectionTest.java} | 1128 +++++++++--------
 .../microsoft/sqlserver/jdbc/TimeoutTest.java |   14 +
 .../jdbc/unit/statement/StatementTest.java    |  148 ++-
 6 files changed, 734 insertions(+), 569 deletions(-)
 rename src/test/java/com/microsoft/sqlserver/jdbc/{connection/ConnectionDriverTest.java => SQLServerConnectionTest.java} (81%)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
index c04782ace..fa5d552a3 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
@@ -3025,7 +3025,7 @@ void setDataLoggable(boolean value) {
         dataIsLoggable = value;
     }
 
-    SharedTimer getSharedTimer() {
+    SharedTimer getSharedTimer() throws SQLServerException {
         return con.getSharedTimer();
     }
 
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
index 5b4977350..844825e27 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -154,10 +154,13 @@ public class SQLServerConnection implements ISQLServerConnection, java.io.Serial
      * Return an existing cached SharedTimer associated with this Connection or create a new one.
      *
      * The SharedTimer will be released when the Connection is closed.
+     * 
+     * @throws SQLServerException
      */
-    SharedTimer getSharedTimer() {
+    SharedTimer getSharedTimer() throws SQLServerException {
         if (state == State.Closed) {
-            throw new IllegalStateException(SQLServerException.getErrString("R_connectionIsClosed"));
+            SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_connectionIsClosed"),
+                    null, false);
         }
         if (null == sharedTimer) {
             this.sharedTimer = SharedTimer.getTimer();
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
index e232b32e0..7abc5715f 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
@@ -1133,7 +1133,9 @@ public final void setLargeMaxRows(long max) throws SQLServerException {
         // SQL server only supports integer limits for setting max rows.
         // If <max> is bigger than integer limits then throw an exception, otherwise call setMaxRows(int)
         if (max > Integer.MAX_VALUE) {
-            throw new UnsupportedOperationException(SQLServerException.getErrString("R_invalidMaxRows"));
+            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidMaxRows"));
+            Object[] msgArgs = {max};
+            SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, true);
         }
         setMaxRows((int) max);
         loggerExternal.exiting(getClassNameLogging(), "setLargeMaxRows");
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
similarity index 81%
rename from src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java
rename to src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
index 08844bf06..3d1eff7b4 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
@@ -1,526 +1,602 @@
-/*
- * Microsoft JDBC Driver for SQL Server Copyright(c) Microsoft Corporation All rights reserved. This program is made
- * available under the terms of the MIT License. See the LICENSE file in the project root for more information.
- */
-package com.microsoft.sqlserver.jdbc.connection;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.Statement;
-import java.text.MessageFormat;
-import java.util.UUID;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.logging.Logger;
-
-import javax.sql.ConnectionEvent;
-import javax.sql.PooledConnection;
-
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
-import com.microsoft.sqlserver.jdbc.ISQLServerConnection;
-import com.microsoft.sqlserver.jdbc.RandomUtil;
-import com.microsoft.sqlserver.jdbc.SQLServerConnection;
-import com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource;
-import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
-import com.microsoft.sqlserver.jdbc.TestResource;
-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)
-public class ConnectionDriverTest extends AbstractTest {
-    // If no retry is done, the function should at least exit in 5 seconds
-    static int threshHoldForNoRetryInMilliseconds = 5000;
-    static int loginTimeOutInSeconds = 10;
-
-    String randomServer = RandomUtil.getIdentifier("Server");
-
-    /**
-     * test connection properties with SQLServerDataSource
-     */
-    @Test
-    public void testDataSource() {
-        SQLServerDataSource ds = new SQLServerDataSource();
-        ds.setUser("User");
-        ds.setPassword("sUser");
-        ds.setApplicationName("User");
-        ds.setURL("jdbc:sqlserver://" + randomServer + ";packetSize=512");
-
-        String trustStore = "Store";
-        String trustStorePassword = "pwd";
-
-        ds.setTrustStore(trustStore);
-        ds.setEncrypt(true);
-        ds.setTrustStorePassword(trustStorePassword);
-        ds.setTrustServerCertificate(true);
-        assertEquals(trustStore, ds.getTrustStore(), TestResource.getResource("R_valuesAreDifferent"));
-        assertEquals(true, ds.getEncrypt(), TestResource.getResource("R_valuesAreDifferent"));
-        assertEquals(true, ds.getTrustServerCertificate(), TestResource.getResource("R_valuesAreDifferent"));
-    }
-
-    @Test
-    public void testEncryptedConnection() throws SQLException {
-        SQLServerDataSource ds = new SQLServerDataSource();
-        ds.setApplicationName("User");
-        ds.setURL(connectionString);
-        ds.setEncrypt(true);
-        ds.setTrustServerCertificate(true);
-        ds.setPacketSize(8192);
-        try (Connection con = ds.getConnection()) {}
-    }
-
-    @Test
-    public void testJdbcDataSourceMethod() throws SQLFeatureNotSupportedException {
-        SQLServerDataSource fxds = new SQLServerDataSource();
-        Logger logger = fxds.getParentLogger();
-        assertEquals(logger.getName(), Constants.MSSQL_JDBC_PACKAGE,
-                TestResource.getResource("R_parrentLoggerNameWrong"));
-    }
-
-    class MyEventListener implements javax.sql.ConnectionEventListener {
-        boolean connClosed = false;
-        boolean errorOccurred = false;
-
-        public MyEventListener() {}
-
-        public void connectionClosed(ConnectionEvent event) {
-            connClosed = true;
-        }
-
-        public void connectionErrorOccurred(ConnectionEvent event) {
-            errorOccurred = true;
-        }
-    }
-
-    /**
-     * Attach the Event listener and listen for connection events, fatal errors should not close the pooled connection
-     * objects
-     * 
-     * @throws SQLException
-     */
-    @Test
-    @Tag(Constants.xAzureSQLDW)
-    @Tag(Constants.xAzureSQLDB)
-    public void testConnectionEvents() throws SQLException {
-        SQLServerConnectionPoolDataSource mds = new SQLServerConnectionPoolDataSource();
-        mds.setURL(connectionString);
-        PooledConnection pooledConnection = mds.getPooledConnection();
-
-        // Attach the Event listener and listen for connection events.
-        MyEventListener myE = new MyEventListener();
-        pooledConnection.addConnectionEventListener(myE); // ConnectionListener implements ConnectionEventListener
-
-        try (Connection con = pooledConnection.getConnection();
-                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
-
-            boolean exceptionThrown = false;
-            try {
-                // raise a severe exception and make sure that the connection is not
-                // closed.
-                stmt.executeUpdate("RAISERROR ('foo', 20,1) WITH LOG");
-            } catch (Exception e) {
-                exceptionThrown = true;
-            }
-            assertTrue(exceptionThrown, TestResource.getResource("R_expectedExceptionNotThrown"));
-
-            // Check to see if error occurred.
-            assertTrue(myE.errorOccurred, TestResource.getResource("R_errorNotCalled"));
-        } finally {
-            // make sure that connection is closed.
-            if (null != pooledConnection)
-                pooledConnection.close();
-        }
-    }
-
-    @Test
-    @Tag(Constants.xAzureSQLDW)
-    @Tag(Constants.xAzureSQLDB)
-    public void testConnectionPoolGetTwice() throws SQLException {
-        SQLServerConnectionPoolDataSource mds = new SQLServerConnectionPoolDataSource();
-        mds.setURL(connectionString);
-        PooledConnection pooledConnection = mds.getPooledConnection();
-
-        // Attach the Event listener and listen for connection events.
-        MyEventListener myE = new MyEventListener();
-        pooledConnection.addConnectionEventListener(myE); // ConnectionListener implements ConnectionEventListener
-
-        try (Connection con = pooledConnection.getConnection();
-                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
-            // raise a non severe exception and make sure that the connection is not closed.
-            stmt.executeUpdate("RAISERROR ('foo', 3,1)");
-            // not a serious error there should not be any errors.
-            assertTrue(!myE.errorOccurred, TestResource.getResource("R_errorCalled"));
-            // check to make sure that connection is not closed.
-            assertTrue(!con.isClosed(), TestResource.getResource("R_connectionIsClosed"));
-            stmt.close();
-            con.close();
-            // check to make sure that connection is closed.
-            assertTrue(con.isClosed(), TestResource.getResource("R_connectionIsNotClosed"));
-        } finally {
-            // make sure that connection is closed.
-            if (null != pooledConnection)
-                pooledConnection.close();
-        }
-    }
-
-    @Test
-    @Tag(Constants.xAzureSQLDW)
-    @Tag(Constants.xAzureSQLDB)
-    public void testConnectionClosed() throws SQLException {
-        SQLServerDataSource mds = new SQLServerDataSource();
-        mds.setURL(connectionString);
-        try (Connection con = mds.getConnection();
-                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
-            boolean exceptionThrown = false;
-            try {
-                stmt.executeUpdate("RAISERROR ('foo', 20,1) WITH LOG");
-            } catch (Exception e) {
-                exceptionThrown = true;
-            }
-            assertTrue(exceptionThrown, TestResource.getResource("R_expectedExceptionNotThrown"));
-
-            // check to make sure that connection is closed.
-            assertTrue(con.isClosed(), TestResource.getResource("R_connectionIsNotClosed"));
-        } catch (Exception e) {
-            fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
-        }
-    }
-
-    @Test
-    public void testIsWrapperFor() throws SQLException, ClassNotFoundException {
-        try (Connection conn = getConnection(); SQLServerConnection ssconn = (SQLServerConnection) conn) {
-            boolean isWrapper;
-            isWrapper = ssconn.isWrapperFor(ssconn.getClass());
-            MessageFormat form = new MessageFormat(TestResource.getResource("R_supportUnwrapping"));
-            Object[] msgArgs1 = {"SQLServerConnection"};
-
-            assertTrue(isWrapper, form.format(msgArgs1));
-            assertEquals(ISQLServerConnection.TRANSACTION_SNAPSHOT, ISQLServerConnection.TRANSACTION_SNAPSHOT,
-                    TestResource.getResource("R_cantAccessSnapshot"));
-
-            isWrapper = ssconn.isWrapperFor(Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".ISQLServerConnection"));
-            Object[] msgArgs2 = {"ISQLServerConnection"};
-            assertTrue(isWrapper, form.format(msgArgs2));
-
-            ssconn.unwrap(Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".ISQLServerConnection"));
-            assertEquals(ISQLServerConnection.TRANSACTION_SNAPSHOT, ISQLServerConnection.TRANSACTION_SNAPSHOT,
-                    TestResource.getResource("R_cantAccessSnapshot"));
-
-            ssconn.unwrap(Class.forName("java.sql.Connection"));
-        }
-    }
-
-    @Test
-    public void testNewConnection() throws SQLException {
-        try (Connection conn = getConnection()) {
-            assertTrue(conn.isValid(0), TestResource.getResource("R_newConnectionShouldBeValid"));
-        }
-    }
-
-    @Test
-    public void testClosedConnection() throws SQLException {
-        try (Connection conn = getConnection()) {
-            conn.close();
-            assertTrue(!conn.isValid(0), TestResource.getResource("R_closedConnectionShouldBeInvalid"));
-        }
-    }
-
-    @Test
-    public void testNegativeTimeout() throws Exception {
-        try (Connection conn = getConnection()) {
-            try {
-                conn.isValid(-42);
-                fail(TestResource.getResource("R_noExceptionNegativeTimeout"));
-            } catch (SQLException e) {
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_invalidQueryTimeout"));
-                Object[] msgArgs = {"-42"};
-
-                assertEquals(e.getMessage(), form.format(msgArgs), TestResource.getResource("R_wrongExceptionMessage"));
-            }
-        }
-    }
-
-    @Test
-    @Tag(Constants.xAzureSQLDW)
-    @Tag(Constants.xAzureSQLDB)
-    public void testDeadConnection() throws SQLException {
-        String tableName = RandomUtil.getIdentifier("ConnectionTestTable");
-        try (Connection conn = PrepUtil.getConnection(connectionString + ";responseBuffering=adaptive");
-                Statement stmt = conn.createStatement()) {
-
-            conn.setAutoCommit(false);
-            stmt.executeUpdate(
-                    "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableName) + " (col1 int primary key)");
-            for (int i = 0; i < 80; i++) {
-                stmt.executeUpdate("INSERT INTO " + AbstractSQLGenerator.escapeIdentifier(tableName) + "(col1) values ("
-                        + i + ")");
-            }
-            conn.commit();
-            try {
-                stmt.execute("SELECT x1.col1 as foo, x2.col1 as bar, x1.col1 as eeep FROM "
-                        + AbstractSQLGenerator.escapeIdentifier(tableName) + " as x1, "
-                        + AbstractSQLGenerator.escapeIdentifier(tableName)
-                        + " as x2; RAISERROR ('Oops', 21, 42) WITH LOG");
-            } catch (SQLException e) {
-                assertEquals(e.getMessage(), TestResource.getResource("R_connectionReset"),
-                        TestResource.getResource("R_unknownException"));
-            }
-            assertEquals(conn.isValid(5), false, TestResource.getResource("R_deadConnection"));
-        } catch (Exception e) {
-            fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
-        } finally {
-            if (null != tableName) {
-                try (Connection conn = PrepUtil.getConnection(connectionString + ";responseBuffering=adaptive");
-                        Statement stmt = conn.createStatement()) {
-                    stmt.execute("drop table " + AbstractSQLGenerator.escapeIdentifier(tableName));
-                }
-            }
-        }
-    }
-
-    @Test
-    public void testClientConnectionId() throws Exception {
-        try (ISQLServerConnection conn = (ISQLServerConnection) getConnection()) {
-            assertTrue(conn.getClientConnectionId() != null, TestResource.getResource("R_clientConnectionIdNull"));
-            conn.close();
-            try {
-                // Call getClientConnectionId on a closed connection, should raise exception
-                conn.getClientConnectionId();
-                fail(TestResource.getResource("R_noExceptionClosedConnection"));
-            } catch (SQLException e) {
-                assertEquals(e.getMessage(), TestResource.getResource("R_connectionIsClosed"),
-                        TestResource.getResource("R_wrongExceptionMessage"));
-            }
-        }
-
-        // Wrong database, ClientConnectionId should be available in error message
-        try (Connection conn = PrepUtil.getConnection(connectionString + ";databaseName="
-                + RandomUtil.getIdentifierForDB("DataBase") + Constants.SEMI_COLON)) {
-            conn.close();
-
-        } catch (SQLException e) {
-            assertTrue(e.getMessage().indexOf("ClientConnectionId") != -1,
-                    TestResource.getResource("R_unexpectedWrongDB"));
-        }
-
-        // Nonexist host, ClientConnectionId should not be available in error message
-        try (Connection conn = PrepUtil.getConnection(
-                connectionString + ";instanceName=" + RandomUtil.getIdentifier("Instance") + ";logintimeout=5;")) {
-            conn.close();
-
-        } catch (SQLException e) {
-            assertEquals(false, e.getMessage().indexOf("ClientConnectionId") != -1,
-                    TestResource.getResource("R_unexpectedWrongHost"));
-        }
-    }
-
-    @Test
-    public void testIncorrectDatabase() throws SQLException {
-        long timerStart = 0;
-        long timerEnd = 0;
-        final long milsecs = threshHoldForNoRetryInMilliseconds;
-        try {
-            SQLServerDataSource ds = new SQLServerDataSource();
-            ds.setURL(connectionString);
-            ds.setLoginTimeout(loginTimeOutInSeconds);
-            ds.setDatabaseName(RandomUtil.getIdentifier("DataBase"));
-            timerStart = System.currentTimeMillis();
-            try (Connection con = ds.getConnection()) {
-
-                long timeDiff = timerEnd - timerStart;
-                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
-
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
-                Object[] msgArgs = {milsecs / 1000};
-                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
-            }
-        } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase")));
-            timerEnd = System.currentTimeMillis();
-        }
-    }
-
-    @Test
-    public void testIncorrectUserName() throws SQLException {
-        long timerStart = 0;
-        long timerEnd = 0;
-        final long milsecs = threshHoldForNoRetryInMilliseconds;
-        try {
-            SQLServerDataSource ds = new SQLServerDataSource();
-            ds.setURL(connectionString);
-            ds.setLoginTimeout(loginTimeOutInSeconds);
-            ds.setUser(RandomUtil.getIdentifier("User"));
-            timerStart = System.currentTimeMillis();
-            try (Connection con = ds.getConnection()) {
-                long timeDiff = timerEnd - timerStart;
-                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
-                Object[] msgArgs = {milsecs / 1000};
-                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
-            }
-        } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
-            timerEnd = System.currentTimeMillis();
-        }
-    }
-
-    @Test
-    public void testIncorrectPassword() throws SQLException {
-        long timerStart = 0;
-        long timerEnd = 0;
-        final long milsecs = threshHoldForNoRetryInMilliseconds;
-        try {
-            SQLServerDataSource ds = new SQLServerDataSource();
-            ds.setURL(connectionString);
-            ds.setLoginTimeout(loginTimeOutInSeconds);
-            ds.setPassword(RandomUtil.getIdentifier("Password"));
-            timerStart = System.currentTimeMillis();
-            try (Connection con = ds.getConnection()) {
-                long timeDiff = timerEnd - timerStart;
-                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
-                Object[] msgArgs = {milsecs / 1000};
-                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
-            }
-        } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
-            timerEnd = System.currentTimeMillis();
-        }
-    }
-
-    @Test
-    public void testInvalidCombination() throws SQLException {
-        long timerStart = 0;
-        long timerEnd = 0;
-        final long milsecs = threshHoldForNoRetryInMilliseconds;
-        try {
-            SQLServerDataSource ds = new SQLServerDataSource();
-            ds.setURL(connectionString);
-            ds.setLoginTimeout(loginTimeOutInSeconds);
-            ds.setMultiSubnetFailover(true);
-            ds.setFailoverPartner(RandomUtil.getIdentifier("FailoverPartner"));
-            timerStart = System.currentTimeMillis();
-            try (Connection con = ds.getConnection()) {
-                long timeDiff = timerEnd - timerStart;
-                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
-                Object[] msgArgs = {milsecs / 1000};
-                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
-            }
-        } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_connectMirrored")));
-            timerEnd = System.currentTimeMillis();
-        }
-    }
-
-    @Test
-    @Tag("slow")
-    public void testIncorrectDatabaseWithFailoverPartner() throws SQLException {
-        long timerStart = 0;
-        long timerEnd = 0;
-        try {
-            SQLServerDataSource ds = new SQLServerDataSource();
-            ds.setURL(connectionString);
-            ds.setLoginTimeout(loginTimeOutInSeconds);
-            ds.setDatabaseName(RandomUtil.getIdentifierForDB("DB"));
-            ds.setFailoverPartner(RandomUtil.getIdentifier("FailoverPartner"));
-            timerStart = System.currentTimeMillis();
-            try (Connection con = ds.getConnection()) {
-                long timeDiff = timerEnd - timerStart;
-                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedLessSeconds"));
-                Object[] msgArgs = {loginTimeOutInSeconds - 1};
-                assertTrue(timeDiff >= ((loginTimeOutInSeconds - 1) * 1000), form.format(msgArgs));
-            }
-        } catch (Exception e) {
-            timerEnd = System.currentTimeMillis();
-        }
-    }
-
-    @Test
-    public void testAbortBadParam() throws SQLException {
-        try (Connection conn = getConnection()) {
-            try {
-                conn.abort(null);
-            } catch (SQLException e) {
-                assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidArgumentExecutor")));
-            }
-        }
-    }
-
-    @Test
-    public void testAbort() throws SQLException {
-        try (Connection conn = getConnection()) {
-            Executor executor = Executors.newFixedThreadPool(2);
-            conn.abort(executor);
-            assert (conn.isClosed());
-        }
-    }
-
-    @Test
-    public void testSetSchema() throws SQLException {
-        try (Connection conn = getConnection()) {
-            conn.setSchema(RandomUtil.getIdentifier("schema"));
-        }
-    }
-
-    @Test
-    public void testGetSchema() throws SQLException {
-        try (Connection conn = getConnection()) {
-            conn.getSchema();
-        }
-    }
-
-    static Boolean isInterrupted = false;
-
-    /**
-     * Test thread's interrupt status is not cleared.
-     * 
-     * @throws InterruptedException
-     */
-    @Test
-    @Tag("slow")
-    public void testThreadInterruptedStatus() throws InterruptedException {
-        Runnable runnable = new Runnable() {
-            public void run() {
-                SQLServerDataSource ds = new SQLServerDataSource();
-
-                ds.setURL(connectionString);
-                ds.setServerName("invalidServerName" + UUID.randomUUID());
-                ds.setLoginTimeout(5);
-
-                try (Connection con = ds.getConnection()) {} catch (SQLException e) {
-                    isInterrupted = Thread.currentThread().isInterrupted();
-                }
-            }
-        };
-
-        ExecutorService executor = Executors.newFixedThreadPool(1);
-        Future<?> future = executor.submit(runnable);
-
-        Thread.sleep(1000);
-
-        // interrupt the thread in the Runnable
-        future.cancel(true);
-
-        Thread.sleep(8000);
-
-        executor.shutdownNow();
-
-        assertTrue(isInterrupted, TestResource.getResource("R_threadInterruptNotSet"));
-    }
-}
+/*
+ * Microsoft JDBC Driver for SQL Server Copyright(c) Microsoft Corporation All rights reserved. This program is made
+ * available under the terms of the MIT License. See the LICENSE file in the project root for more information.
+ */
+package com.microsoft.sqlserver.jdbc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+import java.util.UUID;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.logging.Logger;
+
+import javax.sql.ConnectionEvent;
+import javax.sql.PooledConnection;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+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)
+public class SQLServerConnectionTest extends AbstractTest {
+    // If no retry is done, the function should at least exit in 5 seconds
+    static int threshHoldForNoRetryInMilliseconds = 5000;
+    static int loginTimeOutInSeconds = 10;
+
+    String randomServer = RandomUtil.getIdentifier("Server");
+
+    /**
+     * Test connection properties with SQLServerDataSource
+     */
+    @Test
+    public void testDataSource() {
+        SQLServerDataSource ds = new SQLServerDataSource();
+        ds.setUser("User");
+        ds.setPassword("sUser");
+        ds.setApplicationName("User");
+        ds.setURL("jdbc:sqlserver://" + randomServer + ";packetSize=512");
+
+        String trustStore = "Store";
+        String trustStorePassword = "pwd";
+
+        ds.setTrustStore(trustStore);
+        ds.setEncrypt(true);
+        ds.setTrustStorePassword(trustStorePassword);
+        ds.setTrustServerCertificate(true);
+        assertEquals(trustStore, ds.getTrustStore(), TestResource.getResource("R_valuesAreDifferent"));
+        assertEquals(true, ds.getEncrypt(), TestResource.getResource("R_valuesAreDifferent"));
+        assertEquals(true, ds.getTrustServerCertificate(), TestResource.getResource("R_valuesAreDifferent"));
+    }
+
+    @Test
+    public void testEncryptedConnection() throws SQLException {
+        SQLServerDataSource ds = new SQLServerDataSource();
+        ds.setApplicationName("User");
+        ds.setURL(connectionString);
+        ds.setEncrypt(true);
+        ds.setTrustServerCertificate(true);
+        ds.setPacketSize(8192);
+        try (Connection con = ds.getConnection()) {}
+    }
+
+    @Test
+    public void testJdbcDataSourceMethod() throws SQLFeatureNotSupportedException {
+        SQLServerDataSource fxds = new SQLServerDataSource();
+        Logger logger = fxds.getParentLogger();
+        assertEquals(logger.getName(), Constants.MSSQL_JDBC_PACKAGE,
+                TestResource.getResource("R_parrentLoggerNameWrong"));
+    }
+
+    class MyEventListener implements javax.sql.ConnectionEventListener {
+        boolean connClosed = false;
+        boolean errorOccurred = false;
+
+        public MyEventListener() {}
+
+        public void connectionClosed(ConnectionEvent event) {
+            connClosed = true;
+        }
+
+        public void connectionErrorOccurred(ConnectionEvent event) {
+            errorOccurred = true;
+        }
+    }
+
+    /**
+     * Attach the Event listener and listen for connection events, fatal errors should not close the pooled connection
+     * objects
+     * 
+     * @throws SQLException
+     */
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    @Tag(Constants.xAzureSQLDB)
+    public void testConnectionEvents() throws SQLException {
+        SQLServerConnectionPoolDataSource mds = new SQLServerConnectionPoolDataSource();
+        mds.setURL(connectionString);
+        PooledConnection pooledConnection = mds.getPooledConnection();
+
+        // Attach the Event listener and listen for connection events.
+        MyEventListener myE = new MyEventListener();
+        pooledConnection.addConnectionEventListener(myE); // ConnectionListener implements ConnectionEventListener
+
+        try (Connection con = pooledConnection.getConnection();
+                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
+            boolean exceptionThrown = false;
+            try {
+                // raise a severe exception and make sure that the connection is not
+                // closed.
+                stmt.executeUpdate("RAISERROR ('foo', 20,1) WITH LOG");
+            } catch (Exception e) {
+                exceptionThrown = true;
+            }
+            assertTrue(exceptionThrown, TestResource.getResource("R_expectedExceptionNotThrown"));
+
+            // Check to see if error occurred.
+            assertTrue(myE.errorOccurred, TestResource.getResource("R_errorNotCalled"));
+        } finally {
+            // make sure that connection is closed.
+            if (null != pooledConnection)
+                pooledConnection.close();
+        }
+    }
+
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    @Tag(Constants.xAzureSQLDB)
+    public void testConnectionPoolGetTwice() throws SQLException {
+        SQLServerConnectionPoolDataSource mds = new SQLServerConnectionPoolDataSource();
+        mds.setURL(connectionString);
+        PooledConnection pooledConnection = mds.getPooledConnection();
+
+        // Attach the Event listener and listen for connection events.
+        MyEventListener myE = new MyEventListener();
+        pooledConnection.addConnectionEventListener(myE); // ConnectionListener implements ConnectionEventListener
+
+        try (Connection con = pooledConnection.getConnection();
+                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
+            // raise a non severe exception and make sure that the connection is not closed.
+            stmt.executeUpdate("RAISERROR ('foo', 3,1)");
+            // not a serious error there should not be any errors.
+            assertTrue(!myE.errorOccurred, TestResource.getResource("R_errorCalled"));
+            // check to make sure that connection is not closed.
+            assertTrue(!con.isClosed(), TestResource.getResource("R_connectionIsClosed"));
+            stmt.close();
+            con.close();
+            // check to make sure that connection is closed.
+            assertTrue(con.isClosed(), TestResource.getResource("R_connectionIsNotClosed"));
+        } finally {
+            // make sure that connection is closed.
+            if (null != pooledConnection)
+                pooledConnection.close();
+        }
+    }
+
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    @Tag(Constants.xAzureSQLDB)
+    public void testConnectionClosed() throws SQLException {
+        SQLServerDataSource mds = new SQLServerDataSource();
+        mds.setURL(connectionString);
+        try (Connection con = mds.getConnection();
+                Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
+            boolean exceptionThrown = false;
+            try {
+                stmt.executeUpdate("RAISERROR ('foo', 20,1) WITH LOG");
+            } catch (Exception e) {
+                exceptionThrown = true;
+            }
+            assertTrue(exceptionThrown, TestResource.getResource("R_expectedExceptionNotThrown"));
+
+            // check to make sure that connection is closed.
+            assertTrue(con.isClosed(), TestResource.getResource("R_connectionIsNotClosed"));
+        } catch (Exception e) {
+            fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testIsWrapperFor() throws SQLException, ClassNotFoundException {
+        try (Connection conn = getConnection(); SQLServerConnection ssconn = (SQLServerConnection) conn) {
+            boolean isWrapper;
+            isWrapper = ssconn.isWrapperFor(ssconn.getClass());
+            MessageFormat form = new MessageFormat(TestResource.getResource("R_supportUnwrapping"));
+            Object[] msgArgs1 = {"SQLServerConnection"};
+
+            assertTrue(isWrapper, form.format(msgArgs1));
+            assertEquals(ISQLServerConnection.TRANSACTION_SNAPSHOT, ISQLServerConnection.TRANSACTION_SNAPSHOT,
+                    TestResource.getResource("R_cantAccessSnapshot"));
+
+            isWrapper = ssconn.isWrapperFor(Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".ISQLServerConnection"));
+            Object[] msgArgs2 = {"ISQLServerConnection"};
+            assertTrue(isWrapper, form.format(msgArgs2));
+
+            ssconn.unwrap(Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".ISQLServerConnection"));
+            assertEquals(ISQLServerConnection.TRANSACTION_SNAPSHOT, ISQLServerConnection.TRANSACTION_SNAPSHOT,
+                    TestResource.getResource("R_cantAccessSnapshot"));
+
+            ssconn.unwrap(Class.forName("java.sql.Connection"));
+        }
+    }
+
+    @Test
+    public void testNewConnection() throws SQLException {
+        try (Connection conn = getConnection()) {
+            assertTrue(conn.isValid(0), TestResource.getResource("R_newConnectionShouldBeValid"));
+        }
+    }
+
+    @Test
+    public void testClosedConnection() throws SQLException {
+        try (Connection conn = getConnection()) {
+            conn.close();
+            assertTrue(!conn.isValid(0), TestResource.getResource("R_closedConnectionShouldBeInvalid"));
+
+            // getting shared timer on closed connection should fail
+            ((SQLServerConnection) conn).getSharedTimer();
+            fail(TestResource.getResource("R_noExceptionClosedConnection"));
+        } catch (SQLServerException e) {
+            assertEquals(e.getMessage(), TestResource.getResource("R_connectionIsClosed"),
+                    TestResource.getResource("R_wrongExceptionMessage"));
+        }
+        try (Connection conn = getConnection()) {
+            conn.close();
+            ((SQLServerConnection) conn).checkClosed();
+            fail(TestResource.getResource("R_noExceptionClosedConnection"));
+        } catch (SQLServerException e) {
+            assertEquals(e.getMessage(), TestResource.getResource("R_connectionIsClosed"),
+                    TestResource.getResource("R_wrongExceptionMessage"));
+        }
+    }
+
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    public void testSetTransactionIsolation() throws SQLException {
+        try (Connection conn = getConnection()) {
+            conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+            assertTrue(conn.getTransactionIsolation() == Connection.TRANSACTION_READ_COMMITTED,
+                    TestResource.getResource("R_expectedValue") + "Connection.TRANSACTION_READ_COMMITTED");
+            conn.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
+            assertTrue(conn.getTransactionIsolation() == Connection.TRANSACTION_READ_UNCOMMITTED,
+                    TestResource.getResource("R_expectedValue") + "Connection.TRANSACTION_READ_UNCOMMITTED");
+            conn.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);
+            assertTrue(conn.getTransactionIsolation() == Connection.TRANSACTION_REPEATABLE_READ,
+                    TestResource.getResource("R_expectedValue") + "Connection.TRANSACTION_REPEATABLE_READ");
+            conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+            assertTrue(conn.getTransactionIsolation() == Connection.TRANSACTION_SERIALIZABLE,
+                    TestResource.getResource("R_expectedValue") + "Connection.TRANSACTION_SERIALIZABLE");
+            conn.setTransactionIsolation(SQLServerConnection.TRANSACTION_SNAPSHOT);
+            assertTrue(conn.getTransactionIsolation() == SQLServerConnection.TRANSACTION_SNAPSHOT,
+                    TestResource.getResource("R_expectedValue") + "SQLServerConnection.TRANSACTION_SNAPSHOT");
+        }
+    }
+
+    @Test
+    public void testNativeSQL() throws SQLException {
+        try (Connection conn = getConnection()) {
+            String nativeSql = conn.nativeSQL("SELECT @@version");
+            assertTrue(nativeSql instanceof String);
+        } catch (Exception e) {
+            fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testReadOnly() throws SQLException {
+        try (Connection conn = getConnection()) {
+            // not supported, will always return false
+            conn.setReadOnly(false);
+            assertTrue(!conn.isReadOnly(), TestResource.getResource("R_expectedValue") + Boolean.toString(false));
+            conn.setReadOnly(true);
+            assertTrue(!conn.isReadOnly(), TestResource.getResource("R_expectedValue") + Boolean.toString(false));
+        }
+    }
+
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    @Tag(Constants.xAzureSQLDB)
+    @Tag(Constants.xAzureSQLMI)
+    public void testCatalog() throws SQLException {
+        try (Connection conn = getConnection()) {
+            String catalog = "master";
+            conn.setCatalog(catalog);
+            assertTrue(conn.getCatalog().equals(catalog), TestResource.getResource("R_expectedValue") + catalog);
+        }
+    }
+
+    @Test
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void testTypeMap() throws SQLException {
+        try (Connection conn = getConnection()) {
+            java.util.HashMap map = new java.util.HashMap();
+            conn.setTypeMap(map);
+            assertTrue(conn.getTypeMap().isEmpty(),
+                    TestResource.getResource("R_expectedValue") + Boolean.toString(true));
+        }
+    }
+
+    @Test
+    public void testNegativeTimeout() throws Exception {
+        try (Connection conn = getConnection()) {
+            try {
+                conn.isValid(-42);
+                fail(TestResource.getResource("R_noExceptionNegativeTimeout"));
+            } catch (SQLException e) {
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_invalidQueryTimeout"));
+                Object[] msgArgs = {"-42"};
+
+                assertEquals(e.getMessage(), form.format(msgArgs), TestResource.getResource("R_wrongExceptionMessage"));
+            }
+        }
+    }
+
+    @Test
+    @Tag(Constants.xAzureSQLDW)
+    @Tag(Constants.xAzureSQLDB)
+    public void testDeadConnection() throws SQLException {
+        String tableName = RandomUtil.getIdentifier("ConnectionTestTable");
+        try (Connection conn = PrepUtil.getConnection(connectionString + ";responseBuffering=adaptive");
+                Statement stmt = conn.createStatement()) {
+
+            conn.setAutoCommit(false);
+            stmt.executeUpdate(
+                    "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableName) + " (col1 int primary key)");
+            for (int i = 0; i < 80; i++) {
+                stmt.executeUpdate("INSERT INTO " + AbstractSQLGenerator.escapeIdentifier(tableName) + "(col1) values ("
+                        + i + ")");
+            }
+            conn.commit();
+            try {
+                stmt.execute("SELECT x1.col1 as foo, x2.col1 as bar, x1.col1 as eeep FROM "
+                        + AbstractSQLGenerator.escapeIdentifier(tableName) + " as x1, "
+                        + AbstractSQLGenerator.escapeIdentifier(tableName)
+                        + " as x2; RAISERROR ('Oops', 21, 42) WITH LOG");
+            } catch (SQLException e) {
+                assertEquals(e.getMessage(), TestResource.getResource("R_connectionReset"),
+                        TestResource.getResource("R_unknownException"));
+            }
+            assertEquals(conn.isValid(5), false, TestResource.getResource("R_deadConnection"));
+        } catch (Exception e) {
+            fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
+        } finally {
+            if (null != tableName) {
+                try (Connection conn = PrepUtil.getConnection(connectionString + ";responseBuffering=adaptive");
+                        Statement stmt = conn.createStatement()) {
+                    stmt.execute("drop table " + AbstractSQLGenerator.escapeIdentifier(tableName));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testClientConnectionId() throws Exception {
+        try (ISQLServerConnection conn = (ISQLServerConnection) getConnection()) {
+            assertTrue(conn.getClientConnectionId() != null, TestResource.getResource("R_clientConnectionIdNull"));
+            conn.close();
+            try {
+                // Call getClientConnectionId on a closed connection, should raise exception
+                conn.getClientConnectionId();
+                fail(TestResource.getResource("R_noExceptionClosedConnection"));
+            } catch (SQLException e) {
+                assertEquals(e.getMessage(), TestResource.getResource("R_connectionIsClosed"),
+                        TestResource.getResource("R_wrongExceptionMessage"));
+            }
+        }
+
+        // Wrong database, ClientConnectionId should be available in error message
+        try (Connection conn = PrepUtil.getConnection(connectionString + ";databaseName="
+                + RandomUtil.getIdentifierForDB("DataBase") + Constants.SEMI_COLON)) {
+            conn.close();
+
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().indexOf("ClientConnectionId") != -1,
+                    TestResource.getResource("R_unexpectedWrongDB"));
+        }
+
+        // Non-existent host, ClientConnectionId should not be available in error message
+        try (Connection conn = PrepUtil.getConnection(
+                connectionString + ";instanceName=" + RandomUtil.getIdentifier("Instance") + ";logintimeout=5;")) {
+            conn.close();
+
+        } catch (SQLException e) {
+            assertEquals(false, e.getMessage().indexOf("ClientConnectionId") != -1,
+                    TestResource.getResource("R_unexpectedWrongHost"));
+        }
+    }
+
+    @Test
+    public void testIncorrectDatabase() throws SQLException {
+        long timerStart = 0;
+        long timerEnd = 0;
+        final long milsecs = threshHoldForNoRetryInMilliseconds;
+        try {
+            SQLServerDataSource ds = new SQLServerDataSource();
+            ds.setURL(connectionString);
+            ds.setLoginTimeout(loginTimeOutInSeconds);
+            ds.setDatabaseName(RandomUtil.getIdentifier("DataBase"));
+            timerStart = System.currentTimeMillis();
+            try (Connection con = ds.getConnection()) {
+
+                long timeDiff = timerEnd - timerStart;
+                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
+
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
+                Object[] msgArgs = {milsecs / 1000};
+                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
+            }
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase")));
+            timerEnd = System.currentTimeMillis();
+        }
+    }
+
+    @Test
+    public void testIncorrectUserName() throws SQLException {
+        long timerStart = 0;
+        long timerEnd = 0;
+        final long milsecs = threshHoldForNoRetryInMilliseconds;
+        try {
+            SQLServerDataSource ds = new SQLServerDataSource();
+            ds.setURL(connectionString);
+            ds.setLoginTimeout(loginTimeOutInSeconds);
+            ds.setUser(RandomUtil.getIdentifier("User"));
+            timerStart = System.currentTimeMillis();
+            try (Connection con = ds.getConnection()) {
+                long timeDiff = timerEnd - timerStart;
+                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
+                Object[] msgArgs = {milsecs / 1000};
+                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
+            }
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
+            timerEnd = System.currentTimeMillis();
+        }
+    }
+
+    @Test
+    public void testIncorrectPassword() throws SQLException {
+        long timerStart = 0;
+        long timerEnd = 0;
+        final long milsecs = threshHoldForNoRetryInMilliseconds;
+        try {
+            SQLServerDataSource ds = new SQLServerDataSource();
+            ds.setURL(connectionString);
+            ds.setLoginTimeout(loginTimeOutInSeconds);
+            ds.setPassword(RandomUtil.getIdentifier("Password"));
+            timerStart = System.currentTimeMillis();
+            try (Connection con = ds.getConnection()) {
+                long timeDiff = timerEnd - timerStart;
+                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
+                Object[] msgArgs = {milsecs / 1000};
+                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
+            }
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
+            timerEnd = System.currentTimeMillis();
+        }
+    }
+
+    @Test
+    public void testInvalidCombination() throws SQLException {
+        long timerStart = 0;
+        long timerEnd = 0;
+        final long milsecs = threshHoldForNoRetryInMilliseconds;
+        try {
+            SQLServerDataSource ds = new SQLServerDataSource();
+            ds.setURL(connectionString);
+            ds.setLoginTimeout(loginTimeOutInSeconds);
+            ds.setMultiSubnetFailover(true);
+            ds.setFailoverPartner(RandomUtil.getIdentifier("FailoverPartner"));
+            timerStart = System.currentTimeMillis();
+            try (Connection con = ds.getConnection()) {
+                long timeDiff = timerEnd - timerStart;
+                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedMoreSeconds"));
+                Object[] msgArgs = {milsecs / 1000};
+                assertTrue(timeDiff <= milsecs, form.format(msgArgs));
+            }
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains(TestResource.getResource("R_connectMirrored")));
+            timerEnd = System.currentTimeMillis();
+        }
+    }
+
+    @Test
+    @Tag("slow")
+    public void testIncorrectDatabaseWithFailoverPartner() throws SQLException {
+        long timerStart = 0;
+        long timerEnd = 0;
+        try {
+            SQLServerDataSource ds = new SQLServerDataSource();
+            ds.setURL(connectionString);
+            ds.setLoginTimeout(loginTimeOutInSeconds);
+            ds.setDatabaseName(RandomUtil.getIdentifierForDB("DB"));
+            ds.setFailoverPartner(RandomUtil.getIdentifier("FailoverPartner"));
+            timerStart = System.currentTimeMillis();
+            try (Connection con = ds.getConnection()) {
+                long timeDiff = timerEnd - timerStart;
+                assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
+                MessageFormat form = new MessageFormat(TestResource.getResource("R_exitedLessSeconds"));
+                Object[] msgArgs = {loginTimeOutInSeconds - 1};
+                assertTrue(timeDiff >= ((loginTimeOutInSeconds - 1) * 1000), form.format(msgArgs));
+            }
+        } catch (Exception e) {
+            timerEnd = System.currentTimeMillis();
+        }
+    }
+
+    @Test
+    public void testAbortBadParam() throws SQLException {
+        try (Connection conn = getConnection()) {
+            try {
+                conn.abort(null);
+            } catch (SQLException e) {
+                assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidArgumentExecutor")));
+            }
+        }
+    }
+
+    @Test
+    public void testAbort() throws SQLException {
+        try (Connection conn = getConnection()) {
+            Executor executor = Executors.newFixedThreadPool(2);
+            conn.abort(executor);
+            assert (conn.isClosed());
+            // abort again on closed connection
+            conn.abort(executor);
+        }
+    }
+
+    @Test
+    public void testSetSchema() throws SQLException {
+        try (Connection conn = getConnection()) {
+            conn.setSchema(RandomUtil.getIdentifier("schema"));
+        }
+    }
+
+    @Test
+    public void testGetSchema() throws SQLException {
+        try (Connection conn = getConnection()) {
+            conn.getSchema();
+        }
+    }
+
+    static Boolean isInterrupted = false;
+
+    /**
+     * Test thread's interrupt status is not cleared.
+     * 
+     * @throws InterruptedException
+     */
+    @Test
+    @Tag("slow")
+    public void testThreadInterruptedStatus() throws InterruptedException {
+        Runnable runnable = new Runnable() {
+            public void run() {
+                SQLServerDataSource ds = new SQLServerDataSource();
+
+                ds.setURL(connectionString);
+                ds.setServerName("invalidServerName" + UUID.randomUUID());
+                ds.setLoginTimeout(5);
+
+                try (Connection con = ds.getConnection()) {} catch (SQLException e) {
+                    isInterrupted = Thread.currentThread().isInterrupted();
+                }
+            }
+        };
+
+        ExecutorService executor = Executors.newFixedThreadPool(1);
+        Future<?> future = executor.submit(runnable);
+
+        Thread.sleep(1000);
+
+        // interrupt the thread in the Runnable
+        future.cancel(true);
+
+        Thread.sleep(8000);
+
+        executor.shutdownNow();
+
+        assertTrue(isInterrupted, TestResource.getResource("R_threadInterruptNotSet"));
+    }
+}
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TimeoutTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/TimeoutTest.java
index 95b90c597..5b6d1c472 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/TimeoutTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/TimeoutTest.java
@@ -129,6 +129,20 @@ public void testNestedTimeoutShouldKeepTimerThreadRunning() throws SQLException
         }
     }
 
+    @Test
+    public void testGetClosedTimer() throws SQLServerException, SQLException {
+        try (SQLServerConnection conn = getConnection()) {
+            conn.close();
+            @SuppressWarnings("unused")
+            SharedTimer timer = conn.getSharedTimer();
+            fail(TestResource.getResource("R_expectedFailPassed"));
+        } catch (SQLServerException e) {
+            assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_connectionIsClosed")));
+        } catch (Exception e) {
+            fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
+        }
+    }
+
     private static void runQuery(String query, int timeout) throws SQLException {
         try (Connection conn = getConnection()) {
             runQuery(conn, query, timeout);
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java
index cc7bf0cf9..338a688fa 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java
@@ -5,9 +5,9 @@
 package com.microsoft.sqlserver.jdbc.unit.statement;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.StringReader;
 import java.math.BigDecimal;
@@ -40,6 +40,7 @@
 
 import com.microsoft.sqlserver.jdbc.RandomUtil;
 import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
+import com.microsoft.sqlserver.jdbc.SQLServerException;
 import com.microsoft.sqlserver.jdbc.SQLServerResultSet;
 import com.microsoft.sqlserver.jdbc.SQLServerResultSetMetaData;
 import com.microsoft.sqlserver.jdbc.SQLServerStatement;
@@ -216,9 +217,7 @@ public void testCancelLongResponse() throws Exception {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
-
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 try (ResultSet rs = stmt.executeQuery(
@@ -690,11 +689,10 @@ class Hammer {
                 }
 
                 void start(final Connection con) {
-
                     try {
                         newStmt = con.createStatement();
                     } catch (SQLException e) {
-                        fail(id + " " + e.getMessage());
+                        fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                     }
 
                     final Statement stmt = newStmt;
@@ -834,9 +832,7 @@ public void testIsCloseOnCompletion() throws Exception {
                 try {
                     result = ps.isCloseOnCompletion();
                 } catch (Exception e) {
-
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
-
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 assertEquals(false, result, "isCloseOnCompletion: " + TestResource.getResource("R_incorrectDefault"));
@@ -852,8 +848,7 @@ public void testCloseOnCompletion() throws Exception {
                 try {
                     ps.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
-
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 try (ResultSet rs = ps.executeQuery()) {
@@ -887,7 +882,7 @@ public void testIsCloseOnCompletion() throws Exception {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 assertEquals(true, stmt.isCloseOnCompletion(),
@@ -905,9 +900,7 @@ public void testCloseOnCompletion() throws Exception {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
-
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 try (ResultSet rs = stmt.executeQuery("SELECT 1")) {
@@ -933,7 +926,7 @@ public void testConsecutiveQueries() throws SQLException {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException") + ": ", e);
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(table1Name), stmt);
@@ -949,43 +942,120 @@ public void testConsecutiveQueries() throws SQLException {
             }
         }
 
+        @Test
+        public void testMaxFetchSize() throws SQLException {
+            try (Connection con = getConnection(); Statement stmt = con.createStatement()) {
+
+                // Default value should return zero
+                long actual = stmt.getMaxFieldSize();
+                assertEquals(0, actual, 0, "getMaxFieldSize(): " + TestResource.getResource("R_incorrectDefault"));
+
+                // Set a new value less than MAX_VALUE, and then get the modified value
+                int newValue = 2012;
+                stmt.setMaxFieldSize(newValue);
+                actual = stmt.getMaxFieldSize();
+                assertEquals(newValue, actual,
+                        "getMaxFieldSize(): " + TestResource.getResource("R_valuesAreDifferent"));
+
+                // execute a statement with this new max field size
+                stmt.execute("SELECT @@VERSION AS 'SQL Server Version'");
+
+                /*
+                 * Set a new value greater than MAX_VALUE, and then get the modified value. SQL Server only supports
+                 * integer limits for setting max rows If the value MAX_VALUE + 1 is accepted, throw exception
+                 */
+                try {
+                    newValue = Integer.MAX_VALUE + 1;
+                    stmt.setMaxFieldSize(newValue);
+                    fail(TestResource.getResource("R_expectedFailPassed"));
+                } catch (SQLServerException e) {
+                    assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_invalidLength")));
+                } catch (Exception e) {
+                    fail(TestResource.getResource("R_unexpectedException"));
+                }
+            }
+        }
+
+        @Test
+        public void testMaxRows() throws Exception {
+            try (Connection con = getConnection(); Statement stmt = con.createStatement()) {
+
+                // Default value should return zero
+                long actual = stmt.getMaxRows();
+                assertEquals(0, actual, "getMaxRows(): " + TestResource.getResource("R_incorrectDefault"));
+
+                // Set a new value less than MAX_VALUE, and then get the modified value
+                int newValue = 2012;
+                stmt.setMaxRows(newValue);
+                actual = stmt.getMaxRows();
+                assertEquals(newValue, actual, "getMaxRows(): " + TestResource.getResource("R_valuesAreDifferent"));
+
+                // execute a statement with this new max field size
+                stmt.execute("SELECT @@VERSION AS 'SQL Server Version'");
+
+                /*
+                 * Set a new value greater than MAX_VALUE, and then get the modified value. SQL Server only supports
+                 * integer limits for setting max rows If the value MAX_VALUE + 1 is accepted, throw exception
+                 */
+                try {
+                    newValue = Integer.MAX_VALUE + 1;
+                    stmt.setMaxRows(newValue);
+                    fail(TestResource.getResource("R_expectedFailPassed"));
+                } catch (SQLServerException e) {
+                    assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_invalidRowcount")));
+                } catch (Exception e) {
+                    fail(TestResource.getResource("R_unexpectedException"));
+                }
+
+                // Set a negative value. If negative is accepted, throw exception
+                try {
+                    stmt.setMaxRows(-2012);
+                    fail(TestResource.getResource("R_expectedFailPassed"));
+                } catch (SQLServerException e) {
+                    assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_invalidRowcount")));
+                } catch (Exception e) {
+                    fail(TestResource.getResource("R_unexpectedException"));
+                }
+            }
+        }
+
         @Test
         public void testLargeMaxRows() throws Exception {
             try (Connection con = getConnection(); Statement stmt = con.createStatement()) {
 
                 // Default value should return zero
                 long actual = stmt.getLargeMaxRows();
-                assertEquals(actual, (long) 0, "getLargeMaxRows():" + TestResource.getResource("R_incorrectDefault"));
+                assertEquals(0, actual, "getLargeMaxRows(): " + TestResource.getResource("R_incorrectDefault"));
 
                 // Set a new value less than MAX_VALUE, and then get the modified value
                 long newValue = 2012L;
                 stmt.setLargeMaxRows(newValue);
                 actual = stmt.getLargeMaxRows();
-                assertEquals(actual, newValue, "LargeMaxRows() : set/get problem");
+                assertEquals(newValue, actual,
+                        "getLargeMaxRows(): " + TestResource.getResource("R_valuesAreDifferent"));
 
-                // Set a new value grater than MAX_VALUE, and then get the modified value
-                // SQL Server only supports integer limits for setting max rows
-                // If the value MAX_VALUE + 1 is accepted, throw exception
+                /*
+                 * Set a new value grater than MAX_VALUE, and then get the modified value SQL Server only supports
+                 * integer limits for setting max rows If the value MAX_VALUE + 1 is accepted, throw exception
+                 */
                 try {
                     newValue = (long) Integer.MAX_VALUE + 1;
                     stmt.setLargeMaxRows(newValue);
-                    throw new SQLException("setLargeMaxRows(): Long values should not be set");
+                    fail(TestResource.getResource("R_expectedFailPassed"));
+                } catch (SQLServerException e) {
+                    assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_invalidMaxRows")));
                 } catch (Exception e) {
-                    assertTrue(
-                            e.getMessage().contains(
-                                    "The supported maximum row count for a result set is Integer.MAX_VALUE or less."),
-                            TestResource.getResource("R_unexpectedException"));
+                    fail(TestResource.getResource("R_unexpectedException"));
                 }
 
                 // Set a negative value. If negative is accepted, throw exception
                 try {
                     stmt.setLargeMaxRows(-2012L);
-                    throw new SQLException("setLargeMaxRows():  Negative value not allowed");
+                    fail(TestResource.getResource("R_expectedFailPassed"));
+                } catch (SQLServerException e) {
+                    assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_invalidRowcount")));
                 } catch (Exception e) {
-                    assertTrue(
-                            e.getMessage()
-                                    .contains("The maximum row count -2,012 for a result set must be non-negative."),
-                            TestResource.getResource("R_unexpectedException"));
+                    fail(TestResource.getResource("R_unexpectedException"));
                 }
             }
         }
@@ -1451,7 +1521,7 @@ public void testRowError() throws Exception {
                             try {
                                 cstmt.closeOnCompletion();
                             } catch (Exception e) {
-                                throw new SQLException(TestResource.getResource("R_unexpectedException"));
+                                fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                             }
 
                             try (ResultSet rs = cstmt.executeQuery()) {
@@ -1936,7 +2006,7 @@ public void testActiveResultSet() throws Exception {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException"));
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 try (SQLServerResultSet rs = (SQLServerResultSet) stmt.executeQuery("SELECT 1")) {
@@ -1966,7 +2036,7 @@ public void testClosedResultSet() throws Exception {
                 try {
                     stmt.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException"));
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 try (SQLServerResultSet rs = (SQLServerResultSet) stmt.executeQuery("SELECT 1")) {
@@ -2046,7 +2116,7 @@ public void setup() throws Exception {
                                 + TestUtils.escapeSingleQuotes((triggerName)) + "') drop trigger "
                                 + AbstractSQLGenerator.escapeIdentifier(triggerName));
                     } catch (SQLException e) {
-                        throw new SQLException(e);
+                        fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                     }
                     stmt.executeUpdate(
                             "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableName) + " (col1 INT )");
@@ -2233,7 +2303,7 @@ public void testUpdateCountAfterRaiseError() throws Exception {
                 try {
                     pstmt.closeOnCompletion();
                 } catch (Exception e) {
-                    throw new SQLException(TestResource.getResource("R_unexpectedException"));
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
 
                 boolean result = pstmt.execute();
@@ -2375,7 +2445,7 @@ public void terminate() throws Exception {
                 try {
                     TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(tableName), stmt);
                 } catch (SQLException e) {
-                    fail(e.getMessage());
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
             }
         }
@@ -2398,7 +2468,7 @@ public void setup() throws Exception {
                     try {
                         stmt.closeOnCompletion();
                     } catch (Exception e) {
-                        throw new SQLException(TestResource.getResource("R_unexpectedException"), e);
+                        fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                     }
                     stmt.executeUpdate(
                             "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableName) + " (col1 INT )");
@@ -2447,7 +2517,7 @@ public void terminate() throws Exception {
                 try {
                     TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(tableName), stmt);
                 } catch (SQLException e) {
-                    fail(e.getMessage());
+                    fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
                 }
             }
         }