Author: jkuhnert
Date: Mon Mar 13 19:46:24 2006
New Revision: 385726
URL: http://svn.apache.org/viewcvs?rev=385726&view=rev
Log:
Fixed more unit test failures
Modified:
jakarta/tapestry/trunk/.classpath
jakarta/tapestry/trunk/config/build.properties.sample
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceMap.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
Modified: jakarta/tapestry/trunk/.classpath
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.classpath?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/config/build.properties.sample
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/config/build.properties.sample?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
--- jakarta/tapestry/trunk/config/build.properties.sample (original)
+++ jakarta/tapestry/trunk/config/build.properties.sample Mon Mar 13 19:46:24
2006
@@ -13,6 +13,6 @@
# Required to execute the run-workbench target.
jetty.dir=
-# Absolute path to dojo source installation directory.
-#
+# Absolute path to dojo source installation buildscripts directory.
+# ie: /home/<username>/dojo/buildscripts
#dojo.dir=
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.java
Mon Mar 13 19:46:24 2006
@@ -15,8 +15,8 @@
package org.apache.tapestry.link;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
+import org.apache.tapestry.services.ServiceMap;
/**
* A component for creating a link for an arbitrary [EMAIL PROTECTED]
org.apache.tapestry.engine.IEngineService
@@ -36,10 +36,16 @@
{
Object[] parameters =
DirectLink.constructServiceParameters(getParameters());
- return getService().getLink(false, parameters);
+ return getServiceMap().getService(getService()).getLink(false,
parameters);
}
- public abstract IEngineService getService();
+ public abstract String getService();
+ /**
+ * Injected.
+ * @since 4.1
+ */
+ public abstract ServiceMap getServiceMap();
+
public abstract Object getParameters();
}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc
Mon Mar 13 19:46:24 2006
@@ -58,4 +58,6 @@
</description>
</parameter>
+ <inject object="service:tapestry.services.ServiceMap" property="serviceMap"/>
+
</component-specification>
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceMap.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceMap.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceMap.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/ServiceMap.java
Mon Mar 13 19:46:24 2006
@@ -38,11 +38,11 @@
* @throws org.apache.hivemind.ApplicationRuntimeException
* if the named service does not exist
*/
- public IEngineService getService(String name);
+ IEngineService getService(String name);
/**
* Returns true if the name is a known service, or false otherwise.
*/
- public boolean isValid(String name);
-}
\ No newline at end of file
+ boolean isValid(String name);
+}
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
Mon Mar 13 19:46:24 2006
@@ -304,10 +304,7 @@
protected IEngine newEngine(ClassResolver resolver)
{
IEngine engine = (IEngine) newMock(IEngine.class);
-
- ClassResolver cr = new DefaultClassResolver();
- setReturnValue(engine, cr);
-
+
return engine;
}
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=385726&r1=385725&r2=385726&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
Mon Mar 13 19:46:24 2006
@@ -130,18 +130,12 @@
cycle.getEngine();
verifyControls();
-
- source.discardAllStoredChanged("MyPage");
-
- replayControls();
-
- cycle.forgetPage("MyPage");
-
- verifyControls();
source.discardAllStoredChanged("MyPage");
replayControls();
+
+ cycle.forgetPage("MyPage");
verifyControls();
}
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
Mon Mar 13 19:46:24 2006
@@ -102,13 +102,10 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
- IEngine engine = newEngine(getClassResolver());
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -118,19 +115,19 @@
verifyControls();
delegate.clear();
-
+
trainGetParameter(cycle, FormSupportImpl.SUBMIT_MODE, "cancel");
-
+
// Create a body, just to provie it doesn't get invoked.
-
+
IRender body = (IRender) newMock(IRender.class);
-
+
form.setBody(body);
-
+
replayControls();
-
+
assertEquals(FormConstants.SUBMIT_CANCEL, fs.rewind());
-
+
verifyControls();
}
@@ -139,7 +136,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
ILink link = newLink();
IRender render = newRender();
@@ -148,8 +144,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
PageRenderSupport support = newPageRenderSupport();
trainGetPageRenderSupport(cycle, support);
@@ -216,11 +210,9 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
- IEngine engine = newEngine(getClassResolver());
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -254,7 +246,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -263,7 +254,6 @@
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, support);
replayControls();
@@ -330,7 +320,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -339,7 +328,6 @@
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, support);
@@ -449,7 +437,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -459,8 +446,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, support);
replayControls();
@@ -530,7 +515,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -540,8 +524,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, support);
replayControls();
@@ -592,13 +574,10 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
- IEngine engine = newEngine(getClassResolver());
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -629,7 +608,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -639,8 +617,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, support);
replayControls();
@@ -706,7 +682,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
PageRenderSupport support = newPageRenderSupport();
ILink link = newLink();
@@ -716,8 +691,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, support);
replayControls();
@@ -780,15 +753,12 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -818,13 +788,11 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -875,13 +843,11 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -933,13 +899,11 @@
Location l = newLocation();
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate, l);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -988,7 +952,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
ILink link = newLink();
IRender render = newRender();
@@ -997,8 +960,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
PageRenderSupport support = newPageRenderSupport();
trainGetPageRenderSupport(cycle, support);
@@ -1061,7 +1022,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
ILink link = newLink();
IRender render = newRender();
@@ -1070,8 +1030,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
PageRenderSupport support = newPageRenderSupport();
trainGetPageRenderSupport(cycle, support);
@@ -1150,7 +1108,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
ILink link = newLink();
IRender render = newRender();
@@ -1159,8 +1116,6 @@
trainIsRewound(cycle, form, false);
- trainGetEngine(cycle, engine);
-
PageRenderSupport support = newPageRenderSupport();
trainGetPageRenderSupport(cycle, support);
@@ -1223,13 +1178,10 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
- IEngine engine = newEngine(getClassResolver());
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -1260,13 +1212,10 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
- IEngine engine = newEngine(getClassResolver());
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
- trainGetEngine(cycle, engine);
-
trainGetPageRenderSupport(cycle, null);
replayControls();
@@ -1312,7 +1261,6 @@
IMarkupWriter writer = newWriter();
NestedMarkupWriter nested = newNestedWriter();
IRequestCycle cycle = newCycle();
- IEngine engine = newEngine(getClassResolver());
IValidationDelegate delegate = newDelegate();
ILink link = newLink();
IRender render = newRender();
@@ -1320,8 +1268,6 @@
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, false);
-
- trainGetEngine(cycle, engine);
PageRenderSupport support = newPageRenderSupport();
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Mon Mar 13 19:46:24 2006
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
+import org.apache.commons.io.IOUtils;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
@@ -85,37 +86,28 @@
TemplateParser parser = new TemplateParser();
parser.setFactory(new TemplateTokenFactory());
-
+
return parser.parse(templateData, delegate, location);
}
protected TemplateToken[] run(InputStream stream, ITemplateParserDelegate
delegate,
Resource location) throws TemplateParseException
{
- StringBuffer buffer = new StringBuffer();
- char[] block = new char[1000];
InputStreamReader reader = new InputStreamReader(stream);
-
+ char[] data = null;
+
try
{
- while (true)
- {
- int count = reader.read(block, 0, block.length);
-
- if (count < 0)
- break;
-
- buffer.append(block, 0, count);
- }
-
+ data = IOUtils.toCharArray(reader);
+
reader.close();
}
catch (IOException ex)
{
fail("Unable to read from stream.");
}
-
- return run(buffer.toString().toCharArray(), delegate, location);
+
+ return run(data, delegate, location);
}
protected TemplateToken[] run(String file) throws TemplateParseException
@@ -155,16 +147,16 @@
protected void assertTextToken(TemplateToken token, int startIndex, int
endIndex)
{
TextToken t = (TextToken) token;
-
+
int expectedLength = endIndex - startIndex + 1;
-
+
assertEquals("Text token type.", TokenType.TEXT, t.getType());
assertEquals("Text token start index.", startIndex, t.getOffset());
assertEquals("Text token end index.", expectedLength, t.getLength());
}
-
+
/** @since 3.0 * */
-
+
protected void checkLine(TemplateToken token, int line)
{
assertEquals("Token line", line, token.getLocation().getLineNumber());
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java?rev=385726&r1=385725&r2=385726&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidatorBindingFactory.java
Mon Mar 13 19:46:24 2006
@@ -19,6 +19,7 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.coerce.ValueConverter;
+import org.apache.tapestry.engine.IScriptSource;
import org.easymock.MockControl;
/**
@@ -37,19 +38,24 @@
MockControl vbfc = newControl(BeanFactory.class);
BeanFactory vbf = (BeanFactory) vbfc.getMock();
+ IScriptSource scriptSource =
(IScriptSource)newMock(IScriptSource.class);
+
vbf.get("foo,bar=baz");
vbfc.setReturnValue(validator);
-
+
Location l = newLocation();
-
+
+ validator.setScriptSource(scriptSource);
+
replayControls();
ValidatorBindingFactory factory = new ValidatorBindingFactory();
factory.setValueConverter(vc);
factory.setValidatorBeanFactory(vbf);
-
+ factory.setScriptSource(scriptSource);
+
IBinding binding = factory.createBinding(null, "validator bean",
"foo,bar=baz", l);
-
+
assertSame(validator, binding.getObject());
assertSame(l, binding.getLocation());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
