Author: markt
Date: Sun May 2 17:58:28 2010
New Revision: 940278
URL: http://svn.apache.org/viewvc?rev=940278&view=rev
Log:
Align test with expected behaviour (currently fails). Will fix in following
commits.
Modified:
tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java?rev=940278&r1=940277&r2=940278&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/RegistrationTest.java Sun May
2 17:58:28 2010
@@ -62,9 +62,9 @@ public class RegistrationTest extends To
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 To
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());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]