[gatein-commits] gatein SVN: r3391 - in components/wsrp/trunk/wsrp-producer-war/src/test: test-portlets/test-basic-portlet-war/WEB-INF and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-06-20 08:09:52 -0400 (Sun, 20 Jun 2010)
New Revision: 3391

Modified:
   components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
   components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
Log:
- Added tests for parameter descriptions.

Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java	2010-06-19 09:44:10 UTC (rev 3390)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java	2010-06-20 12:09:52 UTC (rev 3391)
@@ -26,7 +26,6 @@
 import org.gatein.common.util.ParameterValidation;
 import org.gatein.wsrp.producer.WSRPProducerBaseTest;
 import org.gatein.wsrp.protocol.v1.NeedPortletHandleTest;
-import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest;
 import org.gatein.wsrp.servlet.ServletAccess;
 import org.gatein.wsrp.spec.v2.WSRP2Constants;
 import org.gatein.wsrp.test.ExtendedAssert;
@@ -43,6 +42,7 @@
 import org.oasis.wsrp.v2.EventDescription;
 import org.oasis.wsrp.v2.InvalidRegistration;
 import org.oasis.wsrp.v2.OperationFailed;
+import org.oasis.wsrp.v2.ParameterDescription;
 import org.oasis.wsrp.v2.PortletDescription;
 import org.oasis.wsrp.v2.ServiceDescription;
 
@@ -195,21 +195,52 @@
 
    }
 
-   /*@Test
+   @Test
    public void testParameterDescriptions() throws Exception
    {
       try
       {
-         deploy("google-portlet.war");
+         deploy("test-basic-portlet.war");
 
          ServiceDescription description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest());
 
-         description.get
+         List<PortletDescription> portlets = description.getOfferedPortlets();
+         ExtendedAssert.assertEquals(1, portlets.size());
+         PortletDescription portlet = portlets.get(0);
+         QName fooparam = new QName("urn:jboss:gatein", "fooparam");
+         QName zipcode = new QName("urn:jboss:portal:simple:google", "zipcode");
+
+         List<ParameterDescription> publicValueDescriptions = portlet.getNavigationalPublicValueDescriptions();
+         ExtendedAssert.assertNotNull(publicValueDescriptions);
+         ExtendedAssert.assertEquals(2, publicValueDescriptions.size());
+         for (ParameterDescription param : publicValueDescriptions)
+         {
+            String identifier = param.getIdentifier();
+            if ("foo".equals(identifier))
+            {
+               List<QName> names = param.getNames();
+               ExtendedAssert.assertTrue(names.contains(fooparam));
+               ExtendedAssert.assertTrue(names.contains(new QName("urn:jboss:gatein", "barparam")));
+               ExtendedAssert.assertTrue(names.contains(new QName("urn:jboss:gatein", "bazparam")));
+               ExtendedAssert.assertEquals(identifier, param.getLabel().getValue());
+               ExtendedAssert.assertEquals("Foo param", param.getDescription().getValue());
+            }
+            else if ("zipcode".equals(identifier))
+            {
+               List<QName> names = param.getNames();
+               ExtendedAssert.assertEquals(1, names.size());
+               ExtendedAssert.assertTrue(names.contains(zipcode));
+            }
+            else
+            {
+               ExtendedAssert.fail("Unexpected parameter description: " + identifier);
+            }
+         }
       }
       finally
       {
-         undeploy("google-portlet.war");
+         undeploy("test-basic-portlet.war");
       }
 
-   }*/
+   }
 }

Modified: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml	2010-06-19 09:44:10 UTC (rev 3390)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml	2010-06-20 12:09:52 UTC (rev 3391)
@@ -60,6 +60,7 @@
          <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname>
       </supported-processing-event>
       <supported-public-render-parameter>zipcode</supported-public-render-parameter>
+      <supported-public-render-parameter>foo</supported-public-render-parameter>
    </portlet>
 
    <event-definition>
@@ -79,7 +80,10 @@
    </public-render-parameter>
    <public-render-parameter>
       <identifier>foo</identifier>
-      <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname>
+      <qname xmlns:gtn='urn:jboss:gatein'>gtn:fooparam</qname>
+      <description>Foo param</description>
+      <alias xmlns:gtn='urn:jboss:gatein'>gtn:barparam</alias>
+      <alias xmlns:gtn='urn:jboss:gatein'>gtn:bazparam</alias>
    </public-render-parameter>
 
    <container-runtime-option>