Author: chris.laprun(a)jboss.com Date: 2007-02-26 09:46:22 -0500 (Mon, 26 Feb 2007) New Revision: 6401 Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockWSRPConsumer.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ProducerSessionInformationTestCase.java Log: Fixed testcases by adding support for ProducerInfo in MockWSRPConsumer and for persistConsumer in MockConsumerRegistry. Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-26 03:58:07 UTC (rev 6400) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-26 14:46:22 UTC (rev 6401) @@ -23,6 +23,7 @@ package org.jboss.portal.test.wsrp.deployment; +import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.test.wsrp.framework.support.MockWSRPConsumer; import org.jboss.portal.wsrp.WSRPConsumer; @@ -44,8 +45,8 @@ public MockConsumerRegistry() { - consumers.put("inDB", new MockWSRPConsumer()); - consumers.put("inDB2", new MockWSRPConsumer()); + consumers.put("inDB", new MockWSRPConsumer("inDB")); + consumers.put("inDB2", new MockWSRPConsumer("inDB2")); } public Collection getConfiguredConsumers() @@ -70,7 +71,8 @@ public void persistConsumer(WSRPConsumer consumer) { - throw new UnsupportedOperationException("persistConsumer is not supported on MockConsumerRegistry"); + ParameterValidation.throwIllegalArgExceptionIfNull(consumer, "WSRPConsumer"); + consumers.put(consumer.getProducerId(), consumer); } } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockWSRPConsumer.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockWSRPConsumer.java 2007-02-26 03:58:07 UTC (rev 6400) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockWSRPConsumer.java 2007-02-26 14:46:22 UTC (rev 6401) @@ -46,9 +46,17 @@ */ public class MockWSRPConsumer implements WSRPConsumer { + private ProducerInfo producerInfo; + + public MockWSRPConsumer(String id) + { + producerInfo = new ProducerInfo(); + producerInfo.setId(id); + } + public String getProducerId() { - return null; + return producerInfo.getId(); } public void setServiceFactory(ServiceFactory serviceFactory) @@ -72,7 +80,7 @@ public ProducerInfo getProducerInfo() { - return null; + return producerInfo; } public void setProducerInfo(ProducerInfo producerInfo) Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ProducerSessionInformationTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ProducerSessionInformationTestCase.java 2007-02-26 03:58:07 UTC (rev 6400) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ProducerSessionInformationTestCase.java 2007-02-26 14:46:22 UTC (rev 6401) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { info = new ProducerSessionInformation(); - info.setAssociatedConsumer(new MockWSRPConsumer()); + info.setAssociatedConsumer(new MockWSRPConsumer("id")); } public void testUserCookie() throws Exception