Skip to content

Commit c20d6d5

Browse files
committed
Updates based on review feedback
1 parent 974b134 commit c20d6d5

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

tests/src/integration/tests/test_auth.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, ProtocolVersions) {
108108
CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidEmptyCredentials) {
109109
CHECK_FAILURE;
110110

111-
// Iterate over all known/supported protocol versions
111+
logger_.add_critera("Key may not be empty");
112112
logger_.add_critera("Password must not be null");
113+
114+
// Iterate over all known/supported protocol versions
113115
for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION; i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION;
114116
++i) {
115117
/*
@@ -119,7 +121,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidEmptyCredentials) {
119121
*/
120122
Session session = connect_using_credentials(i, "", "");
121123
ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
122-
ASSERT_EQ(logger_.count(), 2u);
124+
ASSERT_GT(logger_.count(), 0u);
123125
logger_.reset_count();
124126
}
125127
}
@@ -139,8 +141,10 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidEmptyCredentials) {
139141
CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullUsernameCredentials) {
140142
CHECK_FAILURE;
141143

142-
// Iterate over all known/supported protocol versions
144+
logger_.add_critera("Key may not be empty");
143145
logger_.add_critera("Authentication ID must not be null");
146+
147+
// Iterate over all known/supported protocol versions
144148
for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION; i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION;
145149
++i) {
146150
/*
@@ -150,7 +154,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullUsernameCredentials
150154
*/
151155
Session session = connect_using_credentials(i, NULL, "pass");
152156
ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
153-
ASSERT_EQ(logger_.count(), 2u);
157+
ASSERT_GT(logger_.count(), 0u);
154158
logger_.reset_count();
155159
}
156160
}
@@ -170,8 +174,10 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullUsernameCredentials
170174
CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullPasswordCredentials) {
171175
CHECK_FAILURE;
172176

173-
// Iterate over all known/supported protocol versions
177+
logger_.add_critera("and/or password are incorrect");
174178
logger_.add_critera("Password must not be null");
179+
180+
// Iterate over all known/supported protocol versions
175181
for (int i = CASS_LOWEST_SUPPORTED_PROTOCOL_VERSION; i <= CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION;
176182
++i) {
177183
/*
@@ -181,7 +187,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullPasswordCredentials
181187
*/
182188
Session session = connect_using_credentials(i, "user", NULL);
183189
ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
184-
ASSERT_GE(logger_.count(), 1u);
190+
ASSERT_GT(logger_.count(), 0u);
185191
logger_.reset_count();
186192
}
187193
}

0 commit comments

Comments
 (0)