[infinispan-commits] Infinispan SVN: r1254 - trunk/core/src/test/java/org/infinispan/jmx.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-12-07 03:32:58 -0500 (Mon, 07 Dec 2009)
New Revision: 1254

Modified:
   trunk/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
Log:
[ISPN-294] (Stop exposing getCache(*) via JMX and instead create new startCache(*) JMX methods) Fix unit tests.

Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java	2009-12-05 12:35:06 UTC (rev 1253)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java	2009-12-07 08:32:58 UTC (rev 1254)
@@ -62,7 +62,7 @@
    public void testStartStopManagedOperations() throws Exception {
       ObjectName defaultOn = new ObjectName(JMX_DOMAIN + ":cache-name=" + DefaultCacheManager.DEFAULT_CACHE_NAME + "(local),jmx-resource=Cache");
       ObjectName managerON = new ObjectName(JMX_DOMAIN + ":cache-name=[global],jmx-resource=CacheManager");
-      server.invoke(managerON, "getCache", new Object[]{}, new String[]{});
+      server.invoke(managerON, "startCache", new Object[]{}, new String[]{});
       assert ComponentStatus.RUNNING.toString().equals(server.getAttribute(defaultOn, "CacheStatus"));
       assert server.getAttribute(managerON, "CreatedCacheCount").equals("1");
       assert server.getAttribute(managerON, "RunningCacheCount").equals("1");
@@ -88,9 +88,9 @@
       assert ComponentStatus.TERMINATED.toString().equals(server.getAttribute(defaultOn, "CacheStatus"));
    }
    
-   public void testManagerStopRemovesCacheMBean(Method method) throws Exception {
+   public void testManagerStopRemovesCacheMBean(Method m) throws Exception {
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
-      final String otherJmxDomain = JMX_DOMAIN + '.' + method.getName();
+      final String otherJmxDomain = JMX_DOMAIN + '.' + m.getName();
       globalConfiguration.setJmxDomain(otherJmxDomain);
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
       globalConfiguration.setExposeGlobalJmxStatistics(true);
@@ -100,8 +100,8 @@
       ObjectName galderOn = new ObjectName(otherJmxDomain + ":cache-name=galder(local),jmx-resource=Cache");
       ObjectName managerON = new ObjectName(otherJmxDomain + ":cache-name=[global],jmx-resource=CacheManager");
       CacheManager otherManager = TestCacheManagerFactory.createCacheManager(globalConfiguration, configuration);
-      server.invoke(managerON, "getCache", new Object[]{}, new String[]{});
-      server.invoke(managerON, "getCache", new Object[]{"galder"}, new String[]{String.class.getName()});
+      server.invoke(managerON, "startCache", new Object[]{}, new String[]{});
+      server.invoke(managerON, "startCache", new Object[]{"galder"}, new String[]{String.class.getName()});
       assert ComponentStatus.RUNNING.toString().equals(server.getAttribute(defaultOn, "CacheStatus"));
       assert ComponentStatus.RUNNING.toString().equals(server.getAttribute(galderOn, "CacheStatus"));
       otherManager.stop();

Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java	2009-12-05 12:35:06 UTC (rev 1253)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java	2009-12-07 08:32:58 UTC (rev 1254)
@@ -37,7 +37,7 @@
       cacheManager = TestCacheManagerFactory.createCacheManager(globalConfiguration);
       name = new ObjectName(JMX_DOMAIN + ":cache-name=[global],jmx-resource=CacheManager");
       server = PerThreadMBeanServerLookup.getThreadMBeanServer();
-      server.invoke(name, "getCache", new Object[]{}, new String[]{});
+      server.invoke(name, "startCache", new Object[]{}, new String[]{});
       return cacheManager;
    }
 
@@ -60,8 +60,8 @@
       assert attribute.contains("c(");
 
       //now start some caches
-      server.invoke(name, "getCache", new Object[]{"a"}, new String[]{String.class.getName()});
-      server.invoke(name, "getCache", new Object[]{"b"}, new String[]{String.class.getName()});
+      server.invoke(name, "startCache", new Object[]{"a"}, new String[]{String.class.getName()});
+      server.invoke(name, "startCache", new Object[]{"b"}, new String[]{String.class.getName()});
       assert server.getAttribute(name, "CreatedCacheCount").equals("3");
       assert server.getAttribute(name, "DefinedCacheCount").equals("3");
       assert server.getAttribute(name, "RunningCacheCount").equals("3");