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/03/11 21:55:35 UTC
svn commit: r385164 [26/32] - in /jakarta/tapestry/trunk: ./ .settings/
annotations/src/java/org/apache/tapestry/annotations/
annotations/src/test/org/apache/tapestry/annotations/ config/
contrib/src/documentation/content/xdocs/tapestry-contrib/Compone...
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
*/
public class TestStringConverters extends HiveMindTestCase
{
-
public void testObjectToString()
{
TypeConverter c = new ObjectToStringConverter();
@@ -33,4 +32,4 @@
assertEquals(o.toString(), c.convertValue(o));
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -27,11 +27,10 @@
*/
public class TestTypeConverterWrapper extends HiveMindTestCase
{
-
public void testNonNull()
{
MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter)tcc.getMock();
+ TypeConverter tc = (TypeConverter) tcc.getMock();
Object expected = "BARNEY";
@@ -60,7 +59,7 @@
public void testNull()
{
MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter)tcc.getMock();
+ TypeConverter tc = (TypeConverter) tcc.getMock();
Object expected = "NULL";
@@ -86,4 +85,4 @@
assertNull(w.convertValue(null));
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -41,9 +41,8 @@
}
/**
- * Check that primitive types are converted to equivalent wrapper classes
- * for the assignable check. Ok, maybe we should check all the primitive
- * types.
+ * Check that primitive types are converted to equivalent wrapper classes for the assignable
+ * check. Ok, maybe we should check all the primitive types.
*/
public void testAlreadyCorrectPrimitiveType()
@@ -71,8 +70,7 @@
}
/**
- * Verify that the message generated for a primtive type identifies the
- * wrapper class.
+ * Verify that the message generated for a primtive type identifies the wrapper class.
*/
public void testNoConverterPrimitive()
@@ -93,7 +91,7 @@
public void testConverterFound()
{
MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter)tcc.getMock();
+ TypeConverter tc = (TypeConverter) tcc.getMock();
Object input = new Integer(7);
Object output = "SEVEN";
@@ -122,7 +120,7 @@
public void testConverterFoundForNullValue()
{
MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter)tcc.getMock();
+ TypeConverter tc = (TypeConverter) tcc.getMock();
Object output = "NULL";
@@ -183,7 +181,9 @@
}
catch (ApplicationRuntimeException ex)
{
- assertExceptionSubstring(ex, "Unable to convert 'fred12345' to an instance of java.lang.Double");
+ assertExceptionSubstring(
+ ex,
+ "Unable to convert 'fred12345' to an instance of java.lang.Double");
}
}
@@ -191,7 +191,7 @@
public void testStringToNonNumericPrimitive()
{
MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter)tcc.getMock();
+ TypeConverter tc = (TypeConverter) tcc.getMock();
Object input = "false";
Object output = Boolean.FALSE;
@@ -225,4 +225,4 @@
assertEquals(new Long(123), result);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -27,18 +27,18 @@
import org.easymock.MockControl;
/**
- * Tests for {@link org.apache.tapestry.components.If} and
- * {@link org.apache.tapestry.components.Else} components.
+ * Tests for {@link org.apache.tapestry.components.If}
+ * and {@link org.apache.tapestry.components.Else}
+ * components.
*
* @author Mindbridge
* @since 4.0
*/
public class TestIfElse extends BaseComponentTestCase
{
-
private IRender newRender(IMarkupWriter writer, IRequestCycle cycle)
{
- IRender render = (IRender)newMock(IRender.class);
+ IRender render = (IRender) newMock(IRender.class);
render.render(writer, cycle);
@@ -48,31 +48,33 @@
public void testRenderPlainTrue()
{
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(null);
-
+
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 });
+
+ IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
+ { "condition", Boolean.TRUE });
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
@@ -82,33 +84,35 @@
public void testRenderPlainFalse()
{
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(null);
-
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
-
+
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.FALSE);
-
+
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
IMarkupWriter writer = newWriter();
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
replayControls();
- IfBean conditional = (IfBean)newInstance(IfBean.class, new Object[] { "condition", Boolean.FALSE });
+
+ IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
+ { "condition", Boolean.FALSE });
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
@@ -117,40 +121,42 @@
public void testRenderInFormTrue()
{
- IfBean conditional = (IfBean)newInstance(TestIfBean.class, new Object[] { "condition", Boolean.TRUE });
+ IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ new Object[] { "condition", Boolean.TRUE });
MockControl formc = newControl(IForm.class);
- IForm form = (IForm)formc.getMock();
-
+ IForm form = (IForm) formc.getMock();
+
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(form);
form.getElementId(conditional);
formc.setReturnValue("If");
-
+
form.addHiddenValue("If", "T");
-
+
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();
+
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
@@ -159,43 +165,45 @@
public void testRenderInFormFalse()
{
- IfBean conditional = (IfBean)newInstance(TestIfBean.class, new Object[] { "condition", Boolean.FALSE });
+ IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ new Object[] { "condition", Boolean.FALSE });
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
MockControl formc = newControl(IForm.class);
- IForm form = (IForm)formc.getMock();
-
+ IForm form = (IForm) formc.getMock();
+
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(form);
-
+
form.getElementId(conditional);
formc.setReturnValue("If");
-
+
form.addHiddenValue("If", "F");
-
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
-
+
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.FALSE);
-
+
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
IMarkupWriter writer = newWriter();
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
replayControls();
+
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
@@ -204,27 +212,27 @@
public void testIgnoreElementWhenRewindingTrue()
{
- IfBean conditional = (IfBean)newInstance(TestIfBean.class, new Object[] { "condition", Boolean.TRUE, "element",
- "div" });
-
+ IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ new Object[] { "condition", Boolean.TRUE, "element", "div" });
+
MockControl formc = newControl(IForm.class);
- IForm form = (IForm)formc.getMock();
-
+ IForm form = (IForm) formc.getMock();
+
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(true);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(form);
-
+
form.isRewinding();
formc.setReturnValue(true);
-
+
form.getElementId(conditional);
formc.setReturnValue("If");
-
+
cycle.getParameter("If");
cyclec.setReturnValue("T");
@@ -232,7 +240,7 @@
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.TRUE);
-
+
IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
@@ -243,36 +251,36 @@
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
-
+
verifyControls();
}
public void testIgnoreElementWhenRewindingFalse()
{
- IfBean conditional = (IfBean)newInstance(TestIfBean.class, new Object[] { "condition", Boolean.TRUE, "element",
- "div" });
-
+ IfBean conditional = (IfBean) newInstance(TestIfBean.class,
+ new Object[] { "condition", Boolean.TRUE, "element", "div" });
+
MockControl formc = newControl(IForm.class);
- IForm form = (IForm)formc.getMock();
-
+ IForm form = (IForm) formc.getMock();
+
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(true);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(form);
-
+
form.isRewinding();
formc.setReturnValue(true);
-
+
form.getElementId(conditional);
formc.setReturnValue("If");
-
+
cycle.getParameter("If");
cyclec.setReturnValue("F");
@@ -280,10 +288,10 @@
cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
cyclec.setReturnValue(Boolean.FALSE);
-
+
cycle.isRewinding();
cyclec.setReturnValue(true);
-
+
IMarkupWriter writer = newWriter();
IRender body = newRender();
@@ -294,27 +302,27 @@
conditional.addBody(body);
conditional.render(writer, cycle);
- ElseBean reverse = (ElseBean)newInstance(ElseBean.class);
+ ElseBean reverse = (ElseBean) newInstance(ElseBean.class);
reverse.addBody(body2);
reverse.render(writer, cycle);
-
+
verifyControls();
}
public void testElement()
{
- IBinding informal = newBinding("informal-value");
+ IBinding informal = newBinding("informal-value");
IComponentSpecification spec = newSpec("informal", null);
MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle)cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
cycle.isRewinding();
cyclec.setReturnValue(false);
-
+
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
cyclec.setReturnValue(null);
-
+
IMarkupWriter writer = newWriter();
IRender body = newRender(writer, cycle);
@@ -325,10 +333,11 @@
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
+
replayControls();
- IfBean conditional = (IfBean)newInstance(TestIfBean.class, new Object[] { "condition", Boolean.TRUE, "element",
- "div", "specification", spec });
+ IfBean conditional = (IfBean) newInstance(TestIfBean.class, new Object[]
+ { "condition", Boolean.TRUE, "element", "div", "specification", spec });
conditional.addBody(body);
conditional.setBinding("informal", informal);
@@ -336,18 +345,14 @@
verifyControls();
}
-
- /** Test fixture. */
- public abstract static class TestIfBean extends IfBean
+
+ public static abstract class TestIfBean extends IfBean
{
-
- public TestIfBean()
- {
- }
-
- public DataSqueezer getDataSqueezer()
- {
- return DataSqueezerUtil.createUnitTestSqueezer();
- }
+ public TestIfBean() {
+ }
+
+ public DataSqueezer getDataSqueezer() {
+ return DataSqueezerUtil.createUnitTestSqueezer();
+ }
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
*/
public class HTMLDescriptionReceiverTest extends BaseDescribeTestCase
{
-
protected DescribableStrategy newStrategy()
{
return (DescribableStrategy) newMock(DescribableStrategy.class);
@@ -64,7 +63,8 @@
writer.begin("tr");
writer.attribute("class", even ? "even" : "odd");
writer.begin("th");
- if (key != null) writer.print(key);
+ if (key != null)
+ writer.print(key);
writer.end();
writer.begin("td");
writer.print(value);
@@ -77,7 +77,8 @@
writer.begin("tr");
writer.attribute("class", even ? "even" : "odd");
writer.begin("th");
- if (key != null) writer.print(key);
+ if (key != null)
+ writer.print(key);
writer.end();
writer.begin("td");
writer.print(value);
@@ -257,7 +258,8 @@
IMarkupWriter writer = newWriter();
DescribableStrategy adapter = new NoOpStrategy();
- Object[] array = new Object[] { "Fred", "Barney" };
+ Object[] array = new Object[]
+ { "Fred", "Barney" };
trainForTitle(writer, "Array");
trainForNestedKeyValue(writer, "list", "Fred", true);
@@ -278,7 +280,8 @@
IMarkupWriter writer = newWriter();
DescribableStrategy adapter = new NoOpStrategy();
- Object[] array = new Object[] { "Fred", "Barney" };
+ Object[] array = new Object[]
+ { "Fred", "Barney" };
Collection collection = Arrays.asList(array);
trainForTitle(writer, "Collection");
@@ -448,4 +451,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/NoOpStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/NoOpStrategy.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/NoOpStrategy.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/NoOpStrategy.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -17,18 +17,10 @@
*/
package org.apache.tapestry.describe;
-/**
- * No-op implementation of
- * {@link org.apache.tapestry.describe.DescribableStrategy}.
- *
- * @author Howard M. Lewis Ship
- * @since 4.0
- */
public class NoOpStrategy implements DescribableStrategy
{
-
public void describeObject(Object object, DescriptionReceiver receiver)
{
// Does nothing; sufficient for the tests.
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@
*/
public class ReportStatusHubTest extends BaseDescribeTestCase
{
-
- public RootDescriptionReceiverFactory newReceiverFactory(IMarkupWriter writer, RootDescriptionReciever receiver)
+ public RootDescriptionReceiverFactory newReceiverFactory(IMarkupWriter writer,
+ RootDescriptionReciever receiver)
{
RootDescriptionReceiverFactory factory = newReceiverFactory();
@@ -40,10 +40,9 @@
protected RootDescriptionReceiverFactory newReceiverFactory()
{
- return (RootDescriptionReceiverFactory)newMock(RootDescriptionReceiverFactory.class);
+ return (RootDescriptionReceiverFactory) newMock(RootDescriptionReceiverFactory.class);
}
- /** Test fixture that checks that the listener gets invoked. */
public static class ListenerFixture implements ReportStatusListener
{
@@ -100,6 +99,6 @@
protected RootDescriptionReciever newRootReceiver()
{
- return (RootDescriptionReciever)newMock(RootDescriptionReciever.class);
+ return (RootDescriptionReciever) newMock(RootDescriptionReciever.class);
}
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -28,10 +28,9 @@
*/
public class TestRenderStrategy extends BaseDescribeTestCase
{
-
private RenderStrategy newStrategy()
{
- return (RenderStrategy)newMock(RenderStrategy.class);
+ return (RenderStrategy) newMock(RenderStrategy.class);
}
public void testRenderBridge()
@@ -92,4 +91,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
*/
public class ActionServiceTest extends ServiceTestCase
{
-
public void testGetLinkSimple()
{
IComponent component = newComponent();
@@ -154,8 +153,7 @@
verifyControls();
}
- public void testServiceSimple()
- throws Exception
+ public void testServiceSimple() throws Exception
{
IRequestCycle cycle = newCycle();
IPage page = newPage();
@@ -190,11 +188,10 @@
private IAction newAction()
{
- return (IAction)newMock(IAction.class);
+ return (IAction) newMock(IAction.class);
}
- public void testSeviceActiveSession()
- throws Exception
+ public void testSeviceActiveSession() throws Exception
{
IRequestCycle cycle = newCycle();
IPage page = newPage();
@@ -232,8 +229,7 @@
verifyControls();
}
- public void testServiceNotAction()
- throws Exception
+ public void testServiceNotAction() throws Exception
{
IRequestCycle cycle = newCycle();
IPage page = newPage();
@@ -277,8 +273,7 @@
verifyControls();
}
- public void testServiceStaleSession()
- throws Exception
+ public void testServiceStaleSession() throws Exception
{
IRequestCycle cycle = newCycle();
IPage page = newPage();
@@ -329,8 +324,7 @@
verifyControls();
}
- public void testServiceComplex()
- throws Exception
+ public void testServiceComplex() throws Exception
{
IRequestCycle cycle = newCycle();
IPage activePage = newPage();
@@ -371,4 +365,4 @@
action.getRequiresSession();
setReturnValue(action, requiresSession);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Sat Mar 11 12:54:27 2006
@@ -416,4 +416,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java Sat Mar 11 12:54:27 2006
@@ -1,226 +1,252 @@
-// Copyright 2004, 2005 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.engine;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.codec.net.URLCodec;
-import org.apache.tapestry.BaseComponentTestCase;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.services.ServiceConstants;
-import org.apache.tapestry.web.WebRequest;
-
-/**
- * Tests for {@link org.apache.tapestry.engine.EngineServiceLink}.
- *
- * @author Howard Lewis Ship
- * @since 3.0
- */
-public class EngineServiceLinkTest extends BaseComponentTestCase
-{
- private static final String ENCODING = "utf-8";
-
- private URLCodec _urlCodec = new URLCodec();
-
- private Map buildParameters(String serviceName, String[] serviceParameters)
- {
- Map result = new HashMap();
-
- result.put(ServiceConstants.SERVICE, serviceName);
- result.put(ServiceConstants.PARAMETER, serviceParameters);
-
- return result;
- }
-
- /** @since 4.0 */
- public void testGetURLWithParameters()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- trainEncodeURL(
- rc,
- "/context/servlet?service=myservice",
- "/context/servlet?service=myservice;encoded");
-
- EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
- request, buildParameters("myservice", null), true);
-
- replayControls();
-
- assertEquals("/context/servlet?service=myservice;encoded", l.getURL());
-
- verifyControls();
-
- assertListsEqual(new String[]
- { ServiceConstants.SERVICE, ServiceConstants.PARAMETER }, l.getParameterNames());
-
- }
-
- public void testGetURLWithServiceParameters()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
- buildParameters("foo", new String[]
- { "godzilla", "frodo" }), false);
-
- replayControls();
-
- assertEquals("/ctx/app?service=foo&sp=godzilla&sp=frodo", l.getURL());
-
- verifyControls();
- }
-
- /** @since 4.0 */
-
- public void testGetURLSansParameters()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
- request, buildParameters("myservice", null), true);
-
- trainEncodeURL(rc, "/context/servlet", "/context/servlet;encoded");
-
- replayControls();
-
- assertEquals("/context/servlet;encoded", l.getURL(null, false));
-
- verifyControls();
- }
-
- /** @since 4.0 */
-
- public void testGetURLWithAnchor()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = (IRequestCycle) newMock(IRequestCycle.class);
-
- EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
- request, buildParameters("myservice", null), false);
-
- replayControls();
-
- assertEquals("/context/servlet#anchor", l.getURL("anchor", false));
-
- verifyControls();
- }
-
- public void testGetURLWithAnchorAndParameters() throws Exception
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
- request, buildParameters("myservice", null), false);
-
- replayControls();
-
- assertEquals("/context/servlet?service=myservice#anchor", l.getURL("anchor", true));
-
- verifyControls();
- }
-
- public void testGetAbsoluteURL() throws Exception
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
- buildParameters("myservice", null), false);
-
- trainGetScheme(request, "HTTP");
-
- trainGetServerName(request, "TESTSERVER.COM");
-
- trainGetServerPort(request, 9187);
-
- replayControls();
-
- assertEquals("HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice", l.getAbsoluteURL());
-
- verifyControls();
- }
-
- public void testGetAbsoluteURLWithOverrides() throws Exception
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
- buildParameters("myservice", null), false);
-
- replayControls();
-
- assertEquals("https://myserver.net:9100/ctx/app?service=myservice", l.getAbsoluteURL(
- "https",
- "myserver.net",
- 9100,
- null,
- true));
-
- verifyControls();
- }
-
- public void testGetURLNotAbsolute()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- trainGetScheme(request, "http");
- trainGetServerName(request, "myserver.net");
- trainGetServerPort(request, 80);
-
- replayControls();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
- buildParameters("myservice", null), false);
-
- assertEquals("/ctx/app?service=myservice#myanchor", l.getURL(
- "http",
- "myserver.net",
- 80,
- "myanchor",
- true));
-
- verifyControls();
- }
-
- public void testGetURLAbsolute()
- {
- WebRequest request = newRequest();
- IRequestCycle rc = newCycle();
-
- trainGetScheme(request, "http");
-
- replayControls();
-
- EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
- buildParameters("myservice", null), false);
-
- assertEquals("https://override.net:8080/ctx/app?service=myservice#myanchor", l.getURL(
- "https",
- "override.net",
- 8080,
- "myanchor",
- true));
-
- verifyControls();
- }
-}
+// Copyright 2004, 2005 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.engine;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.codec.net.URLCodec;
+import org.apache.tapestry.BaseComponentTestCase;
+import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.services.ServiceConstants;
+import org.apache.tapestry.web.WebRequest;
+
+/**
+ * Tests for {@link org.apache.tapestry.engine.EngineServiceLink}.
+ *
+ * @author Howard Lewis Ship
+ * @since 3.0
+ */
+public class EngineServiceLinkTest extends BaseComponentTestCase
+{
+ private URLCodec _urlCodec = new URLCodec();
+
+ private static final String ENCODING = "utf-8";
+
+ private Map buildParameters(String serviceName, String[] serviceParameters)
+ {
+ Map result = new HashMap();
+
+ result.put(ServiceConstants.SERVICE, serviceName);
+ result.put(ServiceConstants.PARAMETER, serviceParameters);
+
+ return result;
+ }
+
+ /** @since 4.0 */
+ public void testGetURLWithParameters()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ trainEncodeURL(
+ rc,
+ "/context/servlet?service=myservice",
+ "/context/servlet?service=myservice;encoded");
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
+ request, buildParameters("myservice", null), true);
+
+ replayControls();
+
+ assertEquals("/context/servlet?service=myservice;encoded", l.getURL());
+
+ verifyControls();
+
+ assertListsEqual(new String[]
+ { ServiceConstants.SERVICE, ServiceConstants.PARAMETER }, l.getParameterNames());
+
+ }
+
+ public void testGetURLWithServiceParameters()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
+ buildParameters("foo", new String[]
+ { "godzilla", "frodo" }), false);
+
+ trainEncodeURL(rc,
+ "/ctx/app?service=foo&sp=godzilla&sp=frodo",
+ "/ctx/app?service=foo&sp=godzilla&sp=frodo");
+
+ replayControls();
+
+ assertEquals("/ctx/app?service=foo&sp=godzilla&sp=frodo", l.getURL());
+
+ verifyControls();
+ }
+
+ /** @since 4.0 */
+
+ public void testGetURLSansParameters()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
+ request, buildParameters("myservice", null), true);
+
+ trainEncodeURL(rc, "/context/servlet", "/context/servlet;encoded");
+
+ replayControls();
+
+ assertEquals("/context/servlet;encoded", l.getURL(null, false));
+
+ verifyControls();
+ }
+
+ /** @since 4.0 */
+
+ public void testGetURLWithAnchor()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = (IRequestCycle) newMock(IRequestCycle.class);
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
+ request, buildParameters("myservice", null), false);
+
+ trainEncodeURL(rc, "/context/servlet#anchor", "/context/servlet#anchor");
+
+ replayControls();
+
+ assertEquals("/context/servlet#anchor", l.getURL("anchor", false));
+
+ verifyControls();
+ }
+
+ public void testGetURLWithAnchorAndParameters() throws Exception
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
+ request, buildParameters("myservice", null), false);
+
+ trainEncodeURL(rc,
+ "/context/servlet?service=myservice#anchor",
+ "/context/servlet?service=myservice#anchor");
+
+ replayControls();
+
+ assertEquals("/context/servlet?service=myservice#anchor", l.getURL("anchor", true));
+
+ verifyControls();
+ }
+
+ public void testGetAbsoluteURL() throws Exception
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
+ buildParameters("myservice", null), false);
+
+ trainGetScheme(request, "HTTP");
+
+ trainGetServerName(request, "TESTSERVER.COM");
+
+ trainGetServerPort(request, 9187);
+
+ trainEncodeURL(rc,
+ "HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice",
+ "HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice");
+
+ replayControls();
+
+ assertEquals("HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice", l.getAbsoluteURL());
+
+ verifyControls();
+ }
+
+ public void testGetAbsoluteURLWithOverrides() throws Exception
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
+ buildParameters("myservice", null), false);
+
+ trainEncodeURL(rc,
+ "https://myserver.net:9100/ctx/app?service=myservice",
+ "https://myserver.net:9100/ctx/app?service=myservice");
+
+ replayControls();
+
+ assertEquals("https://myserver.net:9100/ctx/app?service=myservice", l.getAbsoluteURL(
+ "https",
+ "myserver.net",
+ 9100,
+ null,
+ true));
+
+ verifyControls();
+ }
+
+ public void testGetURLNotAbsolute()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ trainGetScheme(request, "http");
+ trainGetServerName(request, "myserver.net");
+ trainGetServerPort(request, 80);
+
+ trainEncodeURL(rc,
+ "/ctx/app?service=myservice#myanchor",
+ "/ctx/app?service=myservice#myanchor");
+
+ replayControls();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
+ buildParameters("myservice", null), false);
+
+ assertEquals("/ctx/app?service=myservice#myanchor", l.getURL(
+ "http",
+ "myserver.net",
+ 80,
+ "myanchor",
+ true));
+
+ verifyControls();
+ }
+
+ public void testGetURLAbsolute()
+ {
+ WebRequest request = newRequest();
+ IRequestCycle rc = newCycle();
+
+ trainGetScheme(request, "http");
+
+ trainEncodeURL(rc,
+ "https://override.net:8080/ctx/app?service=myservice#myanchor",
+ "https://override.net:8080/ctx/app?service=myservice#myanchor");
+
+ replayControls();
+
+ EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
+ buildParameters("myservice", null), false);
+
+ assertEquals("https://override.net:8080/ctx/app?service=myservice#myanchor", l.getURL(
+ "https",
+ "override.net",
+ 8080,
+ "myanchor",
+ true));
+
+ verifyControls();
+ }
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java Sat Mar 11 12:54:27 2006
@@ -124,4 +124,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java Sat Mar 11 12:54:27 2006
@@ -68,4 +68,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java Sat Mar 11 12:54:27 2006
@@ -177,4 +177,4 @@
assertEquals("http://foo/bar", ex.getRedirectLocation());
}
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java Sat Mar 11 12:54:27 2006
@@ -124,4 +124,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java Sat Mar 11 12:54:27 2006
@@ -146,4 +146,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java Sat Mar 11 12:54:27 2006
@@ -186,4 +186,4 @@
return (Log) newMock(Log.class);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
*/
public class TestServiceEncoding extends HiveMindTestCase
{
-
public void testSetServletPath()
{
ServiceEncodingImpl se = new ServiceEncodingImpl("/bar");
@@ -61,7 +60,8 @@
assertEquals("bar", se.getParameterValue("foo"));
- se.setParameterValues("flintstone", new String[] { "fred", "wilma", "dino" });
+ se.setParameterValues("flintstone", new String[]
+ { "fred", "wilma", "dino" });
assertEquals("fred", se.getParameterValue("flintstone"));
@@ -71,15 +71,18 @@
public void testGetParameterValues()
{
ServiceEncodingImpl se = new ServiceEncodingImpl("/foo");
- se.setParameterValues("flintstone", new String[] { "fred", "wilma", "dino" });
+ se.setParameterValues("flintstone", new String[]
+ { "fred", "wilma", "dino" });
- assertListsEqual(new String[] { "fred", "wilma", "dino" }, se.getParameterValues("flintstone"));
+ assertListsEqual(new String[]
+ { "fred", "wilma", "dino" }, se.getParameterValues("flintstone"));
assertEquals(true, se.isModified());
se.setParameterValue("foo", "bar");
- assertListsEqual(new String[] { "bar" }, se.getParameterValues("foo"));
+ assertListsEqual(new String[]
+ { "bar" }, se.getParameterValues("foo"));
assertNull(se.getParameterValue("unknown"));
}
@@ -106,6 +109,7 @@
se.setParameterValue("foo", "bar");
se.setParameterValue("alpha", "beta");
- assertListsEqual(new String[] { "alpha", "foo" }, se.getParameterNames());
+ assertListsEqual(new String[]
+ { "alpha", "foo" }, se.getParameterNames());
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java Sat Mar 11 12:54:27 2006
@@ -31,16 +31,16 @@
public void testWrongService()
{
ServiceEncoding encoding = newEncoding();
-
+
trainGetParameterValue(encoding, ServiceConstants.SERVICE, "foo");
-
+
replayControls();
-
+
new AssetEncoder().encode(encoding);
-
+
verifyControls();
}
-
+
protected void trainGetParameterValue(ServiceEncoding encoding, String name, String value)
{
encoding.getParameterValue(name);
@@ -67,7 +67,7 @@
verifyControls();
}
-
+
protected void trainGetServletPath(ServiceEncoding encoding, String servletPath)
{
encoding.getServletPath();
@@ -77,18 +77,18 @@
public void testEncode()
{
ServiceEncoding encoding = newEncoding();
-
+
trainGetParameterValue(encoding, ServiceConstants.SERVICE, Tapestry.ASSET_SERVICE);
trainGetParameterValue(encoding, AssetService.PATH, "/foo/bar/Baz.gif");
trainGetParameterValue(encoding, AssetService.DIGEST, "12345");
-
+
encoding.setServletPath("/assets/12345/foo/bar/Baz.gif");
encoding.setParameterValue(AssetService.PATH, null);
encoding.setParameterValue(AssetService.DIGEST, null);
encoding.setParameterValue(ServiceConstants.SERVICE, null);
-
+
replayControls();
-
+
AssetEncoder encoder = new AssetEncoder();
encoder.setPath("/assets");
@@ -100,14 +100,14 @@
public void testDecode()
{
ServiceEncoding encoding = newEncoding();
-
+
trainGetServletPath(encoding, "/assets");
trainGetPathInfo(encoding, "/12345/foo/bar/Baz.gif");
-
+
encoding.setParameterValue(ServiceConstants.SERVICE, Tapestry.ASSET_SERVICE);
encoding.setParameterValue(AssetService.DIGEST, "12345");
encoding.setParameterValue(AssetService.PATH, "/foo/bar/Baz.gif");
-
+
replayControls();
AssetEncoder encoder = new AssetEncoder();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -27,11 +27,10 @@
*/
public class TestServiceExtensionEncoder extends HiveMindTestCase
{
-
public void testEncode()
{
MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding)c.getMock();
+ ServiceEncoding sec = (ServiceEncoding) c.getMock();
sec.getParameterValue(ServiceConstants.SERVICE);
c.setReturnValue("heavy");
@@ -52,7 +51,7 @@
public void testDecodeWrongExtension()
{
MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding)c.getMock();
+ ServiceEncoding sec = (ServiceEncoding) c.getMock();
sec.getServletPath();
c.setReturnValue("/foo/bar/baz.direct");
@@ -66,17 +65,17 @@
verifyControls();
}
-
+
public void testDecode()
{
MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding)c.getMock();
+ ServiceEncoding sec = (ServiceEncoding) c.getMock();
sec.getServletPath();
c.setReturnValue("/hitter.svc");
sec.setParameterValue(ServiceConstants.SERVICE, "hitter");
-
+
replayControls();
ServiceExtensionEncoder e = new ServiceExtensionEncoder();
@@ -84,6 +83,6 @@
e.decode(sec);
- verifyControls();
+ verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -32,14 +32,13 @@
*/
public class TestSOMRegistry extends HiveMindTestCase
{
-
public void testInitializeAndGet()
{
Object stateObject = new Object();
MockControl pmc = newControl(StateObjectPersistenceManager.class);
- StateObjectPersistenceManager pm = (StateObjectPersistenceManager)pmc.getMock();
+ StateObjectPersistenceManager pm = (StateObjectPersistenceManager) pmc.getMock();
- StateObjectFactory f = (StateObjectFactory)newMock(StateObjectFactory.class);
+ StateObjectFactory f = (StateObjectFactory) newMock(StateObjectFactory.class);
pm.get("fred", f);
pmc.setReturnValue(stateObject);
@@ -73,7 +72,7 @@
public void testInitializeUnknownScope()
{
Location l = fabricateLocation(55);
- ErrorLog log = (ErrorLog)newMock(ErrorLog.class);
+ ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
StateObjectContribution c = new StateObjectContribution();
c.setName("fred");
@@ -111,4 +110,4 @@
assertEquals(StateMessages.unknownStateObjectName("angel"), ex.getMessage());
}
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -28,11 +28,10 @@
*/
public class TestSessionScopeManager extends HiveMindTestCase
{
-
private WebRequest newRequest(boolean create, WebSession session)
{
MockControl control = newControl(WebRequest.class);
- WebRequest request = (WebRequest)control.getMock();
+ WebRequest request = (WebRequest) control.getMock();
request.getSession(create);
control.setReturnValue(session);
@@ -43,7 +42,7 @@
private WebRequest newRequest(WebSession session)
{
MockControl control = newControl(WebRequest.class);
- WebRequest request = (WebRequest)control.getMock();
+ WebRequest request = (WebRequest) control.getMock();
request.getSession(true);
control.setReturnValue(session);
@@ -63,7 +62,7 @@
private StateObjectFactory newFactory(Object stateObject)
{
MockControl control = newControl(StateObjectFactory.class);
- StateObjectFactory factory = (StateObjectFactory)control.getMock();
+ StateObjectFactory factory = (StateObjectFactory) control.getMock();
factory.createStateObject();
control.setReturnValue(stateObject);
@@ -162,7 +161,7 @@
{
session.getAttribute(name);
- setReturnValue(session, attribute);
+ setReturnValue(session,attribute);
}
public void testStore()
@@ -188,15 +187,15 @@
protected WebSession newSession()
{
- return (WebSession)newMock(WebSession.class);
+ return (WebSession) newMock(WebSession.class);
}
protected SessionStoreOptimized newOptimized(boolean dirty)
{
- SessionStoreOptimized optimized = (SessionStoreOptimized)newMock(SessionStoreOptimized.class);
+ SessionStoreOptimized optimized = (SessionStoreOptimized) newMock(SessionStoreOptimized.class);
optimized.isStoreToSessionNeeded();
- setReturnValue(optimized, dirty);
+ setReturnValue(optimized,dirty);
return optimized;
}
@@ -234,4 +233,4 @@
verifyControls();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/AbstractBase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/AbstractBase.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/AbstractBase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/AbstractBase.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,6 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+/**
+ *
+ */
package org.apache.tapestry.enhance;
/**
@@ -20,7 +23,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public abstract class AbstractBase {
-
+public abstract class AbstractBase
+{
public abstract void foo();
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org