[portal-commits] JBoss Portal SVN: r5902 - in trunk/wsrp/src/main/org/jboss/portal: test/wsrp/v1/producer wsrp/producer

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-12-19 12:29:13 -0500 (Tue, 19 Dec 2006)
New Revision: 5902

Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java
Log:
- Fixed test case: was using incorrect handle thus resulting in failure.
- Adjusted thrown exception when trying to setPortletProperties on POP.

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java	2006-12-19 14:46:18 UTC (rev 5901)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java	2006-12-19 17:29:13 UTC (rev 5902)
@@ -34,8 +34,8 @@
 import org.jboss.portal.wsrp.core.GetPortletProperties;
 import org.jboss.portal.wsrp.core.GetPortletPropertyDescription;
 import org.jboss.portal.wsrp.core.GetServiceDescription;
+import org.jboss.portal.wsrp.core.InconsistentParametersFault;
 import org.jboss.portal.wsrp.core.ModelDescription;
-import org.jboss.portal.wsrp.core.OperationFailedFault;
 import org.jboss.portal.wsrp.core.PortletContext;
 import org.jboss.portal.wsrp.core.PortletDescriptionResponse;
 import org.jboss.portal.wsrp.core.PortletPropertyDescriptionResponse;
@@ -188,12 +188,13 @@
       checkGetPropertiesResponse(portletManagementService.getPortletProperties(getPortletProperties), properties);
 
       portletContext = WSRPTypeFactory.createPortletContext(handle);
+      setPortletProperties.setPortletContext(portletContext);
       try
       {
          response = portletManagementService.setPortletProperties(setPortletProperties);
          ExtendedAssert.fail("Setting properties on Producer-Offered Portlet should fail...");
       }
-      catch (OperationFailedFault expected)
+      catch (InconsistentParametersFault expected)
       {
       }
    }

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java	2006-12-19 14:46:18 UTC (rev 5901)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java	2006-12-19 17:29:13 UTC (rev 5902)
@@ -301,7 +301,7 @@
          }
          catch (InvalidPortletIdException e)
          {
-            throw (InvalidHandleFault)WSRPUtils.createFaultFrom(InvalidHandleFault.class, e);
+            throw (InconsistentParametersFault)WSRPUtils.createFaultFrom(InconsistentParametersFault.class, e);
          }
          catch (NoSuchPortletException e)
          {