[gatein-commits] gatein SVN: r8003 - in components/wsrp/trunk/consumer/src: test/java/org/gatein/wsrp/protocol/v2 and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2011-11-07 12:57:26 -0500 (Mon, 07 Nov 2011) New Revision: 8003 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java Log: - GTNWSRP-262: fixed tests by setting import/export option on ProducerInfo for tests. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-11-07 16:05:27 UTC (rev 8002) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-11-07 17:57:26 UTC (rev 8003) @@ -40,6 +40,7 @@ import org.gatein.wsrp.consumer.portlet.info.WSRPPortletInfo; import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import org.gatein.wsrp.servlet.UserAccess; +import org.gatein.wsrp.spec.v2.WSRP2Constants; import org.oasis.wsrp.v2.CookieProtocol; import org.oasis.wsrp.v2.EventDescription; import org.oasis.wsrp.v2.ExportDescription; @@ -66,7 +67,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.namespace.QName; import javax.xml.ws.Holder; -import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -145,7 +146,7 @@ private transient Map<QName, EventInfo> eventDescriptions; /** Supported options */ - private transient List<String> supportedOptions = Collections.emptyList(); + private transient Set<String> supportedOptions = Collections.emptySet(); /*protected org.oasis.wsrp.v1.ItemDescription[] userCategoryDescriptions; protected org.oasis.wsrp.v1.ItemDescription[] customUserProfileItemDescriptions; @@ -511,7 +512,7 @@ final List<String> supportedOptions = serviceDescription.getSupportedOptions(); if (ParameterValidation.existsAndIsNotEmpty(supportedOptions)) { - this.supportedOptions = new ArrayList<String>(supportedOptions); + this.supportedOptions = new HashSet<String>(supportedOptions); } // custom mode descriptions @@ -1307,8 +1308,31 @@ this.lastModified = lastModified; } - public List<String> getSupportedOptions() + public Collection<String> getSupportedOptions() { - return supportedOptions; + return Collections.unmodifiableSet(supportedOptions); } + + /** + * Public for tests + * + * @param option + */ + public void setSupportedOption(String option) + { + if (WSRP2Constants.OPTIONS_COPYPORTLETS.equals(option) || WSRP2Constants.OPTIONS_EVENTS.equals(option) + || WSRP2Constants.OPTIONS_EXPORT.equals(option) || WSRP2Constants.OPTIONS_IMPORT.equals(option) + || WSRP2Constants.OPTIONS_LEASING.equals(option)) + { + if (supportedOptions.isEmpty()) + { + supportedOptions = new HashSet<String>(5); + } + supportedOptions.add(option); + } + else + { + throw new IllegalArgumentException("Invalid option: " + option); + } + } } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-11-07 16:05:27 UTC (rev 8002) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-11-07 17:57:26 UTC (rev 8003) @@ -93,6 +93,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Holder; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; @@ -530,7 +531,7 @@ public boolean isImportExportSupported() { - final List<String> supportedOptions = producerInfo.getSupportedOptions(); + final Collection<String> supportedOptions = producerInfo.getSupportedOptions(); return isUsingWSRP2() && supportedOptions.contains(WSRP2Constants.OPTIONS_IMPORT) && supportedOptions.contains(WSRP2Constants.OPTIONS_EXPORT); } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java 2011-11-07 16:05:27 UTC (rev 8002) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java 2011-11-07 17:57:26 UTC (rev 8003) @@ -27,6 +27,7 @@ import org.gatein.wsrp.consumer.EndpointConfigurationInfo; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.WSRPConsumerImpl; +import org.gatein.wsrp.spec.v2.WSRP2Constants; import org.gatein.wsrp.test.ExtendedAssert; import org.gatein.wsrp.test.protocol.v2.BehaviorBackedServiceFactory; import org.gatein.wsrp.test.protocol.v2.BehaviorRegistry; @@ -81,6 +82,10 @@ ProducerInfo producerInfo = consumer.getProducerInfo(); producerInfo.setId(TEST_PRODUCER_ID); + // set import/export option + producerInfo.setSupportedOption(WSRP2Constants.OPTIONS_EXPORT); + producerInfo.setSupportedOption(WSRP2Constants.OPTIONS_IMPORT); + // reset the behaviors BehaviorRegistry registry = producer.getBehaviorRegistry(); setServiceDescriptionBehavior(null);