svn commit: r395896 - in /tapestry/tapestry4/trunk/portlet/src: java/org/apache/tapestry/portlet/PortletRendererImpl.java test/org/apache/tapestry/portlet/TestPortletRenderer.java

[jkuhnert]

Author: jkuhnert
Date: Fri Apr 21 07:17:35 2006
New Revision: 395896

URL: http://svn.apache.org/viewcvs?rev=395896&view=rev
Log:
Oops. Somehow missed this unit test.

Modified:
    
tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
    
tapestry/tapestry4/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java

Modified: 
tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
URL: 
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java?rev=395896&r1=395895&r2=395896&view=diff
==============================================================================
--- 
tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
 (original)
+++ 
tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
 Fri Apr 21 07:17:35 2006
@@ -72,12 +72,11 @@
         TapestryUtils.storePageRenderSupport(cycle, support);
 
         IMarkupWriter nested = writer.getNestedWriter();
-
+        
         ResponseBuilder builder = new DefaultResponseBuilder(nested);
-
+        
         builder.renderResponse(cycle);
-        // cycle.renderPage(builder);
-
+        
         String id = "Tapestry Portlet " + _applicationId + " " + namespace;
 
         writer.comment("BEGIN " + id);
@@ -87,7 +86,7 @@
 
         support.writeBodyScript(writer, cycle);
 
-        nested.close();
+        // nested.close();
 
         support.writeInitializationScript(writer);
 

Modified: 
tapestry/tapestry4/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
URL: 
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java?rev=395896&r1=395895&r2=395896&view=diff
==============================================================================
--- 
tapestry/tapestry4/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
 (original)
+++ 
tapestry/tapestry4/trunk/portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
 Fri Apr 21 07:17:35 2006
@@ -28,8 +28,6 @@
 import org.apache.tapestry.NestedMarkupWriter;
 import org.apache.tapestry.asset.AssetFactory;
 import org.apache.tapestry.markup.MarkupWriterSource;
-import org.apache.tapestry.services.ResponseBuilder;
-import org.apache.tapestry.services.impl.DefaultResponseBuilder;
 import org.apache.tapestry.util.ContentType;
 import org.apache.tapestry.util.PageRenderSupportImpl;
 import org.apache.tapestry.web.WebResponse;
@@ -118,7 +116,10 @@
                 newAssetFactory(), "", null));
         control.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
         { null, new TypeMatcher() }));
-
+        
+        cycle.renderPage(null);
+        control.setMatcher(MockControl.ALWAYS_MATCHER);
+        
         return cycle;
     }
 
@@ -140,10 +141,6 @@
         AssetFactory assetFactory = newAssetFactory();
 
         IRequestCycle cycle = newCycle("ZePage", page);
-        
-        ResponseBuilder builder = new DefaultResponseBuilder(writer);
-        
-        cycle.renderPage(builder);
         
         writer.comment("BEGIN Tapestry Portlet appId NAMESPACE");
         writer.comment("Page: ZePage");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]