From 4f223347f54721d9730df5b5992eafa72cddb00c Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Wed, 17 Apr 2019 13:06:10 -0700
Subject: [PATCH 1/2] Code Coverage improvement for DataClassification class +
 Fix conditional tests

---
 .../resultset/DataClassificationTest.java     |  51 +++++---
 .../sqlserver/jdbc/unit/UTF8SupportTest.java  | 109 ++++++++----------
 2 files changed, 86 insertions(+), 74 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..543d60fa3 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)
@@ -39,11 +43,10 @@ public class DataClassificationTest extends AbstractTest {
     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 +122,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 +133,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 0997ac0d07592eae1a635486ea19614348887f06 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Wed, 24 Apr 2019 23:29:55 -0700
Subject: [PATCH 2/2] Remove comment

---
 .../sqlserver/jdbc/resultset/DataClassificationTest.java         | 1 -
 1 file changed, 1 deletion(-)

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 543d60fa3..19b1c97cc 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/resultset/DataClassificationTest.java
@@ -41,7 +41,6 @@ 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();) {
             assert (TestUtils.serverSupportsDataClassification(stmt));
             createTable(connection, stmt);