Updated Branches: refs/heads/master 222291cad -> 5357232b9
Fix broken tests Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5357232b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5357232b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5357232b Branch: refs/heads/master Commit: 5357232b93374f3daf72f2133fc8de39e579d42a Parents: 222291c Author: Howard M. Lewis Ship <[email protected]> Authored: Fri Jul 26 08:51:32 2013 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Fri Jul 26 08:51:32 2013 -0700 ---------------------------------------------------------------------- .../tapestry5/corelib/components/PageLinkTest.groovy | 2 +- .../services/ClientPersistentFieldStorageImplTest.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5357232b/tapestry-core/src/test/groovy/org/apache/tapestry5/corelib/components/PageLinkTest.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/corelib/components/PageLinkTest.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/corelib/components/PageLinkTest.groovy index f8e8fe1..aaf49d3 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/corelib/components/PageLinkTest.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/corelib/components/PageLinkTest.groovy @@ -24,7 +24,7 @@ class PageLinkTest extends TapestryTestCase { expect(resources.isBound("parameters")).andReturn true // TAP5-2126: - link.removeParameter("foo") + expect(link.removeParameter("foo")).andReturn link expect(link.addParameterValue("foo", "bar")).andReturn link http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5357232b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java index 00edc82..0b24b38 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java @@ -1,4 +1,4 @@ -// Copyright 2007, 2008, 2009, 2011 The Apache Software Foundation +// Copyright 2007-2013 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,19 +17,20 @@ package org.apache.tapestry5.internal.services; import org.apache.tapestry5.Link; import org.apache.tapestry5.internal.test.InternalBaseTestCase; import org.apache.tapestry5.internal.util.Holder; -import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList; import org.apache.tapestry5.services.ClientDataEncoder; import org.apache.tapestry5.services.PersistentFieldChange; import org.apache.tapestry5.services.Request; import org.easymock.EasyMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.isA; import org.easymock.IAnswer; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import java.util.List; +import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.isA; + public class ClientPersistentFieldStorageImplTest extends InternalBaseTestCase { private ClientDataEncoder clientDataEncoder; @@ -137,7 +138,7 @@ public class ClientPersistentFieldStorageImplTest extends InternalBaseTestCase String pageName = "Foo"; String componentId = "bar.baz"; - link.addParameter(eq(ClientPersistentFieldStorageImpl.PARAMETER_NAME), isA(String.class)); + expect(link.addParameter(eq(ClientPersistentFieldStorageImpl.PARAMETER_NAME), isA(String.class))).andReturn(link); replay();
