You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/04/17 00:32:49 UTC
svn commit: r394571 - in /tapestry/tapestry4/trunk/framework/src:
java/org/apache/tapestry/components/ java/org/apache/tapestry/describe/
test/org/apache/tapestry/ test/org/apache/tapestry/bean/
test/org/apache/tapestry/callback/ test/org/apache/tapest...
Author: jkuhnert
Date: Sun Apr 16 15:32:46 2006
New Revision: 394571
URL: http://svn.apache.org/viewcvs?rev=394571&view=rev
Log:
Fixed a good majority of the broken unit tests. Still need to fix the mock script tests as well.
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/describe/HTMLDescriber.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TapestryUtilsTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java Sun Apr 16 15:32:46 2006
@@ -31,8 +31,12 @@
*/
public abstract class IfBean extends AbstractFormComponent
{
- public final static String IF_VALUE_ATTRIBUTE = "org.mb.tapestry.base.IfValue";
+ public static final String IF_VALUE_ATTRIBUTE = "org.mb.tapestry.base.IfValue";
+ private boolean _rendering = false;
+
+ private boolean _conditionValue;
+
public abstract IBinding getConditionValueBinding();
public abstract boolean getCondition();
@@ -43,10 +47,6 @@
public abstract IActionListener getListener();
- private boolean _rendering = false;
-
- private boolean _conditionValue;
-
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
boolean cycleRewinding = cycle.isRewinding();
@@ -178,7 +178,7 @@
}
/**
- * Returns the value of the condition
+ * Returns the value of the condition.
*
* @return the condition value
*/
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/describe/HTMLDescriber.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/describe/HTMLDescriber.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/describe/HTMLDescriber.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/describe/HTMLDescriber.java Sun Apr 16 15:32:46 2006
@@ -24,5 +24,5 @@
*/
public interface HTMLDescriber
{
- public void describeObject(Object object, IMarkupWriter writer);
-}
\ No newline at end of file
+ void describeObject(Object object, IMarkupWriter writer);
+}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Sun Apr 16 15:32:46 2006
@@ -28,8 +28,11 @@
import org.apache.tapestry.components.ILinkComponent;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
+import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.markup.AsciiMarkupFilter;
import org.apache.tapestry.markup.MarkupWriterImpl;
+import org.apache.tapestry.services.ResponseBuilder;
+import org.apache.tapestry.services.impl.DefaultResponseBuilder;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IParameterSpecification;
import org.apache.tapestry.test.Creator;
@@ -94,19 +97,57 @@
protected IRequestCycle newCycle()
{
- return (IRequestCycle) newMock(IRequestCycle.class);
+ return (IRequestCycle)newMock(IRequestCycle.class);
}
+ protected IRequestCycle newCycle(IMarkupWriter writer)
+ {
+ IRequestCycle cycle = (IRequestCycle) newMock(IRequestCycle.class);
+
+ trainResponseBuilder(cycle, writer);
+
+ return cycle;
+ }
+
protected IRequestCycle newCycle(boolean rewinding)
{
+ return newCycle(rewinding, null);
+ }
+
+ protected IRequestCycle newCycle(boolean rewinding, boolean trainWriter)
+ {
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
trainIsRewinding(cycle, rewinding);
-
+
+ if (trainWriter)
+ trainResponseBuilder(cycle, null);
+
return cycle;
}
+
+ protected IRequestCycle newCycle(boolean rewinding, IMarkupWriter writer)
+ {
+ MockControl control = newControl(IRequestCycle.class);
+ IRequestCycle cycle = (IRequestCycle) control.getMock();
+
+ trainIsRewinding(cycle, rewinding);
+ trainResponseBuilder(cycle, writer);
+
+ return cycle;
+ }
+
+ protected void trainResponseBuilder(IRequestCycle cycle, IMarkupWriter writer)
+ {
+ ResponseBuilder builder =
+ new DefaultResponseBuilder(writer == null ? NullWriter.getSharedInstance() : writer);
+
+ cycle.getResponseBuilder();
+ setReturnValue(cycle, builder);
+ }
+
protected void trainIsRewinding(IRequestCycle cycle, boolean rewinding)
{
cycle.isRewinding();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TapestryUtilsTest.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TapestryUtilsTest.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TapestryUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TapestryUtilsTest.java Sun Apr 16 15:32:46 2006
@@ -29,7 +29,7 @@
private IRequestCycle newCycle(String key, Object attribute)
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
trainGetAttribute(cycle, key, attribute);
@@ -99,7 +99,7 @@
public void testRemovePageRenderSupport()
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
cycle.removeAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
@@ -112,7 +112,7 @@
public void testRemoveForm()
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
cycle.removeAttribute(TapestryUtils.FORM_ATTRIBUTE);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java Sun Apr 16 15:32:46 2006
@@ -161,7 +161,7 @@
private void trainForConstructor(IPage page, IComponent component, ClassResolver resolver,
ClassFinder classFinder)
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
Infrastructure infrastructure = (Infrastructure) newMock(Infrastructure.class);
INamespace namespace = (INamespace) newMock(INamespace.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java Sun Apr 16 15:32:46 2006
@@ -28,7 +28,7 @@
{
public void testByString()
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
cycle.activate("Fred");
@@ -45,7 +45,7 @@
public void testByPage()
{
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
IPage page = newPage("Barney");
cycle.activate("Barney");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java Sun Apr 16 15:32:46 2006
@@ -31,16 +31,16 @@
*/
public class TestAny extends BaseComponentTestCase
{
+
public void testElementNull()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
Location l = newLocation();
-
+
replayControls();
-
- Any any = (Any) newInstance(Any.class, new Object[]
- { "location", l });
+
+ Any any = (Any) newInstance(Any.class, new Object[] { "location", l });
try
{
@@ -49,7 +49,8 @@
}
catch (ApplicationRuntimeException ex)
{
- assertEquals(ComponentMessages.anyElementNotDefined(), ex.getMessage());
+ assertEquals(ComponentMessages.anyElementNotDefined(), ex
+ .getMessage());
assertSame(l, ex.getLocation());
}
@@ -59,7 +60,7 @@
public void testRender()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, writer);
IRender body = newRender();
writer.begin("span");
@@ -70,8 +71,8 @@
replayControls();
- Any any = (Any) newInstance(Any.class, new Object[]
- { "element", "span" });
+ Any any = (Any) newInstance(Any.class,
+ new Object[] { "element", "span" });
any.addBody(body);
@@ -83,7 +84,7 @@
public void testRenderWithInformalParameters()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, writer);
IRender body = newRender();
IBinding binding = newBinding("fred");
@@ -96,8 +97,8 @@
replayControls();
- Any any = (Any) newInstance(Any.class, new Object[]
- { "element", "span", "specification", new ComponentSpecification() });
+ Any any = (Any) newInstance(Any.class, new Object[] { "element",
+ "span", "specification", new ComponentSpecification() });
any.addBody(body);
any.setBinding("class", binding);
@@ -110,15 +111,15 @@
public void testRewind()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(true);
+ IRequestCycle cycle = newCycle(true, writer);
IRender body = newRender();
body.render(writer, cycle);
replayControls();
- Any any = (Any) newInstance(Any.class, new Object[]
- { "element", "span" });
+ Any any = (Any) newInstance(Any.class,
+ new Object[] { "element", "span" });
any.addBody(body);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java Sun Apr 16 15:32:46 2006
@@ -37,7 +37,7 @@
final Block block = (Block) newInstance(Block.class);
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = newCycle(writer);
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java Sun Apr 16 15:32:46 2006
@@ -56,8 +56,8 @@
public void testRenderSimple()
{
- IRequestCycle cycle = newCycle(false);
IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(false, writer);
IRender body = newRender(writer, cycle);
replayControls();
@@ -73,8 +73,8 @@
public void testIgnoreElementWhenRewinding()
{
- IRequestCycle cycle = newCycle(true);
IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(true, writer);
IRender body = newRender(writer, cycle);
replayControls();
@@ -92,9 +92,9 @@
{
IBinding informal = newBinding("informal-value");
IComponentSpecification spec = newSpec("informal", null);
-
- IRequestCycle cycle = newCycle(false);
+
IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(false, writer);
IRender body = newRender(writer, cycle);
writer.begin("div");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java Sun Apr 16 15:32:46 2006
@@ -39,7 +39,7 @@
private IRender newRender(IMarkupWriter writer, IRequestCycle cycle)
{
IRender render = (IRender) newMock(IRender.class);
-
+
render.render(writer, cycle);
return render;
@@ -50,30 +50,32 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IMarkupWriter writer = newWriter();
+
cycle.isRewinding();
cyclec.setReturnValue(false);
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(null);
+ trainResponseBuilder(cycle, writer);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.TRUE);
- IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
IRender body2 = newRender();
-
+
replayControls();
-
-
+
IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
{ "condition", Boolean.TRUE });
conditional.addBody(body);
-
+
conditional.render(writer, cycle);
-
+
ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
@@ -85,7 +87,8 @@
{
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
+ IMarkupWriter writer = newWriter();
+
cycle.isRewinding();
cyclec.setReturnValue(false);
@@ -100,13 +103,13 @@
cycle.isRewinding();
cyclec.setReturnValue(false);
- IMarkupWriter writer = newWriter();
+ trainResponseBuilder(cycle, writer);
+
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
replayControls();
-
IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
{ "condition", Boolean.FALSE });
conditional.addBody(body);
@@ -121,6 +124,8 @@
public void testRenderInFormTrue()
{
+ IMarkupWriter writer = newWriter();
+
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE });
@@ -141,12 +146,13 @@
form.addHiddenValue("If", "T");
+ trainResponseBuilder(cycle, writer);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.TRUE);
- IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
IRender body2 = newRender();
@@ -165,6 +171,8 @@
public void testRenderInFormFalse()
{
+ IMarkupWriter writer = newWriter();
+
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.FALSE });
@@ -193,7 +201,8 @@
cycle.isRewinding();
cyclec.setReturnValue(false);
- IMarkupWriter writer = newWriter();
+ trainResponseBuilder(cycle, writer);
+
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
@@ -212,6 +221,8 @@
public void testIgnoreElementWhenRewindingTrue()
{
+ IMarkupWriter writer = newWriter();
+
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
@@ -236,12 +247,12 @@
cycle.getParameter("If");
cyclec.setReturnValue("T");
+ trainResponseBuilder(cycle, writer);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.TRUE);
-
- IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
IRender body2 = newRender();
@@ -260,6 +271,8 @@
public void testIgnoreElementWhenRewindingFalse()
{
+ IMarkupWriter writer = newWriter();
+
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
@@ -283,17 +296,17 @@
cycle.getParameter("If");
cyclec.setReturnValue("F");
-
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
-
+
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.FALSE);
cycle.isRewinding();
cyclec.setReturnValue(true);
- IMarkupWriter writer = newWriter();
-
+ trainResponseBuilder(cycle, writer);
+
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
@@ -311,6 +324,8 @@
public void testElement()
{
+ IMarkupWriter writer = newWriter();
+
IBinding informal = newBinding("informal-value");
IComponentSpecification spec = newSpec("informal", null);
@@ -323,7 +338,6 @@
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(null);
- IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
writer.begin("div");
@@ -331,6 +345,8 @@
writer.end("div");
+ trainResponseBuilder(cycle, writer);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java Sun Apr 16 15:32:46 2006
@@ -51,7 +51,7 @@
public void testRewinding()
{
- IRequestCycle cycle = newCycle(true);
+ IRequestCycle cycle = newCycle(true, false);
replayControls();
@@ -64,7 +64,7 @@
public void testNullValue()
{
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
replayControls();
@@ -78,16 +78,16 @@
public void testNoFormat()
{
- IRequestCycle cycle = newCycle(false);
IMarkupWriter writer = newWriter();
-
+ IRequestCycle cycle = newCycle(false, false);
+
writer.print("42", false);
-
+
replayControls();
-
+
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", new Integer(42) });
-
+
insert.render(writer, cycle);
verifyControls();
@@ -95,17 +95,17 @@
public void testFormat()
{
- IRequestCycle cycle = newCycle(false);
IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(false, false);
Date date = new Date();
DateFormat format = DateFormat.getDateInstance();
String expected = format.format(date);
-
+
writer.print(expected, false);
-
+
replayControls();
-
+
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", date, "format", format });
@@ -119,16 +119,16 @@
Object value = "xyzzyx";
Location l = fabricateLocation(87);
IBinding binding = newBinding(l);
-
+
Format format = DateFormat.getInstance();
-
- IRequestCycle cycle = newCycle(false);
+
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
-
+
IPage page = newBasePage("Flintstone");
-
+
replayControls();
-
+
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", value, "format", format });
insert.setBinding("format", binding);
@@ -155,7 +155,7 @@
public void testRaw()
{
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
writer.print("42", true);
@@ -174,7 +174,7 @@
{
IBinding informal = newBinding("informal-value");
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
IComponentSpecification spec = newSpec("informal", null);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java Sun Apr 16 15:32:46 2006
@@ -42,7 +42,7 @@
public void testSuccess()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
IActionListener listener = newListener();
ListenerInvoker invoker = newInvoker();
@@ -66,7 +66,7 @@
public void testEnsureParametersClearedAfterException()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
IActionListener listener = newListener();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java Sun Apr 16 15:32:46 2006
@@ -32,7 +32,7 @@
RenderBlock rb = (RenderBlock) newInstance(RenderBlock.class);
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
replayControls();
@@ -50,7 +50,7 @@
{ "block", b });
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
b.renderForComponent(writer, cycle, rb);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java Sun Apr 16 15:32:46 2006
@@ -76,6 +76,8 @@
trainGetUniqueId(cycle, "fred_id", "fred_id_unique");
+ trainResponseBuilder(cycle, writer);
+
replayControls();
linkSubmit.renderFormComponent(writer, cycle);
@@ -96,6 +98,8 @@
{ "disabled", Boolean.TRUE, "form", form, "name", "fred_1", "idParameter", "fred_id" });
linkSubmit.addBody(newBody());
+ trainResponseBuilder(cycle, writer);
+
replayControls();
linkSubmit.renderFormComponent(writer, cycle);
@@ -230,7 +234,9 @@
trainGetParameter(cycle, FormConstants.SUBMIT_NAME_PARAMETER, null);
// ... and back to AbstractFormComponent
-
+
+ trainResponseBuilder(cycle, writer);
+
body.render(writer, cycle);
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java Sun Apr 16 15:32:46 2006
@@ -29,7 +29,7 @@
public void testRewinding()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(true);
+ IRequestCycle cycle = newCycle(true, false);
replayControls();
@@ -43,10 +43,10 @@
public void testRender()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
-
+ IRequestCycle cycle = newCycle(false, false);
+
Object object = new Object();
-
+
HTMLDescriber describer = (HTMLDescriber) newMock(HTMLDescriber.class);
describer.describeObject(object, writer);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java Sun Apr 16 15:32:46 2006
@@ -67,7 +67,7 @@
IScript script = newScript();
PageRenderSupport support = newPageRenderSupport();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
Resource scriptLocation = newResource();
IRender body = newRender();
@@ -90,6 +90,8 @@
body.render(writer, cycle);
+ trainResponseBuilder(cycle, writer);
+
replayControls();
component.addBody(body);
@@ -105,8 +107,8 @@
MockScript script = new MockScript();
PageRenderSupport support = newPageRenderSupport();
- IRequestCycle cycle = newCycle(false);
IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(false, false);
Resource scriptLocation = newResource();
IRender body = newRender();
@@ -129,6 +131,8 @@
body.render(writer, cycle);
+ trainResponseBuilder(cycle, writer);
+
replayControls();
component.addBody(body);
@@ -148,7 +152,7 @@
MockScript script = new MockScript();
PageRenderSupport support = newPageRenderSupport();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
Resource scriptLocation = newResource();
IRender body = newRender();
@@ -176,6 +180,8 @@
body.render(writer, cycle);
+ trainResponseBuilder(cycle, writer);
+
replayControls();
component.addBody(body);
@@ -194,11 +200,13 @@
public void testRewinding()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(true);
+ IRequestCycle cycle = newCycle(true, false);
IRender body = newRender();
body.render(writer, cycle);
+ trainResponseBuilder(cycle, writer);
+
replayControls();
Script component = (Script) newInstance(Script.class);
@@ -215,7 +223,7 @@
IScriptSource source = newScriptSource();
PageRenderSupport support = newPageRenderSupport();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
IRender body = newRender();
@@ -250,7 +258,7 @@
IScript script = newScript();
PageRenderSupport support = newPageRenderSupport();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
IMarkupWriter writer = newWriter();
Resource scriptLocation = newResource();
IRender body = newRender();
@@ -273,6 +281,8 @@
script.execute(cycle, support, new HashMap());
body.render(writer, cycle);
+
+ trainResponseBuilder(cycle, writer);
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java Sun Apr 16 15:32:46 2006
@@ -29,7 +29,7 @@
public void testRewinding()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(true);
+ IRequestCycle cycle = newCycle(true, false);
replayControls();
@@ -43,7 +43,7 @@
public void testRenderNull()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
replayControls();
@@ -57,7 +57,7 @@
public void testRenderBreaks()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
writer.print("Now is the time", false);
writer.beginEmpty("br");
@@ -81,7 +81,7 @@
public void testRenderParas()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
writer.begin("p");
writer.print("Now is the time", false);
@@ -109,7 +109,7 @@
public void testRenderRaw()
{
IMarkupWriter writer = newWriter();
- IRequestCycle cycle = newCycle(false);
+ IRequestCycle cycle = newCycle(false, false);
writer.print("output", true);
writer.beginEmpty("br");
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=394571&r1=394570&r2=394571&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 Sun Apr 16 15:32:46 2006
@@ -15,8 +15,10 @@
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.services.ResponseBuilder;
import org.apache.tapestry.test.Creator;
import org.easymock.MockControl;
@@ -90,26 +92,39 @@
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);
+
replayControls();
-
+
// Code path: no listener list
- page.renderPage(null, cycle);
-
+ page.renderPage(builder, cycle);
+
verifyControls();
cycle.isRewinding();
control.setReturnValue(true);
+ builder.getWriter();
+ setReturnValue(builder, writer);
+
+ builder.render(page, cycle);
+
replayControls();
page.addPageBeginRenderListener(l);
- page.renderPage(null, cycle);
+ page.renderPage(builder, cycle);
assertEquals("pageBeginRender", l.getMethod());
@@ -122,9 +137,14 @@
cycle.isRewinding();
control.setReturnValue(true);
+ builder.getWriter();
+ setReturnValue(builder, writer);
+
+ builder.render(page, cycle);
+
replayControls();
- page.renderPage(null, cycle);
+ page.renderPage(builder, cycle);
assertNull(l.getMethod());
@@ -139,25 +159,38 @@
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);
+
replayControls();
// Code path: no listener list
- page.renderPage(null, cycle);
+ page.renderPage(builder, cycle);
verifyControls();
cycle.isRewinding();
control.setReturnValue(true);
+ builder.getWriter();
+ setReturnValue(builder, writer);
+
+ builder.render(page, cycle);
+
replayControls();
page.addPageEndRenderListener(l);
- page.renderPage(null, cycle);
+ page.renderPage(builder, cycle);
assertEquals("pageEndRender", l.getMethod());
@@ -170,9 +203,14 @@
cycle.isRewinding();
control.setReturnValue(true);
+ builder.getWriter();
+ setReturnValue(builder, writer);
+
+ builder.render(page, cycle);
+
replayControls();
- page.renderPage(null, cycle);
+ page.renderPage(builder, cycle);
assertNull(l.getMethod());
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java Sun Apr 16 15:32:46 2006
@@ -14,12 +14,11 @@
package org.apache.tapestry.html;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.test.Creator;
-import org.easymock.MockControl;
/**
* Tests for the {@link org.apache.tapestry.html.Shell} component.
@@ -27,31 +26,10 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestShell extends HiveMindTestCase
+public class TestShell extends BaseComponentTestCase
{
private Creator _creator = new Creator();
- private IMarkupWriter newMarkupWriter()
- {
- return (IMarkupWriter) newMock(IMarkupWriter.class);
- }
-
- private IRequestCycle newRequestCycle(boolean rewinding)
- {
- MockControl control = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) control.getMock();
-
- cycle.isRewinding();
- control.setReturnValue(rewinding);
-
- return cycle;
- }
-
- private IRender newRender()
- {
- return (IRender) newMock(IRender.class);
- }
-
/**
* Test that Shell does very little when the entire page is rewinding (which itself is a
* holdback to the action service).
@@ -59,8 +37,8 @@
public void testRewinding()
{
- IMarkupWriter writer = newMarkupWriter();
- IRequestCycle cycle = newRequestCycle(true);
+ IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle(true, writer);
IRender body = newRender();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java?rev=394571&r1=394570&r2=394571&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java Sun Apr 16 15:32:46 2006
@@ -15,10 +15,13 @@
package org.apache.tapestry.junit;
import org.apache.tapestry.BaseComponent;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.NullWriter;
+import org.apache.tapestry.services.ResponseBuilder;
+import org.apache.tapestry.services.impl.DefaultResponseBuilder;
import org.apache.tapestry.test.Creator;
/**
@@ -29,7 +32,7 @@
* @since 3.0
*/
-public class TestComponent extends TapestryTestCase
+public class TestComponent extends BaseComponentTestCase
{
private static class TestRender implements IRender
{
@@ -62,22 +65,33 @@
public void testOuter() throws Exception
{
+ IMarkupWriter writer = new NullWriter();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+
Creator creator = new Creator();
-
+
FakeComponent c = (FakeComponent) creator.newInstance(FakeComponent.class);
-
+
TestRender[] list = new TestRender[50];
-
+
+ ResponseBuilder builder =
+ new DefaultResponseBuilder(writer);
+
for (int i = 0; i < list.length; i++)
{
list[i] = new TestRender();
c.addOuterTest(list[i]);
+
+ cycle.getResponseBuilder();
+ setReturnValue(cycle, builder);
}
-
- IMarkupWriter writer = new NullWriter();
-
- c.testRenderComponent(writer, null);
-
+
+ replayControls();
+
+ c.testRenderComponent(writer, cycle);
+
+ verifyControls();
+
for (int i = 0; i < list.length; i++)
assertTrue("Outer object #" + i + " did render.", list[i].rendered);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org