Fixed Managed Identity tests (#1935)

Signed-off-by: Jeff Wasty <[email protected]>

# Conflicts:
#	src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java

Author: lilgreenbird

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

@@ -57,18 +57,11 @@ public void testMSIAuth() throws SQLException {
         connStr = TestUtils.addOrOverrideProperty(connStr, Constants.PASSWORD, "");
         connStr = TestUtils.addOrOverrideProperty(connStr, Constants.AUTHENTICATION, "ActiveDirectoryMSI");
 
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL, "0");
-
         testSimpleConnect(connStr);
 
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL,
-                Integer.toString(Integer.MAX_VALUE));
+        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.AUTHENTICATION, "ActiveDirectoryMSI");
 
         testSimpleConnect(connStr);
-
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL, "");
-
-        testSimpleConnect(connStr); // This call will use a cached token
     }
 
     private void testSimpleConnect(String connStr) {
@@ -92,18 +85,10 @@ public void testMSIAuthWithMSIClientId() throws SQLException {
         connStr = TestUtils.addOrOverrideProperty(connStr, Constants.AUTHENTICATION, "ActiveDirectoryMSI");
         connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSICLIENTID, msiClientId);
 
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL, "0");
-
         testSimpleConnect(connStr);
 
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL,
-                Integer.toString(Integer.MAX_VALUE));
-
+        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.AUTHENTICATION, "ActiveDirectoryMSI");
         testSimpleConnect(connStr);
-
-        connStr = TestUtils.addOrOverrideProperty(connStr, Constants.MSITOKENCACHETTL, "");
-
-        testSimpleConnect(connStr); // This call will use a cached token
     }
 
     /*
@@ -123,9 +108,12 @@ public void testDSMSIAuth() throws SQLException {
         ds.setAuthentication("ActiveDirectoryMSI");
         AbstractTest.updateDataSource(connStr, ds);
 
-        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {} catch (Exception e) {
-            fail(TestResource.getResource("R_loginFailed") + e.getMessage());
-        }
+        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {}
+
+        ds.setAuthentication("ActiveDirectoryMSI");
+        AbstractTest.updateDataSource(connStr, ds);
+
+        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {}
     }
 
     /*
@@ -146,10 +134,12 @@ public void testDSMSIAuthWithMSIClientId() throws SQLException {
         ds.setMSIClientId(msiClientId);
         AbstractTest.updateDataSource(connStr, ds);
 
+        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {}
 
-        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {} catch (Exception e) {
-            fail(TestResource.getResource("R_loginFailed") + e.getMessage());
-        }
+        ds.setAuthentication("ActiveDirectoryMSI");
+        AbstractTest.updateDataSource(connStr, ds);
+
+        try (SQLServerConnection con = (SQLServerConnection) ds.getConnection()) {}
     }
 
     /*