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

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2009-11-12 18:13:56 -0500 (Thu, 12 Nov 2009)
New Revision: 581

Modified:
   components/wsrp/trunk/consumer/pom.xml
   components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/ServiceDescriptionBehavior.java
Log:
- Fixed ServiceDescriptionBehavior.setServiceDescription method.
- Re-activated ProducerInfoTestCase which now passes.

Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml	2009-11-12 18:46:35 UTC (rev 580)
+++ components/wsrp/trunk/consumer/pom.xml	2009-11-12 23:13:56 UTC (rev 581)
@@ -111,7 +111,6 @@
                   <exclude>org/gatein/wsrp/protocol/v1/*</exclude>
                   <exclude>org/gatein/wsrp/consumer/ConsumerRegistryTestCase*</exclude>
                   <exclude>org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase*</exclude>
-                  <exclude>org/gatein/wsrp/consumer/ProducerInfoTestCase*</exclude>
                </excludes>
             </configuration>
          </plugin>

Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/ServiceDescriptionBehavior.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/ServiceDescriptionBehavior.java	2009-11-12 18:46:35 UTC (rev 580)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/ServiceDescriptionBehavior.java	2009-11-12 23:13:56 UTC (rev 581)
@@ -61,6 +61,7 @@
    protected List<PortletDescription> offeredPortlets;
    private boolean requiresRegistration;
    private CookieProtocol cookieProtocol;
+   private ModelDescription registrationProperties;
 
    public ServiceDescriptionBehavior()
    {
@@ -79,7 +80,10 @@
 
    public void setServiceDescription(boolean requiresRegistration, int numberOfProps)
    {
-      serviceDescription = createServiceDescription(requiresRegistration, numberOfProps);
+      ServiceDescription sd = createServiceDescription(requiresRegistration, numberOfProps);
+      offeredPortlets = sd.getOfferedPortlets();
+      this.requiresRegistration = sd.isRequiresRegistration();
+      registrationProperties = sd.getRegistrationPropertyDescription();
    }
 
    public static ServiceDescription getDefaultServiceDescription()
@@ -145,5 +149,6 @@
       offeredPortlets.value = this.offeredPortlets;
       requiresRegistration.value = this.requiresRegistration;
       requiresInitCookie.value = this.cookieProtocol;
+      registrationPropertyDescription.value = registrationProperties;
    }
 }