[jboss-cvs] JBossAS SVN: r57896 - in branches/Branch_4_0/testsuite/src: main/org/jboss/test/cluster/ds main/org/jboss/test/cluster/test resources/cluster/ds
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 27 10:10:37 EDT 2006
Author: jerrygauth
Date: 2006-10-27 10:10:34 -0400 (Fri, 27 Oct 2006)
New Revision: 57896
Modified:
branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java
branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java
branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java
branches/Branch_4_0/testsuite/src/resources/cluster/ds/jboss-service.xml
Log:
Added tests to DistributedState test suite
Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java 2006-10-27 14:00:07 UTC (rev 57895)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java 2006-10-27 14:10:34 UTC (rev 57896)
@@ -33,7 +33,7 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
-/** Tests of the
+/** Tests of the DistributedState service
@author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>.
@version $Revision$
@@ -102,6 +102,48 @@
Object value = entryMap.remove(category, key, false);
log.debug("Removed: "+key+", value: "+value);
}
+
+ public Collection listAllCategories()
+ {
+ // return results as a vector to avoid hashmap.keyset serialization error
+ Collection cats = entryMap.getAllCategories();
+ if (cats == null || cats.isEmpty()) {
+ return new java.util.Vector();
+ }
+ java.util.Vector vcats = new java.util.Vector();
+ java.util.Iterator iter = cats.iterator();
+ while (iter.hasNext())
+ vcats.add(iter.next());
+ return vcats;
+ }
+
+ public Collection listAllKeys(String category)
+ {
+ // return results as a vector to avoid hashmap.keyset serialization error
+ Collection keys = entryMap.getAllKeys(category);
+ if (keys == null || keys.isEmpty()) {
+ return new java.util.Vector();
+ }
+ java.util.Vector vkeys = new java.util.Vector();
+ java.util.Iterator iter = keys.iterator();
+ while (iter.hasNext())
+ vkeys.add(iter.next());
+ return vkeys;
+ }
+
+ public Collection listAllValues(String category)
+ {
+ // return results as a vector to avoid hashmap.keyset serialization error
+ Collection vals = entryMap.getAllKeys(category);
+ if (vals == null || vals.isEmpty()) {
+ return new java.util.Vector();
+ }
+ java.util.Vector vvals = new java.util.Vector();
+ java.util.Iterator iter = vals.iterator();
+ while (iter.hasNext())
+ vvals.add(iter.next());
+ return vvals;
+ }
/** Remove all entries from the cache.
*/
Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java 2006-10-27 14:00:07 UTC (rev 57895)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/ds/IDistributedState.java 2006-10-27 14:10:34 UTC (rev 57896)
@@ -22,6 +22,7 @@
package org.jboss.test.cluster.ds;
import java.io.Serializable;
+import java.util.Collection;
/** The public DistributedStateUser interface
*
@@ -56,6 +57,9 @@
throws Exception;
public void remove(Serializable key)
throws Exception;
+ public Collection listAllCategories();
+ public Collection listAllKeys(String category);
+ public Collection listAllValues(String category);
public void flush();
public int size();
Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java 2006-10-27 14:00:07 UTC (rev 57895)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java 2006-10-27 14:10:34 UTC (rev 57896)
@@ -23,6 +23,7 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+import java.util.Collection;
import java.util.Vector;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
@@ -105,12 +106,29 @@
assertTrue("server1: value == value1("+value+")", value.equals("value1"));
value = (String) ds0.get("key0");
assertTrue("server0: value == value1("+value+")", value.equals("value1"));
+
+ ds1.put("key1", "value11");
+ Collection categories = ds0.listAllCategories();
+ assertEquals("server0 categories size", 1, categories.size());
+ categories = ds1.listAllCategories();
+ assertEquals("server1 categories size", 1, categories.size());
+
+ String category = (String)categories.iterator().next();
+ Collection keys = ds0.listAllKeys(category);
+ assertEquals("server0 keys size", 2, keys.size());
+ keys = ds1.listAllKeys(category);
+ assertEquals("server1 keys size", 2, keys.size());
+ Collection vals = ds0.listAllValues(category);
+ assertEquals("server0 values size", 2, vals.size());
+ vals = ds1.listAllValues(category);
+ assertEquals("server1 values size", 2, vals.size());
ds0.remove("key0");
value = (String) ds1.get("key0");
assertTrue("server1: value == null("+value+")", value == null);
value = (String) ds0.get("key0");
assertTrue("server0: value == null("+value+")", value == null);
+
}
}
Modified: branches/Branch_4_0/testsuite/src/resources/cluster/ds/jboss-service.xml
===================================================================
--- branches/Branch_4_0/testsuite/src/resources/cluster/ds/jboss-service.xml 2006-10-27 14:00:07 UTC (rev 57895)
+++ branches/Branch_4_0/testsuite/src/resources/cluster/ds/jboss-service.xml 2006-10-27 14:10:34 UTC (rev 57896)
@@ -74,6 +74,26 @@
<name>size</name>
<return-type>int</return-type>
</operation>
+ <operation>
+ <name>listAllCategories</name>
+ <return-type>java.util.Collection</return-type>
+ </operation>
+ <operation>
+ <name>listAllKeys</name>
+ <parameter>
+ <name>category</name>
+ <type>java.lang.String</type>
+ </parameter>
+ <return-type>java.util.Collection</return-type>
+ </operation>
+ <operation>
+ <name>listAllValues</name>
+ <parameter>
+ <name>category</name>
+ <type>java.lang.String</type>
+ </parameter>
+ <return-type>java.util.Collection</return-type>
+ </operation>
</xmbean>
</mbean>
More information about the jboss-cvs-commits
mailing list