Author: jkuhnert
Date: Tue Apr 18 16:50:41 2006
New Revision: 395087
URL: http://svn.apache.org/viewcvs?rev=395087&view=rev
Log:
Finally! All unit tests are working now.
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractPage.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/NullWriter.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/Form.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
tapestry/tapestry4/trunk/framework/src/test-data/context18/NestedGroups.html
tapestry/tapestry4/trunk/framework/src/test-data/context18/WEB-INF/Home.page
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/MockTester.java
tapestry/tapestry4/trunk/portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractComponent.java
Tue Apr 18 16:50:41 2006
@@ -431,7 +431,7 @@
public void renderBody(IMarkupWriter writer, IRequestCycle cycle)
{
for (int i = 0; i < _bodyCount; i++)
- cycle.getResponseBuilder().render(_body[i], cycle);
+ cycle.getResponseBuilder().render(writer, _body[i], cycle);
}
/**
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractPage.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractPage.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractPage.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/AbstractPage.java
Tue Apr 18 16:50:41 2006
@@ -22,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.event.ChangeObserver;
import org.apache.tapestry.event.PageAttachListener;
import org.apache.tapestry.event.PageBeginRenderListener;
@@ -241,12 +242,12 @@
{
firePageBeginRender();
- beginResponse(builder.getWriter(), cycle);
+ beginResponse(cycle.isRewinding() ? NullWriter.getSharedInstance()
: builder.getWriter(), cycle);
if (!cycle.isRewinding())
cycle.commitPageChanges();
- builder.render(this, cycle);
+ builder.render(cycle.isRewinding() ?
NullWriter.getSharedInstance() : null, this, cycle);
}
finally
{
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/BaseComponent.java
Tue Apr 18 16:50:41 2006
@@ -89,7 +89,7 @@
LOG.debug("Begin render " + getExtendedId());
for (int i = 0; i < _outerCount; i++)
- cycle.getResponseBuilder().render(_outer[i], cycle);
+ cycle.getResponseBuilder().render(writer, _outer[i], cycle);
if (LOG.isDebugEnabled())
LOG.debug("End render " + getExtendedId());
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/NullWriter.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/NullWriter.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/NullWriter.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/NullWriter.java
Tue Apr 18 16:50:41 2006
@@ -159,4 +159,4 @@
public void print(String value, boolean raw)
{
}
-}
\ No newline at end of file
+}
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/Form.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/Form.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/Form.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/Form.java
Tue Apr 18 16:50:41 2006
@@ -327,7 +327,7 @@
public void rewind(IMarkupWriter writer, IRequestCycle cycle)
{
- render(writer, cycle);
+ cycle.getResponseBuilder().render(writer, this, cycle);
}
/**
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java
Tue Apr 18 16:50:41 2006
@@ -23,8 +23,9 @@
import org.apache.tapestry.engine.ILink;
/**
- * Default implementation of [EMAIL PROTECTED]
org.apache.tapestry.link.ILinkRenderer}, which does nothing
- * special. Can be used as a base class to provide additional handling.
+ * Default implementation of [EMAIL PROTECTED]
org.apache.tapestry.link.ILinkRenderer},
+ * which does nothing special. Can be used as a base class to provide
additional
+ * handling.
*
* @author Howard Lewis Ship, David Solis
* @since 3.0
@@ -32,21 +33,25 @@
public class DefaultLinkRenderer implements ILinkRenderer
{
+
/**
- * A shared instance used as a default for any link that doesn't
explicitly override.
+ * A shared instance used as a default for any link that doesn't explicitly
+ * override.
*/
public static final ILinkRenderer SHARED_INSTANCE = new
DefaultLinkRenderer();
- public void renderLink(IMarkupWriter writer, IRequestCycle cycle,
ILinkComponent linkComponent)
+ public void renderLink(IMarkupWriter writer, IRequestCycle cycle,
+ ILinkComponent linkComponent)
{
IMarkupWriter wrappedWriter = null;
if (cycle.getAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(LinkMessages.noNesting(),
linkComponent, null,
- null);
+ throw new ApplicationRuntimeException(LinkMessages.noNesting(),
+ linkComponent, null, null);
- cycle.setAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME,
linkComponent);
+ cycle.setAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME,
+ linkComponent);
boolean hasBody = getHasBody();
@@ -56,45 +61,45 @@
{
if (hasBody)
writer.begin(getElement());
- else
+ else
writer.beginEmpty(getElement());
-
- writer.attribute(getUrlAttribute(), constructURL(linkComponent,
cycle));
-
+
+ writer.attribute(getUrlAttribute(), constructURL(linkComponent,
+ cycle));
+
String target = linkComponent.getTarget();
-
+
if (HiveMind.isNonBlank(target))
writer.attribute(getTargetAttribute(), target);
-
+
beforeBodyRender(writer, cycle, linkComponent);
-
+
// Allow the wrapped components a chance to render.
// Along the way, they may interact with this component
// and cause the name variable to get set.
wrappedWriter = writer.getNestedWriter();
}
- else
+ else
wrappedWriter = writer;
- if (hasBody)
- linkComponent.renderBody(wrappedWriter, cycle);
+ if (hasBody) linkComponent.renderBody(wrappedWriter, cycle);
if (!disabled)
{
afterBodyRender(writer, cycle, linkComponent);
-
+
linkComponent.renderAdditionalAttributes(writer, cycle);
-
+
if (hasBody)
{
wrappedWriter.close();
-
+
// Close the <element> tag
-
+
writer.end();
}
- else
+ else
writer.closeTag();
}
@@ -102,8 +107,9 @@
}
/**
- * Converts the EngineServiceLink into a URI or URL. This implementation
gets the scheme and
- * anchor from the component (both of which may be null), and invokes
+ * Converts the EngineServiceLink into a URI or URL. This implementation
+ * gets the scheme and anchor from the component (both of which may be
+ * null), and invokes
* [EMAIL PROTECTED] ILink#getURL(String, String, int, String, boolean)}.
*/
@@ -115,30 +121,32 @@
Integer port = component.getPort();
int portI = (port == null) ? 0 : port.intValue();
String anchor = component.getAnchor();
-
+
return link.getURL(scheme, null, portI, anchor, true);
}
/**
- * Invoked after the href attribute has been written but before the body
of the link is rendered
- * (but only if the link is not disabled).
+ * Invoked after the href attribute has been written but before the body of
+ * the link is rendered (but only if the link is not disabled).
* <p>
* This implementation does nothing.
*/
- protected void beforeBodyRender(IMarkupWriter writer, IRequestCycle cycle,
ILinkComponent link)
+ protected void beforeBodyRender(IMarkupWriter writer, IRequestCycle cycle,
+ ILinkComponent link)
{
}
/**
* Invoked after the body of the link is rendered, but before
- * [EMAIL PROTECTED]
ILinkComponent#renderAdditionalAttributes(IMarkupWriter, IRequestCycle)}is
invoked
- * (but only if the link is not disabled).
+ * [EMAIL PROTECTED]
ILinkComponent#renderAdditionalAttributes(IMarkupWriter, IRequestCycle)}is
+ * invoked (but only if the link is not disabled).
* <p>
* This implementation does nothing.
*/
- protected void afterBodyRender(IMarkupWriter writer, IRequestCycle cycle,
ILinkComponent link)
+ protected void afterBodyRender(IMarkupWriter writer, IRequestCycle cycle,
+ ILinkComponent link)
{
}
@@ -163,4 +171,4 @@
{
return true;
}
-}
\ No newline at end of file
+}
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/ResponseBuilder.java
Tue Apr 18 16:50:41 2006
@@ -44,11 +44,14 @@
* under the hood type logic involving ajax/json/normal responses, where
* needed.
*
+ * @param writer
+ * The markup writer to use, this may be ignored or swapped
+ * out for a different writer depending on the implementation
being used.
* @param render The renderable object to render
* @param cycle Render request cycle
*/
- void render(IRender render, IRequestCycle cycle);
+ void render(IMarkupWriter writer, IRender render, IRequestCycle cycle);
/**
* Returns the IMarkupWriter associated with this response, it may or may
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
Tue Apr 18 16:50:41 2006
@@ -122,19 +122,22 @@
*
* [EMAIL PROTECTED]
*/
- public void render(IRender render, IRequestCycle cycle)
+ public void render(IMarkupWriter writer, IRender render, IRequestCycle
cycle)
{
- if (_writer == null)
- render.render(NullWriter.getSharedInstance(), cycle);
- else
+ if (writer == null)
render.render(_writer, cycle);
+ else
+ render.render(writer, cycle);
}
-
+
/**
* [EMAIL PROTECTED]
*/
public IMarkupWriter getWriter()
{
+ if (_writer == null)
+ return NullWriter.getSharedInstance();
+
return _writer;
}
}
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
Tue Apr 18 16:50:41 2006
@@ -134,7 +134,7 @@
/**
* [EMAIL PROTECTED]
*/
- public void render(IRender render, IRequestCycle cycle)
+ public void render(IMarkupWriter writer, IRender render, IRequestCycle
cycle)
{
if (IJSONRender.class.isInstance(render)
&& IComponent.class.isInstance(render))
@@ -150,7 +150,7 @@
json.renderComponent(_writer, cycle);
}
-
+
render.render(_nullWriter, cycle);
}
Modified:
tapestry/tapestry4/trunk/framework/src/test-data/context18/NestedGroups.html
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test-data/context18/NestedGroups.html?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/test-data/context18/NestedGroups.html
(original)
+++
tapestry/tapestry4/trunk/framework/src/test-data/context18/NestedGroups.html
Tue Apr 18 16:50:41 2006
@@ -2,8 +2,8 @@
<body jwcid="@Body">
<form jwcid="@Form">
-<span jwcid="[EMAIL PROTECTED]" selected="ognl:visit.foo">
-<span jwcid="[EMAIL PROTECTED]" selected="ognl:visit.bar"/>
+<span jwcid="[EMAIL PROTECTED]" selected="ognl:'foo'">
+<span jwcid="[EMAIL PROTECTED]" selected="ognl:'bar'"/>
</span>
</form>
Modified:
tapestry/tapestry4/trunk/framework/src/test-data/context18/WEB-INF/Home.page
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test-data/context18/WEB-INF/Home.page?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/test-data/context18/WEB-INF/Home.page
(original)
+++
tapestry/tapestry4/trunk/framework/src/test-data/context18/WEB-INF/Home.page
Tue Apr 18 16:50:41 2006
@@ -22,4 +22,5 @@
<page-specification class="org.apache.tapestry.junit.mock.c18.Home">
<property-specification name="size" type="int" initial-value="20"/>
<property-specification name="groupDisabled" type="boolean"
persistent="yes"/>
+
</page-specification>
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
Tue Apr 18 16:50:41 2006
@@ -84,10 +84,14 @@
ResourceDigestSourceImpl s = new ResourceDigestSourceImpl();
s.setClassResolver(new DefaultClassResolver());
-
+
+ // call methods once to be sure things get cached properly
+
assertEquals("a5f4663532ea3efe22084df086482290", s
.getDigestForResource("/org/apache/tapestry/asset/tapestry-in-action.png"));
-
+
+ matcher.contains("/org/apache/tapestry/asset/tapestry-in-action.png",
pr);
+
long currTime = System.currentTimeMillis();
s.getDigestForResource("/org/apache/tapestry/asset/tapestry-in-action.png");
long drtime = System.currentTimeMillis() - currTime;
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
Tue Apr 18 16:50:41 2006
@@ -15,9 +15,9 @@
package org.apache.tapestry.html;
import org.apache.hivemind.test.HiveMindTestCase;
-import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.test.Creator;
import org.easymock.MockControl;
@@ -92,17 +92,18 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
-
- IMarkupWriter writer = (IMarkupWriter)newMock(IMarkupWriter.class);
ResponseBuilder builder =
(ResponseBuilder)newMock(ResponseBuilder.class);
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
@@ -114,11 +115,14 @@
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
@@ -136,11 +140,14 @@
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
@@ -158,17 +165,18 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
-
- IMarkupWriter writer = (IMarkupWriter)newMock(IMarkupWriter.class);
ResponseBuilder builder =
(ResponseBuilder)newMock(ResponseBuilder.class);
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
@@ -180,11 +188,14 @@
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
@@ -202,11 +213,14 @@
cycle.isRewinding();
control.setReturnValue(true);
-
- builder.getWriter();
- setReturnValue(builder, writer);
- builder.render(page, cycle);
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ cycle.isRewinding();
+ control.setReturnValue(true);
+
+ builder.render(NullWriter.getSharedInstance(), page, cycle);
replayControls();
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/MockTester.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/MockTester.java?rev=395087&r1=395086&r2=395087&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/MockTester.java
(original)
+++
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/MockTester.java
Tue Apr 18 16:50:41 2006
@@ -659,36 +659,34 @@
PatternMatcher matcher = getMatcher();
Pattern compiled = compile(pattern);
-
- List l = element.getChildren("match");
+
+ List<Element> l = element.getChildren("match");
int count = l.size();
int i = 0;
while (matcher.contains(input, compiled))
{
MatchResult match = matcher.getMatch();
-
+ String actual = match.group(subgroup);
+
+ boolean matched = contentContains(l, actual);
+
if (i >= count)
{
System.err.println(outputString);
throw new AssertionFailedError(buildTestName(name) + ": Too
many matches for '"
+ pattern + "'.");
}
-
- Element e = (Element) l.get(i);
- String expected = e.getTextTrim();
- String actual = match.group(subgroup);
-
- if (!actual.equals(expected))
- {
+
+ if (!matched) {
System.err.println(outputString);
- throw new AssertionFailedError(buildTestName(name) + "[" + i +
"]: Expected '"
- + expected + "' but got '" + actual + "'.");
+ throw new AssertionFailedError(buildTestName(name) + ": No
expected match found for "
+ + "output of '" + actual + "'. ");
}
-
+
i++;
}
-
+
if (i < count)
{
System.err.println(outputString);
@@ -697,6 +695,16 @@
}
}
+ private boolean contentContains(List<Element> elements, String text)
+ {
+ for (Element e : elements) {
+ if (e.getTextTrim().equals(text))
+ return true;
+ }
+
+ return false;
+ }
+
private void executeExceptionAssertions(Element request)
{
List l = request.getChildren("assert-exception");
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=395087&r1=395086&r2=395087&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
Tue Apr 18 16:50:41 2006
@@ -75,7 +75,8 @@
ResponseBuilder builder = new DefaultResponseBuilder(nested);
- cycle.renderPage(builder);
+ builder.renderResponse(cycle);
+ // cycle.renderPage(builder);
String id = "Tapestry Portlet " + _applicationId + " " + namespace;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
