Fix ServletHandlerTest.testFiltersServletsListenersAsBeans

In jetty-10, the Container.Listener is also dumped as a bean, whereas it is not in
jetty-9. The test was checking that nothing was dumped as a bean, so
changed the test to explicitly look for the special formatting for
listeners, filters and servlets.
This commit is contained in:
Jan Bartel 2020-07-15 11:24:56 +02:00
parent eb1e0b6d51
commit 8cc380ed9e
1 changed files with 5 additions and 6 deletions

View File

@ -687,7 +687,6 @@ public class ServletHandlerTest
{
removeResults.add(child);
}
});
handler.addFilter(fh1);
@ -714,12 +713,12 @@ public class ServletHandlerTest
//test that servlets, filters and listeners are dumped, but
//not as beans
String dump = handler.dump();
dump = dump.substring(0, dump.indexOf("key:"));
assertFalse(dump.contains("+-")); //not dumped as beans
assertFalse(dump.contains("+=")); //not dumped as managed beans
assertFalse(dump.contains("+~")); //not dumped as unmanaged beans
assertFalse(dump.contains("+?")); //not dumped as auto beans
assertTrue(dump.contains("+> listeners"));
assertTrue(dump.contains("+> filters"));
assertTrue(dump.contains("+> servlets"));
assertTrue(dump.contains("+> filterMappings"));
assertTrue(dump.contains("+> servletMappings"));
handler.setFilters(null);
handler.setServlets(null);