This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2d5c14bfc1 Fix broken test
2d5c14bfc1 is described below
commit 2d5c14bfc1ed58aa6f5a85940b3583c68ffbbc77
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 22 20:39:30 2026 +0100
Fix broken test
---
.../catalina/users/TestMemoryUserDatabase.java | 53 ++++++++++++++--------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/test/org/apache/catalina/users/TestMemoryUserDatabase.java
b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
index 981796cf06..3b78e21dcf 100644
--- a/test/org/apache/catalina/users/TestMemoryUserDatabase.java
+++ b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
@@ -64,23 +64,47 @@ public class TestMemoryUserDatabase {
}
@Test
- public void testLoadUserDatabase()
- throws Exception {
+ public void testLoadUserDatabase() throws Exception {
+ validateCleanTestDatabase();
+ }
+
+
+ private void validateCleanTestDatabase() {
assertPrincipalNames(new String[] { "testrole", "otherrole"},
db.getRoles());
assertPrincipalNames(new String[] { "testgroup", "othergroup"},
db.getGroups());
Iterator<User> users = db.getUsers();
Assert.assertTrue("No users found", users.hasNext());
+ int userCount = 0;
- User user = users.next();
+ while (users.hasNext()) {
+ User user = users.next();
+ userCount++;
- Assert.assertEquals("admin", user.getName());
- Assert.assertNull(user.getFullName());
- Assert.assertEquals("sekr3t", user.getPassword());
+ switch (user.getName()) {
+ case "admin": {
+ Assert.assertNull(user.getFullName());
+ Assert.assertEquals("sekr3t", user.getPassword());
+
+ assertPrincipalNames(new String[] { "testrole",
"otherrole"}, user.getRoles());
+ assertPrincipalNames(new String[] { "testgroup",
"othergroup"}, user.getGroups());
+ break;
+ }
+ case "otheruser": {
+ Assert.assertNull(user.getFullName());
+ Assert.assertEquals("sekr3t2", user.getPassword());
+
+ assertPrincipalNames(new String[0], user.getRoles());
+ assertPrincipalNames(new String[0] , user.getGroups());
+ break;
+ }
+ default:
+ Assert.fail("Unexpected user: [" + user.getName() + "]");
+ }
+ }
- assertPrincipalNames(new String[] { "testrole", "otherrole"},
user.getRoles());
- assertPrincipalNames(new String[] { "testgroup", "othergroup"},
user.getGroups());
+ Assert.assertEquals("Unexpected number of users in test database", 2,
userCount);
}
public void testReloadUserDatabase()
@@ -167,18 +191,7 @@ public class TestMemoryUserDatabase {
}
}
- users = db.getUsers();
-
- Assert.assertTrue("No users found", users.hasNext());
-
- User user = users.next();
-
- Assert.assertEquals("admin", user.getName());
- Assert.assertNull(user.getFullName());
- Assert.assertEquals("sekr3t", user.getPassword());
-
- assertPrincipalNames(new String[] { "testrole", "otherrole"},
user.getRoles());
- assertPrincipalNames(new String[] { "testgroup", "othergroup"},
user.getGroups());
+ validateCleanTestDatabase();
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
