From 80c2882e9410967e95cb5bd25d221f284ae0ff86 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 2 May 2010 17:58:28 +0000 Subject: [PATCH] Align test with expected behaviour (currently fails). Will fix in following commits. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@940278 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/catalina/mbeans/RegistrationTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/org/apache/catalina/mbeans/RegistrationTest.java b/test/org/apache/catalina/mbeans/RegistrationTest.java index 5c19e6acb..75f1a8f29 100644 --- a/test/org/apache/catalina/mbeans/RegistrationTest.java +++ b/test/org/apache/catalina/mbeans/RegistrationTest.java @@ -62,9 +62,9 @@ public class RegistrationTest extends TomcatBaseTest { tomcat.stop(); - // Verify there are no Tomcat MBeans - onames = mbeanServer.queryNames(new ObjectName("Catalina:*"), null); - assertEquals("Remaining: " + onames, 0, onames.size()); + // There should still be some Tomcat MBeans + onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null); + assertTrue("No Tomcat MBeans", onames.size() > 0); // add a new host StandardHost host = new StandardHost(); @@ -78,8 +78,11 @@ public class RegistrationTest extends TomcatBaseTest { tomcat.start(); tomcat.stop(); + // There should be no Catalina MBeans and no Tomcat MBeans onames = mbeanServer.queryNames(new ObjectName("Catalina:*"), null); assertEquals("Remaining: " + onames, 0, onames.size()); + onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null); + assertEquals("Remaining: " + onames, 0, onames.size()); } } -- 2.11.0