This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 80429a2953 Run four tests that were missing @Test
80429a2953 is described below
commit 80429a29530949554dc52f5b10a22d4d1d8366c4
Author: Sharang Gupta <[email protected]>
AuthorDate: Mon Oct 19 21:33:04 2026 +0100
Run four tests that were missing @Test
TestBeanNameELResolver.testGetCommonPropertyType01/02 now expect
String.class, which getCommonPropertyType always returns.
TestSSLValve.testSslCipherUserKeySizeHeaderBadFormat lost its annotation
when the valve started logging invalid key sizes; it now uses its own log
filter and checks the warning. TesterLogValidationFilter no longer fails
on a record without a throwable.
TestMemoryUserDatabase.testReloadUserDatabase
now reloads after the file is written, using its own file and database.
---
test/javax/el/TestBeanNameELResolver.java | 6 ++++--
.../catalina/users/TestMemoryUserDatabase.java | 24 ++++++++++++++++------
test/org/apache/catalina/valves/TestSSLValve.java | 6 ++++++
.../tomcat/unittest/TesterLogValidationFilter.java | 6 +++++-
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/test/javax/el/TestBeanNameELResolver.java
b/test/javax/el/TestBeanNameELResolver.java
index 666ae1caa9..e19b9ac8a8 100644
--- a/test/javax/el/TestBeanNameELResolver.java
+++ b/test/javax/el/TestBeanNameELResolver.java
@@ -471,13 +471,14 @@ public class TestBeanNameELResolver {
/**
* Confirm it returns String.class for 'valid' input.
*/
+ @Test
public void testGetCommonPropertyType01() {
BeanNameELResolver resolver = createBeanNameELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getCommonPropertyType(context, null);
- Assert.assertNull(result);
+ Assert.assertEquals(String.class, result);
Assert.assertFalse(context.isPropertyResolved());
}
@@ -485,12 +486,13 @@ public class TestBeanNameELResolver {
/**
* Confirm it returns String.class for invalid input.
*/
+ @Test
public void testGetCommonPropertyType02() {
BeanNameELResolver resolver = createBeanNameELResolver();
Object result = resolver.getCommonPropertyType(null, new Object());
- Assert.assertNull(result);
+ Assert.assertEquals(String.class, result);
}
diff --git a/test/org/apache/catalina/users/TestMemoryUserDatabase.java
b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
index 0bd7fd0511..6d1174e436 100644
--- a/test/org/apache/catalina/users/TestMemoryUserDatabase.java
+++ b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
@@ -115,11 +115,23 @@ public class TestMemoryUserDatabase {
Assert.assertEquals("Unexpected number of users in test database", 3,
userCount);
}
+ @Test
public void testReloadUserDatabase()
throws Exception {
+ File file = File.createTempFile("tomcat-users", ".xml");
+ file.deleteOnExit();
+
+ try(BufferedWriter out = new BufferedWriter(new FileWriter(file))) {
+ out.write(TestMemoryRealm.CONFIG);
+ }
+
+ MemoryUserDatabase mud = new MemoryUserDatabase();
+ mud.setPathname(file.toURI().toURL().toString());
+ mud.open();
+
// Change the database on the disk and reload
- try(BufferedWriter out = new BufferedWriter(new
FileWriter(TEST_FILE))) {
+ try(BufferedWriter out = new BufferedWriter(new FileWriter(file))) {
out.write("<?xml version=\"1.0\" ?>"
+ "<tomcat-users xmlns=\"http://tomcat.apache.org/xml\"";
+ "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
@@ -129,14 +141,14 @@ public class TestMemoryUserDatabase {
+ "<group groupname=\"bar\" />"
+ "<user username=\"root\" password=\"sup3Rsekr3t\"
roles=\"foo, bar\" groups=\"bar, foo\" />"
+ "</tomcat-users>");
-
- db.open();
}
- assertPrincipalNames(new String[] { "foo", "bar"}, db.getRoles());
- assertPrincipalNames(new String[] { "bar", "foo"}, db.getGroups());
+ mud.open();
- Iterator<User> users = db.getUsers();
+ assertPrincipalNames(new String[] { "foo", "bar"}, mud.getRoles());
+ assertPrincipalNames(new String[] { "bar", "foo"}, mud.getGroups());
+
+ Iterator<User> users = mud.getUsers();
Assert.assertTrue("No users found", users.hasNext());
diff --git a/test/org/apache/catalina/valves/TestSSLValve.java
b/test/org/apache/catalina/valves/TestSSLValve.java
index a46798da03..237666e9aa 100644
--- a/test/org/apache/catalina/valves/TestSSLValve.java
+++ b/test/org/apache/catalina/valves/TestSSLValve.java
@@ -378,13 +378,19 @@ public class TestSSLValve {
}
+ @Test
public void testSslCipherUserKeySizeHeaderBadFormat() throws Exception {
setUp();
mockRequest.setHeader(valve.getSslCipherUserKeySizeHeader(),
"not-an-integer");
+ TesterLogValidationFilter f =
TesterLogValidationFilter.add(Level.WARNING, null, null,
+ "org.apache.catalina.valves.SSLValve");
+
valve.invoke(mockRequest, null);
+ EasyMock.verify(mockNext);
Assert.assertNull(mockRequest.getAttribute(Globals.KEY_SIZE_ATTR));
+ Assert.assertEquals(1, f.getMessageCount());
}
diff --git a/test/org/apache/tomcat/unittest/TesterLogValidationFilter.java
b/test/org/apache/tomcat/unittest/TesterLogValidationFilter.java
index e6f43c1534..4d386f2793 100644
--- a/test/org/apache/tomcat/unittest/TesterLogValidationFilter.java
+++ b/test/org/apache/tomcat/unittest/TesterLogValidationFilter.java
@@ -62,9 +62,13 @@ public class TesterLogValidationFilter implements Filter {
}
if (targetThrowableString != null) {
+ Throwable thrown = record.getThrown();
+ if (thrown == null) {
+ return true;
+ }
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
- record.getThrown().printStackTrace(pw);
+ thrown.printStackTrace(pw);
pw.close();
String throwableString = sw.toString();
if (!throwableString.contains(targetThrowableString)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
