You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by km...@apache.org on 2009/02/03 04:31:51 UTC
svn commit: r740203 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/test/TapestryTestCase.java
test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
Author: kmenard
Date: Tue Feb 3 03:31:51 2009
New Revision: 740203
URL: http://svn.apache.org/viewvc?rev=740203&view=rev
Log:
TAP5-181: Highlight duplicated IDs.
Fixed some failing tests due to unexpected unmocked method calls.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java?rev=740203&r1=740202&r2=740203&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java Tue Feb 3 03:31:51 2009
@@ -889,6 +889,16 @@
expect(locatable.getLocation()).andReturn(location).atLeastOnce();
}
+ public final void train_getResource(Location location, Resource resource)
+ {
+ expect(location.getResource()).andReturn(resource).atLeastOnce();
+ }
+
+ public final void train_getLine(Location location, int line)
+ {
+ expect(location.getLine()).andReturn(line).atLeastOnce();
+ }
+
protected final void train_getParameter(Request request, String elementName, String value)
{
expect(request.getParameter(elementName)).andReturn(value).atLeastOnce();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java?rev=740203&r1=740202&r2=740203&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java Tue Feb 3 03:31:51 2009
@@ -22,6 +22,7 @@
import org.apache.tapestry5.internal.services.Instantiator;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
import org.apache.tapestry5.ioc.internal.util.TapestryException;
import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.model.ParameterModel;
@@ -482,7 +483,9 @@
ComponentModel model = mockComponentModel();
ComponentPageElement child1 = mockComponentPageElement();
ComponentPageElement child2 = mockComponentPageElement();
- Location l = mockLocation();
+ Location loc1 = mockLocation();
+ Location loc2 = mockLocation();
+ Resource resource = mockResource();
Logger logger = mockLogger();
ComponentPageElementResources elementResources = mockResources(logger);
@@ -493,7 +496,12 @@
train_getId(child1, "Child");
train_getId(child2, "CHILD");
- train_getLocation(child2, l);
+ train_getPath(resource, PAGE_NAME);
+ train_getResource(loc1, resource);
+ train_getLine(loc1, 1);
+
+ train_getLocation(child1, loc1);
+ train_getLocation(child2, loc2);
replay();
@@ -509,7 +517,7 @@
catch (TapestryException ex)
{
assertTrue(ex.getMessage().contains("already contains a child component with id 'CHILD'."));
- assertSame(ex.getLocation(), l);
+ assertSame(ex.getLocation(), loc2);
}
verify();