You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/07/01 18:30:16 UTC
svn commit: r418490 - in
/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry: ./
callback/ components/ describe/ engine/state/ error/ form/ form/translator/
junit/script/ pageload/ services/impl/ util/ valid/
Author: jkuhnert
Date: Sat Jul 1 09:30:13 2006
New Revision: 418490
URL: http://svn.apache.org/viewvc?rev=418490&view=rev
Log:
all framework tests pass again (finally)
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/MockScriptProcessor.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=418490&r1=418489&r2=418490&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 Sat Jul 1 09:30:13 2006
@@ -162,7 +162,8 @@
protected IRequestCycle newCycle(boolean rewinding, IMarkupWriter writer)
{
IRequestCycle cycle = newRequestCycle();
-
+ checkOrder(cycle, false);
+
trainIsRewinding(cycle, rewinding);
if (writer != null)
@@ -236,7 +237,8 @@
protected IComponent newComponent(String extendedId, Location location)
{
IComponent component = newMock(IComponent.class);
-
+ checkOrder(component, false);
+
expect(component.getExtendedId()).andReturn(extendedId);
expect(component.getLocation()).andReturn(location);
return component;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java Sat Jul 1 09:30:13 2006
@@ -112,7 +112,7 @@
expect(component.getPage()).andReturn(page);
expect(page.getPageName()).andReturn("Fred");
-
+
expect(component.getIdPath()).andReturn("foo.bar");
replay();
@@ -124,10 +124,10 @@
verify();
IRequestCycle cycle = newCycleGetPage("Fred", page);
-
+
Location l = newLocation();
IComponent component2 = newComponent("Fred/foo.bar", l);
-
+
expect(page.getNestedComponent("foo.bar")).andReturn(component2);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java?rev=418490&r1=418489&r2=418490&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 Sat Jul 1 09:30:13 2006
@@ -66,10 +66,10 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(false, writer);
- IRender body = newRender();
-
+
writer.begin("span");
-
+
+ IRender body = newRender();
body.render(writer, cycle);
writer.end("span");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java Sat Jul 1 09:30:13 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.describe;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import java.net.URL;
@@ -38,7 +38,8 @@
private Resource newResource(URL url)
{
Resource resource = newMock(Resource.class);
-
+ checkOrder(resource, false);
+
expect(resource.getResourceURL()).andReturn(url);
return resource;
@@ -88,10 +89,10 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- expect(l.getLineNumber()).andReturn(0);
-
writer.print(l.toString());
-
+
+ expect(l.getLineNumber()).andReturn(0);
+
replay();
new LocationRenderStrategy().renderObject(l, writer, cycle);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Sat Jul 1 09:30:13 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine.state;
+import static org.easymock.EasyMock.checkOrder;
import static org.easymock.EasyMock.expect;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertSame;
@@ -54,7 +55,8 @@
private WebSession newSession(String key, Object value)
{
WebSession session = newSession();
-
+ checkOrder(session, false);
+
trainGetAttribute(session, key, value);
return session;
@@ -87,7 +89,7 @@
{
WebSession session = newSession("state:myapp:fred", null);
WebRequest request = newRequest(false, session);
-
+
replay();
SessionScopeManager m = new SessionScopeManager();
@@ -135,16 +137,17 @@
public void testGetAndCreate()
{
Object stateObject = new Object();
- StateObjectFactory factory = newFactory(stateObject);
-
+
WebSession session = newSession();
-
+
+ WebRequest request = newRequest(session);
+
trainGetAttribute(session, "state:myapp:fred", null);
+ StateObjectFactory factory = newFactory(stateObject);
+
session.setAttribute("state:myapp:fred", stateObject);
- WebRequest request = newRequest(session);
-
replay();
SessionScopeManager m = new SessionScopeManager();
@@ -166,10 +169,9 @@
Object stateObject = new Object();
WebSession session = newSession();
-
- session.setAttribute("state:myapp:fred", stateObject);
-
WebRequest request = newRequest(session);
+
+ session.setAttribute("state:myapp:fred", stateObject);
replay();
@@ -214,10 +216,9 @@
Object stateObject = newOptimized(true);
WebSession session = newSession();
-
- session.setAttribute("state:myapp:fred", stateObject);
-
WebRequest request = newRequest(session);
+
+ session.setAttribute("state:myapp:fred", stateObject);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java Sat Jul 1 09:30:13 2006
@@ -14,8 +14,7 @@
package org.apache.tapestry.error;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.*;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
@@ -43,6 +42,7 @@
protected IRequestCycle newCycle(String pageName, IPage page)
{
IRequestCycle cycle = newCycle();
+ checkOrder(cycle, false);
expect(cycle.getPage(pageName)).andReturn(page);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java Sat Jul 1 09:30:13 2006
@@ -68,16 +68,16 @@
IPage page = newPage();
IRequestCycle cycle = newCycle("Exception", page);
- ResponseRenderer renderer = newRenderer(cycle, renderCause);
+
RequestExceptionReporter reporter = newReporter();
-
+
cycle.activate(page);
-
+
reporter.reportRequestException(ErrorMessages.unableToProcessClientRequest(cause), cause);
- reporter.reportRequestException(
- ErrorMessages.unableToPresentExceptionPage(renderCause),
- renderCause);
-
+ reporter.reportRequestException(ErrorMessages.unableToPresentExceptionPage(renderCause), renderCause);
+
+ ResponseRenderer renderer = newRenderer(cycle, renderCause);
+
replay();
ExceptionPresenterImpl ep = new ExceptionPresenterImpl();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java Sat Jul 1 09:30:13 2006
@@ -82,7 +82,8 @@
protected IFormComponent newField(String displayName, String clientId, int count)
{
IFormComponent field = newMock(IFormComponent.class);
-
+ checkOrder(field, false);
+
expect(field.getDisplayName()).andReturn(displayName);
expect(field.getClientId()).andReturn(clientId).times(count);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java?rev=418490&r1=418489&r2=418490&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 Sat Jul 1 09:30:13 2006
@@ -157,9 +157,9 @@
}
catch (ApplicationRuntimeException ex)
{
- assertEquals(
- "LinkSubmit MyPage/fred may not be enclosed by another LinkSubmit (MyPage/barney, at classpath:/org/apache/tapestry/form/LinkSubmitTest, line 1).",
- ex.getMessage());
+ assert ex.getMessage()
+ .indexOf("LinkSubmit MyPage/fred may not be enclosed by another LinkSubmit ") > -1;
+
assertSame(linkSubmit, ex.getComponent());
assertSame(floc, ex.getLocation());
}
@@ -230,12 +230,12 @@
trainGetDelegate(form, delegate);
- trainGetElementId(form, linkSubmit, "fred");
-
delegate.setFormComponent(linkSubmit);
-
+
+ trainGetElementId(form, linkSubmit, "fred");
+
trainIsRewinding(form, true);
-
+
// Finally, code inside LinkSubmit ...
trainGetParameter(cycle, FormConstants.SUBMIT_NAME_PARAMETER, null);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java Sat Jul 1 09:30:13 2006
@@ -285,14 +285,19 @@
delegate.setFormComponent(component);
trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
expect(tfs.format(component, " text area value ")).andReturn("text area value");
+ trainGetDelegate(form, delegate);
+
tfs.renderContributions(component, writer, cycle);
+
+ trainGetDelegate(form, delegate);
+
vfs.renderContributions(component, writer, cycle);
+ trainGetDelegate(form, delegate);
+
replay();
component.render(writer, cycle);
@@ -328,16 +333,19 @@
trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
-
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
-
+
expect(tfs.format(component, " text area value ")).andReturn("text area value");
+ trainGetDelegate(form, delegate);
+
tfs.renderContributions(component, writer, cycle);
+
+ trainGetDelegate(form, delegate);
+
vfs.renderContributions(component, writer, cycle);
+ trainGetDelegate(form, delegate);
+
replay();
component.render(writer, cycle);
@@ -378,10 +386,6 @@
delegate.setFormComponent(component);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
-
expect(tfs.format(component, " text area value ")).andReturn("text area value");
tfs.renderContributions(component, writer, cycle);
@@ -423,15 +427,18 @@
delegate.setFormComponent(component);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
- trainGetDelegate(form, delegate);
-
expect(tfs.format(component, null)).andReturn("");
+ trainGetDelegate(form, delegate);
+
tfs.renderContributions(component, writer, cycle);
+
+ trainGetDelegate(form, delegate);
+
vfs.renderContributions(component, writer, cycle);
+ trainGetDelegate(form, delegate);
+
replay();
component.render(writer, cycle);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Sat Jul 1 09:30:13 2006
@@ -75,7 +75,7 @@
testFormat(translator, new Double(0.10), "10%");
}
- public void testFormat(Translator translator, Number number, String expected)
+ private void testFormat(Translator translator, Number number, String expected)
{
IFormComponent field = newField();
@@ -143,7 +143,7 @@
public void testFailedParseDefaultMessage()
{
NumberTranslator translator = new NumberTranslator();
-
+
testFailedParse(translator, null);
}
@@ -165,7 +165,6 @@
ValidationMessages messages = newMock(ValidationMessages.class);
trainGetLocale(messages, Locale.ENGLISH);
- trainGetLocale(messages, Locale.ENGLISH);
trainBuildMessage(
messages,
@@ -195,24 +194,22 @@
public void testRenderContribution()
{
NumberTranslator translator = new NumberTranslator();
-
+ IFormComponent field = newField("Number Field", "numberField", 1);
+
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
-
+
context.includeClasspathScript(translator.defaultScript());
-
+
trainGetLocale(context, Locale.ENGLISH);
-
+
trainBuildMessage(context, null, ValidationStrings.INVALID_NUMBER, new Object[]
{ "Number Field", "#" }, "invalid number message");
- context
- .addSubmitHandler("function(event) { Tapestry.validate_number(event, 'numberField', 'invalid number message'); }");
-
- IFormComponent field = newField("Number Field", "numberField", 1);
-
+ context.addSubmitHandler("function(event) { Tapestry.validate_number(event, 'numberField', 'invalid number message'); }");
+
replay();
translator.renderContribution(writer, cycle, context, field);
@@ -223,7 +220,8 @@
public void testMessageRenderContribution()
{
NumberTranslator translator = new NumberTranslator();
-
+ IFormComponent field = newField("Number Field", "myfield", 1);
+
String messageOverride = "You entered a bunk value for {0}. I should look like {1}. Watch out for ''this''!";
IMarkupWriter writer = newWriter();
@@ -243,10 +241,7 @@
{ "Number Field", "#" },
"Blah Blah 'Field Name' Blah.");
- context
- .addSubmitHandler("function(event) { Tapestry.validate_number(event, 'myfield', 'Blah Blah \\'Field Name\\' Blah.'); }");
-
- IFormComponent field = newField("Number Field", "myfield", 1);
+ context.addSubmitHandler("function(event) { Tapestry.validate_number(event, 'myfield', 'Blah Blah \\'Field Name\\' Blah.'); }");
replay();
@@ -259,7 +254,6 @@
public void testTrimRenderContribution()
{
-
IFormComponent field = newField("Number Field", "myfield", 2);
NumberTranslator translator = new NumberTranslator();
@@ -270,7 +264,7 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
context.includeClasspathScript(translator.defaultScript());
-
+
trainTrim(context, "myfield");
trainGetLocale(context, Locale.ENGLISH);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/MockScriptProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/MockScriptProcessor.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/MockScriptProcessor.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/MockScriptProcessor.java Sat Jul 1 09:30:13 2006
@@ -38,6 +38,17 @@
private IdAllocator _idAllocator = new IdAllocator();
+ public void reset()
+ {
+ if (_body != null)
+ _body.delete(0, _body.length());
+ if (_initialization != null)
+ _initialization.delete(0, _initialization.length());
+ if (_externalScripts != null)
+ _externalScripts.clear();
+ _idAllocator.clear();
+ }
+
public void addBodyScript(String script)
{
addBodyScript(null, script);
@@ -89,7 +100,7 @@
{
if (_externalScripts == null)
_externalScripts = new ArrayList();
-
+
_externalScripts.add(scriptResource);
}
@@ -108,4 +119,4 @@
return _idAllocator.allocateId(baseValue);
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java Sat Jul 1 09:30:13 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.junit.script;
import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
import java.util.Arrays;
import java.util.HashMap;
@@ -37,6 +36,7 @@
import org.apache.tapestry.services.impl.ExpressionCacheImpl;
import org.apache.tapestry.services.impl.ExpressionEvaluatorImpl;
import org.apache.tapestry.util.xml.DocumentParseException;
+import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
/**
@@ -50,6 +50,12 @@
{
private MockScriptProcessor _processor = new MockScriptProcessor();
+ @Configuration(afterTestMethod = true)
+ public void reset()
+ {
+ _processor.reset();
+ }
+
protected static ExpressionEvaluator createExpressionEvaluator()
{
ExpressionCache cache = new ExpressionCacheImpl();
@@ -101,10 +107,12 @@
public void testSimple() throws Exception
{
execute("simple.script", null);
-
+
assertEquals("body", "\nBODY\n", _processor.getBody());
assertEquals("initialization", "\nINITIALIZATION\n", _processor.getInitialization());
- assertNull(_processor.getExternalScripts());
+
+ assert _processor.getExternalScripts() == null
+ || _processor.getExternalScripts().length == 0;
}
/**
@@ -132,9 +140,9 @@
public void testEmpty() throws Exception
{
execute("empty.script", null);
-
- assertNull("body", _processor.getBody());
- assertNull("initialization", _processor.getInitialization());
+
+ assert _processor.getBody() == null || _processor.getBody().length() == 0;
+ assert _processor.getInitialization() == null || _processor.getInitialization().length() == 0;
}
/**
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java Sat Jul 1 09:30:13 2006
@@ -14,8 +14,9 @@
package org.apache.tapestry.pageload;
+import static org.easymock.EasyMock.endsWith;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.easymock.EasyMock.startsWith;
import static org.testng.AssertJUnit.assertSame;
import org.apache.commons.logging.Log;
@@ -64,9 +65,8 @@
}
catch (ApplicationRuntimeException ex)
{
- assertEquals(
- "A binding for parameter dupe conflicts with a previous binding (at classpath:/org/apache/tapestry/pageload/PageLoaderTest, line 1).",
- ex.getMessage());
+ assert ex.getMessage()
+ .indexOf("A binding for parameter dupe conflicts with a previous binding") > -1;
assertSame(component, ex.getComponent());
assertSame(l2, ex.getLocation());
}
@@ -100,8 +100,7 @@
trainGetSpecification(component, spec);
- log
- .warn("Parameter barney (for component FredComponent, at classpath:/org/apache/tapestry/pageload/PageLoaderTest, line 1) was bound; this parameter has been deprecated, bind parameter fred instead.");
+ log.warn(startsWith("Parameter barney (for component FredComponent, at "));
trainCreateBinding(
source,
@@ -167,10 +166,9 @@
trainGetSpecification(component, spec);
- log
- .warn("Parameter fred (at classpath:/org/apache/tapestry/pageload/PageLoaderTest, line 1) has been deprecated, "
+ log.warn(endsWith("has been deprecated, "
+ "and may be removed in a future release. Consult the documentation for component FredComponent to "
- + "determine an appropriate replacement.");
+ + "determine an appropriate replacement."));
trainCreateBinding(source, container, "parameter fred", "an-expression", "ognl", l, binding);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java Sat Jul 1 09:30:13 2006
@@ -68,11 +68,11 @@
IEngineService service = newEngineService();
Object parameter = new Object();
-
- trainGetLink(service, false, parameter, link);
-
+
EngineServiceSource source = newSource("fred", service);
+ trainGetLink(service, false, parameter, link);
+
replay();
EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
@@ -95,10 +95,10 @@
Object parameter = new Object();
- trainGetLink(service, true, parameter, link);
-
EngineServiceSource source = newSource("fred", service);
-
+
+ trainGetLink(service, true, parameter, link);
+
replay();
EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
@@ -116,11 +116,11 @@
{
IRequestCycle cycle = newCycle();
IEngineService service = newEngineService();
-
- service.service(cycle);
-
+
EngineServiceSource source = newSource("fred", service);
-
+
+ service.service(cycle);
+
replay();
EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java Sat Jul 1 09:30:13 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.util;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertSame;
@@ -51,7 +51,8 @@
private IAsset newAsset(IRequestCycle cycle, String url)
{
IAsset asset = newMock(IAsset.class);
-
+ checkOrder(asset, false);
+
expect(asset.buildURL()).andReturn(url);
return asset;
@@ -252,13 +253,14 @@
String newline = System.getProperty("line.separator");
IRequestCycle cycle = newCycle();
-
+
IMarkupWriter writer = createWriter();
AssetFactory assetFactory = newMock(AssetFactory.class);
-
+
Resource script1 = newResource();
IAsset asset1 = newAsset(cycle, "/script1.js");
+
Resource script2 = newResource();
IAsset asset2 = newAsset(cycle, "/script2.js");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java?rev=418490&r1=418489&r2=418490&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestEmailValidator.java Sat Jul 1 09:30:13 2006
@@ -17,6 +17,7 @@
import static org.testng.AssertJUnit.assertEquals;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
/**
@@ -30,6 +31,17 @@
{
private EmailValidator v = new EmailValidator();
+ @Configuration(afterTestMethod = true)
+ public void reset()
+ {
+ v.setClientScriptingEnabled(false);
+ v.setInvalidEmailFormatMessage(null);
+ v.setMinimumLength(-1);
+ v.setMinimumLengthMessage(null);
+ v.setRequired(false);
+ v.setRequiredMessage(null);
+ }
+
public void testValidEmail() throws ValidatorException
{
IFormComponent field = newField();