Skip to content

Add throttling error message to tests #2044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilgreenbird merged 3 commits into from
Jan 19, 2023
Merged

Add throttling error message to tests #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b878715
added throttling error
lilgreenbird Jan 18, 2023
3ffe58e
update
lilgreenbird Jan 18, 2023
637f940
increase timeout
lilgreenbird Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions src/test/java/com/microsoft/sqlserver/jdbc/fedauth/ErrorMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.sql.SQLException;
import java.util.Properties;

import com.microsoft.sqlserver.jdbc.TestUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -227,10 +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_SIGNIN_ADD))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand All @@ -248,10 +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_SIGNIN_ADD))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand All @@ -262,10 +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_SIGNIN_ADD))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand Down Expand Up @@ -398,11 +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().toLowerCase().contains("invalid username or password")
|| e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand All @@ -423,11 +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().toLowerCase().contains("invalid username or password")
|| e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand All @@ -442,11 +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().toLowerCase().contains("invalid username or password")
|| e.getCause().getCause().getMessage().contains(ERR_MSG_SIGNIN_TOO_MANY))
|| e.getMessage().contains(ERR_MSG_REQUEST_THROTTLED));
}
}

Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class FedauthCommon extends AbstractTest {
static final String ERR_MSG_RESULTSET_IS_CLOSED = TestUtils.R_BUNDLE.getString("R_resultsetClosed");
static final String ERR_MSG_SOCKET_CLOSED = TestResource.getResource("R_socketClosed");
static final String ERR_TCPIP_CONNECTION = TestResource.getResource("R_tcpipConnectionToHost");
static final String ERR_MSG_REQUEST_THROTTLED = "Request was throttled";

enum SqlAuthentication {
NotSpecified,
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/microsoft/sqlserver/jdbc/resiliency/BasicConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void testBasicConnectionAAD() throws SQLException {
org.junit.Assume.assumeTrue(azureServer != null && !azureServer.isEmpty());

basicReconnect("jdbc:sqlserver://" + azureServer + ";database=" + azureDatabase + ";user=" + azureUserName
+ ";password=" + azurePassword + ";loginTimeout=30;Authentication=ActiveDirectoryPassword");
+ ";password=" + azurePassword + ";loginTimeout=90;Authentication=ActiveDirectoryPassword");
}

@Test
Expand Down