Author: jkuhnert
Date: Mon May 28 15:41:34 2007
New Revision: 542355
URL: http://svn.apache.org/viewvc?view=rev&rev=542355
Log:
Fixes TAPESTRY-1256. Removed idiotic flush() in
RequestCycle.commitPageChanges() call I had added in for a previous issue
because I was too lazy to figure out what was actually happening apparently.
Moral of story - don't second guess the servlet container PrintWriter buffer
and when it wants to flush things out. Esp. with Tomcat. grr
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/state/SessionScopeManager.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebRequest.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebResponse.java
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/ExceptionService.java
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebRequest.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
Mon May 28 15:41:34 2007
@@ -14,29 +14,13 @@
package org.apache.tapestry.engine;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.util.Defense;
import org.apache.hivemind.util.ToStringBuilder;
-import org.apache.tapestry.ApplicationServlet;
-import org.apache.tapestry.Constants;
-import org.apache.tapestry.IEngine;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.PageRedirectException;
-import org.apache.tapestry.RedirectException;
-import org.apache.tapestry.StaleLinkException;
-import org.apache.tapestry.StaleSessionException;
+import org.apache.tapestry.*;
import org.apache.tapestry.listener.ListenerMap;
import org.apache.tapestry.services.ComponentMessagesSource;
import org.apache.tapestry.services.DataSqueezer;
@@ -46,6 +30,13 @@
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
/**
* Basis for building real Tapestry applications. Immediate subclasses provide
different strategies
* for managing page state and other resources between request cycles.
@@ -479,7 +470,7 @@
*
* @throws ApplicationRuntimeException
* if an [EMAIL PROTECTED] IOException},[EMAIL PROTECTED]
ServletException}is thrown by the redirect,
- * or if no [EMAIL PROTECTED] RequestDispatcher}can be found
for local resource.
+ * or if no [EMAIL PROTECTED] javax.servlet.RequestDispatcher}
can be found for local resource.
* @since 2.2
*/
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
Mon May 28 15:41:34 2007
@@ -507,7 +507,7 @@
}
/**
- * Invokes [EMAIL PROTECTED] IPageRecorder#commit()}on each page recorder
loaded during the request cycle
+ * Invokes [EMAIL PROTECTED] IPageRecorder#commit()} on each page recorder
loaded during the request cycle
* (even recorders marked for discard).
*/
@@ -526,20 +526,6 @@
IPageRecorder recorder = (IPageRecorder) i.next();
recorder.commit();
- }
-
- try {
-
- // cause headers / cookies to be flushed out to browser
-
- _responseBuilder.flush();
-
- } catch (Throwable ex)
- {
- // But wrap other exceptions in a ApplicationRuntimeException ...
this
- // will ensure that some of the context is available.
-
- throw new ApplicationRuntimeException(ex.getMessage(), getPage(),
null, ex);
}
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/state/SessionScopeManager.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/state/SessionScopeManager.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/state/SessionScopeManager.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/state/SessionScopeManager.java
Mon May 28 15:41:34 2007
@@ -80,7 +80,8 @@
{
SessionStoreOptimized optimized = (SessionStoreOptimized)
stateObject;
- if (!optimized.isStoreToSessionNeeded()) return;
+ if (!optimized.isStoreToSessionNeeded())
+ return;
}
String key = buildKey(objectName);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
Mon May 28 15:41:34 2007
@@ -45,6 +45,7 @@
protected boolean isClicked(IRequestCycle cycle, String name)
{
String value = cycle.getParameter(FormConstants.SUBMIT_NAME_PARAMETER);
+
return name.equals(value);
}
@@ -87,7 +88,6 @@
if (!disabled)
writer.end();
-
}
/**
@@ -96,7 +96,7 @@
protected void prepareForRender(IRequestCycle cycle)
{
IComponent outer = (IComponent) cycle.getAttribute(ATTRIBUTE_NAME);
-
+
if (outer != null)
throw new
ApplicationRuntimeException(FormMessages.linkSubmitMayNotNest(this, outer),
this, getLocation(), null);
@@ -128,5 +128,4 @@
{
return true;
}
-
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
Mon May 28 15:41:34 2007
@@ -117,10 +117,6 @@
writeStylesheetLink(writer, cycle, stylesheet);
}
-
- // flush out whatever we have before buffering body
-
- writer.flush();
}
// Render the body, the actual page content
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
Mon May 28 15:41:34 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.services.impl;
+import org.apache.tapestry.services.CookieSource;
+
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tapestry.services.CookieSource;
-
/**
- * Implementation of the [EMAIL PROTECTED]
org.apache.tapestry.services.CookieSource}service interface.
+ * Implementation of the [EMAIL PROTECTED]
org.apache.tapestry.services.CookieSource} service interface.
*
* @author Howard Lewis Ship
* @since 4.0
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
Mon May 28 15:41:34 2007
@@ -13,18 +13,9 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
-import java.io.IOException;
-import java.io.PrintWriter;
-
import org.apache.hivemind.Resource;
import org.apache.hivemind.util.Defense;
-import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IComponent;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRender;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.TapestryUtils;
+import org.apache.tapestry.*;
import org.apache.tapestry.asset.AssetFactory;
import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.markup.MarkupWriterSource;
@@ -34,6 +25,9 @@
import org.apache.tapestry.util.PageRenderSupportImpl;
import org.apache.tapestry.web.WebResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
/**
* Manages normal html responses for tapestry request/response cycles.
@@ -159,6 +153,8 @@
TapestryUtils.removePageRenderSupport(cycle);
+ flush();
+
if (_closeWriter)
_writer.close();
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
Mon May 28 15:41:34 2007
@@ -13,22 +13,9 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.hivemind.Resource;
import org.apache.hivemind.util.Defense;
-import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IComponent;
-import org.apache.tapestry.IJSONRender;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRender;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.TapestryUtils;
+import org.apache.tapestry.*;
import org.apache.tapestry.asset.AssetFactory;
import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.json.IJSONWriter;
@@ -41,6 +28,12 @@
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Class that implements JSON responses in tapestry.
*
@@ -149,6 +142,8 @@
TapestryUtils.removePageRenderSupport(cycle);
+ flush();
+
_writer.close();
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebRequest.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebRequest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebRequest.java
Mon May 28 15:41:34 2007
@@ -14,21 +14,20 @@
package org.apache.tapestry.web;
-import java.io.IOException;
-import java.security.Principal;
-import java.util.List;
-import java.util.Locale;
+import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.hivemind.HiveMind;
+import org.apache.hivemind.util.Defense;
+import org.apache.tapestry.describe.DescriptionReceiver;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-
-import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.HiveMind;
-import org.apache.hivemind.util.Defense;
-import org.apache.tapestry.describe.DescriptionReceiver;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.List;
+import java.util.Locale;
/**
* Adapter from [EMAIL PROTECTED]
javax.servlet.http.HttpServletRequest} to
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebResponse.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebResponse.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebResponse.java
Mon May 28 15:41:34 2007
@@ -14,17 +14,16 @@
package org.apache.tapestry.web;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.util.Defense;
import org.apache.tapestry.util.ContentType;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
/**
* Adapts [EMAIL PROTECTED] javax.servlet.http.HttpServletResponse} as
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/ExceptionService.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/ExceptionService.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/ExceptionService.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/ExceptionService.java
Mon May 28 15:41:34 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.portlet;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.portlet.PortletURL;
-
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
@@ -27,6 +22,10 @@
import org.apache.tapestry.web.WebResponse;
import org.apache.tapestry.web.WebSession;
+import javax.portlet.PortletURL;
+import java.io.IOException;
+import java.io.PrintWriter;
+
/**
* @author Howard M. Lewis Ship
* @since 4.0
@@ -59,8 +58,7 @@
PortletURL url = _globals.getRenderResponse().createActionURL();
- writer
- .println("<span class=\"portlet-msg-error\">An exception has
occured.</span>");
+ writer.println("<span class=\"portlet-msg-error\">An exception has
occured.</span>");
writer.println("<br/>");
writer.println("<a href=\"" + url.toString()
+ "\">Click here to continue</a>");
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
Mon May 28 15:41:34 2007
@@ -56,15 +56,12 @@
IPage page = cycle.getPage();
ContentType contentType = page.getResponseContentType();
-
PrintWriter printWriter = _response.getPrintWriter(contentType);
-
IMarkupWriter writer =
_markupWriterSource.newMarkupWriter(printWriter, contentType);
-
String namespace = _response.getNamespace();
IMarkupWriter nested = writer.getNestedWriter();
-
+
ResponseBuilder builder = new DefaultResponseBuilder(nested,
_assetFactory, namespace, false);
builder.renderResponse(cycle);
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebRequest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebRequest.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebRequest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebRequest.java
Mon May 28 15:41:34 2007
@@ -14,19 +14,18 @@
package org.apache.tapestry.portlet;
-import java.security.Principal;
-import java.util.List;
-import java.util.Locale;
-
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
import org.apache.hivemind.util.Defense;
import org.apache.tapestry.describe.DescriptionReceiver;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
import org.apache.tapestry.web.WebUtils;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+import java.security.Principal;
+import java.util.List;
+import java.util.Locale;
+
/**
* Implementation of [EMAIL PROTECTED] org.apache.tapestry.web.WebRequest}
that adapts a
* [EMAIL PROTECTED] PortletRequest} .
@@ -136,13 +135,13 @@
{
if (attribute == null)
_portletRequest.removeAttribute(name);
- else _portletRequest.setAttribute(name, attribute);
+ else
+ _portletRequest.setAttribute(name, attribute);
}
protected final void unsupported(String methodName)
{
- throw new UnsupportedOperationException(PortletMessages
- .unsupportedMethod(methodName));
+ throw new
UnsupportedOperationException(PortletMessages.unsupportedMethod(methodName));
}
public void describeTo(DescriptionReceiver receiver)
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java?view=diff&rev=542355&r1=542354&r2=542355
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletRenderer.java
Mon May 28 15:41:34 2007
@@ -14,29 +14,19 @@
package org.apache.tapestry.portlet;
-import static org.easymock.EasyMock.checkOrder;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.matches;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-
import org.apache.hivemind.Location;
-import org.apache.tapestry.BaseComponentTestCase;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.NestedMarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.*;
import org.apache.tapestry.asset.AssetFactory;
import org.apache.tapestry.markup.MarkupWriterSource;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.util.ContentType;
import org.apache.tapestry.web.WebResponse;
+import static org.easymock.EasyMock.*;
import org.testng.annotations.Test;
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+
/**
* Tests for [EMAIL PROTECTED]
org.apache.tapestry.portlet.PortletRendererImpl}.
*
@@ -129,13 +119,15 @@
PrintWriter pw = newPrintWriter();
WebResponse response = newWebResponse(ct, pw);
-
IMarkupWriter nested = newNestedWriter();
+ checkOrder(nested, false);
IMarkupWriter writer = newWriter();
-
+
expect(writer.getNestedWriter()).andReturn((NestedMarkupWriter)nested);
-
+
+ nested.flush();
+
MarkupWriterSource source = newSource(pw, ct, writer);
IPage page = newPage(ct);
AssetFactory assetFactory = newAssetFactory();
