update

microsoft · Jan 18, 2023 · 3ffe58e · 3ffe58e
1 parent b878715
commit 3ffe58e
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java
@@ -226,11 +226,11 @@ public void testADPasswordUnregisteredUserWithConnectionStringUserName() throws
             fail(EXPECTED_EXCEPTION_NOT_THROWN);
         } catch (SQLServerException e) {
             assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(),
-                    e.getMessage()
+                    (e.getMessage()
                             .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + badUserName
                                     + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                            && (e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD)
-                                    || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                            && e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD))
+                            || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }
 
@@ -248,11 +248,11 @@ public void testADPasswordUnregisteredUserWithDatasource() throws SQLException {
             fail(EXPECTED_EXCEPTION_NOT_THROWN);
         } catch (SQLServerException e) {
             assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(),
-                    e.getMessage()
+                    (e.getMessage()
                             .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + badUserName
                                     + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                            && (e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD)
-                                    || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                            && e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD))
+                            || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }
 
@@ -263,11 +263,11 @@ public void testADPasswordUnregisteredUserWithConnectionStringUser() throws SQLE
             fail(EXPECTED_EXCEPTION_NOT_THROWN);
         } catch (SQLServerException e) {
             assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(),
-                    e.getMessage()
+                    (e.getMessage()
                             .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + badUserName
                                     + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                            && (e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD)
-                                    || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                            && e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_ADD))
+                            || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }
 
@@ -400,12 +400,12 @@ public void testADPasswordWrongPasswordWithConnectionStringUserName() throws SQL
                 fail(EXPECTED_EXCEPTION_NOT_THROWN);
             }
 
-            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), e.getMessage()
+            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), (e.getMessage()
                     .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + azureUserName
                             + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                    && (e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY)
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                    && e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
+                    || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
+                    || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }
 
@@ -426,12 +426,12 @@ public void testADPasswordWrongPasswordWithDatasource() throws SQLException {
                 fail(EXPECTED_EXCEPTION_NOT_THROWN);
             }
 
-            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), e.getMessage()
+            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), (e.getMessage()
                     .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + azureUserName
                             + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                    && (e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY)
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                    && e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
+                    || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
+                    || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }
 
@@ -446,12 +446,12 @@ public void testADPasswordWrongPasswordWithConnectionStringUser() throws SQLExce
                 fail(EXPECTED_EXCEPTION_NOT_THROWN);
             }
 
-            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), e.getMessage()
+            assertTrue(INVALID_EXCEPTION_MSG + ": " + e.getMessage(), (e.getMessage()
                     .contains(ERR_MSG_FAILED_AUTHENTICATE + " the user " + azureUserName
                             + " in Active Directory (Authentication=ActiveDirectoryPassword).")
-                    && (e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY)
-                            || e.getCause().getCause().getMessage().contains(ERR_MSG_REQUEST_THROTTLED)));
+                    && e.getCause().getCause().getMessage().toLowerCase().contains("invalid username or password")
+                    || e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
+                    || e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
         }
     }