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

diff --git a/test/org/apache/catalina/mbeans/RegistrationTest.java b/test/org/apache/catalina/mbeans/RegistrationTest.java
index 5c19e6a..75f1a8f 100644 (file)
--- 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());
        }
        
 }