svn commit: r632705 - /portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java

[es...@apache.org]

Author: esm
Date: Sat Mar  1 19:24:15 2008
New Revision: 632705

URL: http://svn.apache.org/viewvc?rev=632705&view=rev
Log:
[PLUTO-448]: Updated test for 2.0.  In Pluto 2.0, PortletDD has no getExpirationCache() method, instead it has getExpirationCacheDD; it returns null when no expiration cache has been set in the portlet.

Modified:
    portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java

Modified: portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java?rev=632705&r1=632704&r2=632705&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java Sat Mar  1 19:24:15 2008
@@ -44,8 +44,12 @@
 	private StringBuffer xmlBegin168 = new StringBuffer();
 	private StringBuffer portlet168 = new StringBuffer();
 	private StringBuffer attrs168 = new StringBuffer();
-	
-	PortletAppDescriptorServiceImpl jaxb = new PortletAppDescriptorServiceImpl();
+
+    private StringBuffer portlet286NoCache = new StringBuffer();
+    private StringBuffer portlet168NoCache = new StringBuffer();
+    private StringBuffer portletNoCache = new StringBuffer();
+
+    PortletAppDescriptorServiceImpl jaxb = new PortletAppDescriptorServiceImpl();
 
 	/**
 	 * @throws java.lang.Exception
@@ -254,7 +258,35 @@
 			  "</security-constraint>\n" +
 			  "<resource-bundle>resource-bundle</resource-bundle>\n" +
 		"" );
-	}
+
+        portletNoCache.append(
+            "<portlet>"+
+            "<description>AboutPortletDescription</description>"+
+            "<portlet-name>AboutPortlet</portlet-name>"+
+            "<display-name>About Portlet</display-name>"+
+            "<display-name xml:lang=\"fr\">About Portlet</display-name>"+
+            "<portlet-class>org.apache.pluto.driver.portlets.AboutPortlet</portlet-class>"+
+            "        <init-param>\n" +
+            "            <description>a</description>\n" +
+            "            <name>b</name>\n" +
+            "            <value>v</value>\n" +
+            "        </init-param>" +
+            "<supports>"+
+            "<mime-type>text/html</mime-type>"+
+            "<portlet-mode>VIEW</portlet-mode>"+
+            "<portlet-mode>EDIT</portlet-mode>"+
+            "<portlet-mode>HELP</portlet-mode>"+
+            "</supports>"+
+            "<supported-locale>en</supported-locale>"+
+            "<portlet-info>"+
+            "<title>About Apache Pluto</title>"+
+            "</portlet-info>"+
+            "</portlet>"
+            );
+
+        portlet286NoCache.append( xmlBegin286 ).append( portletNoCache ).append( attrs286 ).append( xmlEnd );
+        portlet168NoCache.append( xmlBegin168 ).append( portletNoCache ).append( attrs168 ).append( xmlEnd );
+    }
 
 	/**
 	 * @throws java.lang.Exception
@@ -358,6 +390,28 @@
 		} catch (IOException ioe){
 			
 		}
+    }
+
+    public void testParseNoExpirationCache168() throws IOException {
+        InputStream inputStream = new ByteArrayInputStream(portlet168NoCache.toString().getBytes());
+        PortletAppDD portletDD = jaxb.read( inputStream );
+
+        assertEquals( "1.0", portletDD.getVersion() );
+        assertEquals( 1, portletDD.getPortlets().size() );
+
+        PortletDD pd = (PortletDD) portletDD.getPortlets().get( 0 );
+        assertNull( pd.getExpirationCacheDD() );
+    }
+
+    public void testParseNoExpirationCache286() throws IOException {
+        InputStream inputStream = new ByteArrayInputStream(portlet286NoCache.toString().getBytes());
+        PortletAppDD portletDD = jaxb.read( inputStream );
+
+        assertEquals( "2.0", portletDD.getVersion() );
+        assertEquals( 1, portletDD.getPortlets().size() );
+
+        PortletDD pd = (PortletDD) portletDD.getPortlets().get( 0 );
+        assertNull( pd.getExpirationCacheDD() );
     }
 
 }