[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/state ...
Julien Viet
julien at jboss.com
Tue Aug 22 10:08:55 EDT 2006
User: julien
Date: 06/08/22 10:08:55
Modified: portlet/src/main/org/jboss/portal/test/portlet/state
StatefulPortletInvokerTestCase.java
Log:
- refactored the ValueMap to PropertyMap and moved it in org.jboss.portal.portlet.state package
- introduced TypedMap that is super type of ParameterMap and is reused for the PropertyMap
Revision Changes Path
1.3 +36 -36 jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StatefulPortletInvokerTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/state/StatefulPortletInvokerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StatefulPortletInvokerTestCase.java 31 Jul 2006 19:29:56 -0000 1.2
+++ StatefulPortletInvokerTestCase.java 22 Aug 2006 14:08:55 -0000 1.3
@@ -25,6 +25,8 @@
import org.jboss.portal.portlet.state.producer.StatefulPortletInvoker;
import org.jboss.portal.portlet.state.producer.State;
import org.jboss.portal.portlet.state.producer.NoSuchStateException;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.InvalidPortletIdException;
import org.jboss.portal.portlet.test.ValueMapAssert;
@@ -32,12 +34,10 @@
import org.jboss.portal.portlet.test.support.state.StateStoreSupport;
import org.jboss.portal.portlet.test.support.PortletSupport;
import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.value.ValueMap;
-import org.jboss.portal.common.value.SimpleValueMap;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class StatefulPortletInvokerTestCase extends TestCase
{
@@ -145,13 +145,13 @@
State popCloneState = stateStore.loadState(popCloneStateId);
assertNotNull(popCloneState);
assertEquals("PortletId", popCloneState.getPortletId());
- ValueMap expected = new SimpleValueMap();
- expected.setValue("abc", new StringValue("def"));
+ PropertyMap expected = new SimplePropertyMap();
+ expected.setProperty("abc", new StringValue("def"));
ValueMapAssert.assertEquals(expected, popCloneState.getProperties());
// Update state
- ValueMap next = new SimpleValueMap();
- next.setValue("ghi", new StringValue("jkl"));
+ PropertyMap next = new SimplePropertyMap();
+ next.setProperty("ghi", new StringValue("jkl"));
stateStore.updateState(popCloneStateId, next);
// Clone a CCP
@@ -163,8 +163,8 @@
State ccpCloneState = stateStore.loadState(ccpCloneStateId);
assertNotNull(popCloneState);
assertEquals("PortletId", popCloneState.getPortletId());
- expected = new SimpleValueMap();
- expected.setValue("ghi", new StringValue("jkl"));
+ expected = new SimplePropertyMap();
+ expected.setProperty("ghi", new StringValue("jkl"));
ValueMapAssert.assertEquals(expected, ccpCloneState.getProperties());
}
@@ -262,7 +262,7 @@
public void testDestroyCCP() throws Exception
{
nextInvoker.addPortlet(new PortletSupport("PortletId"));
- String stateId = stateStore.createState("PortletId", new SimpleValueMap());
+ String stateId = stateStore.createState("PortletId", new SimplePropertyMap());
String cloneId = invoker.wrapCCPId(stateId);
invoker.destroyClone(cloneId);
try
@@ -376,10 +376,10 @@
}
});
String popId = invoker.wrapPOPId("PortletId");
- ValueMap props = invoker.getProperties(popId);
- ValueMap expectedProps = new SimpleValueMap();
- expectedProps.setValue("abc", new StringValue("def"));
- expectedProps.setValue("ghi", new StringValue("jkl"));
+ PropertyMap props = invoker.getProperties(popId);
+ PropertyMap expectedProps = new SimplePropertyMap();
+ expectedProps.setProperty("abc", new StringValue("def"));
+ expectedProps.setProperty("ghi", new StringValue("jkl"));
ValueMapAssert.assertEquals(expectedProps, props);
}
@@ -394,17 +394,17 @@
info.getPreferencesSupport().addPreference("stu", new StringValue("vwx"), Boolean.TRUE);
}
});
- ValueMap ccpProps = new SimpleValueMap();
- ccpProps.setValue("abc", new StringValue("_def"));
- ccpProps.setValue("mno", new StringValue("_pqr"));
+ PropertyMap ccpProps = new SimplePropertyMap();
+ ccpProps.setProperty("abc", new StringValue("_def"));
+ ccpProps.setProperty("mno", new StringValue("_pqr"));
String stateId = stateStore.createState("PortletId", ccpProps);
String ccpId = invoker.wrapCCPId(stateId);
- ValueMap props = invoker.getProperties(ccpId);
- ValueMap expectedProps = new SimpleValueMap();
- expectedProps.setValue("abc", new StringValue("_def"));
- expectedProps.setValue("ghi", new StringValue("jkl"));
- expectedProps.setValue("mno", new StringValue("pqr"));
- expectedProps.setValue("stu", new StringValue("vwx"));
+ PropertyMap props = invoker.getProperties(ccpId);
+ PropertyMap expectedProps = new SimplePropertyMap();
+ expectedProps.setProperty("abc", new StringValue("_def"));
+ expectedProps.setProperty("ghi", new StringValue("jkl"));
+ expectedProps.setProperty("mno", new StringValue("pqr"));
+ expectedProps.setProperty("stu", new StringValue("vwx"));
ValueMapAssert.assertEquals(expectedProps, props);
}
@@ -412,7 +412,7 @@
{
try
{
- invoker.setProperties(null, new SimpleValueMap());
+ invoker.setProperties(null, new SimplePropertyMap());
fail("Was expecting an IllegalArgumentException");
}
catch (IllegalArgumentException expected)
@@ -439,7 +439,7 @@
String popId = invoker.wrapPOPId("PortletId");
try
{
- invoker.setProperties(popId, new SimpleValueMap());
+ invoker.setProperties(popId, new SimplePropertyMap());
fail("Was expecting an InvalidPortletIdException");
}
catch (InvalidPortletIdException expected)
@@ -452,7 +452,7 @@
String ccpId = invoker.wrapCCPId("1");
try
{
- invoker.setProperties(ccpId, new SimpleValueMap());
+ invoker.setProperties(ccpId, new SimplePropertyMap());
fail("Was expecting a NoSuchPortletException");
}
catch (NoSuchPortletException expected)
@@ -462,7 +462,7 @@
public void testSetCCPProperties() throws Exception
{
- String stateId = stateStore.createState("PortletId", new SimpleValueMap());
+ String stateId = stateStore.createState("PortletId", new SimplePropertyMap());
nextInvoker.addPortlet(new PortletSupport("PortletId")
{
{
@@ -473,17 +473,17 @@
}
});
String ccpId = invoker.wrapCCPId(stateId);
- SimpleValueMap newProperties = new SimpleValueMap();
- newProperties.setValue("abc", new StringValue("def"));
- newProperties.setValue("ghi", new StringValue("_jkl"));
- newProperties.setValue("mno", new StringValue("pqr"));
- newProperties.setValue("stu", new StringValue("_vwx"));
+ SimplePropertyMap newProperties = new SimplePropertyMap();
+ newProperties.setProperty("abc", new StringValue("def"));
+ newProperties.setProperty("ghi", new StringValue("_jkl"));
+ newProperties.setProperty("mno", new StringValue("pqr"));
+ newProperties.setProperty("stu", new StringValue("_vwx"));
invoker.setProperties(ccpId, newProperties);
State state = stateStore.loadState(stateId);
- ValueMap props = state.getProperties();
- ValueMap expectedProps = new SimpleValueMap();
- expectedProps.setValue("abc", new StringValue("def"));
- expectedProps.setValue("ghi", new StringValue("_jkl"));
+ PropertyMap props = state.getProperties();
+ PropertyMap expectedProps = new SimplePropertyMap();
+ expectedProps.setProperty("abc", new StringValue("def"));
+ expectedProps.setProperty("ghi", new StringValue("_jkl"));
ValueMapAssert.assertEquals(expectedProps, props);
}
More information about the jboss-cvs-commits
mailing list