Repository: tapestry-5 Updated Branches: refs/heads/master 504f1ada7 -> 5d7dfb857
fix 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/5d7dfb85 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5d7dfb85 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5d7dfb85 Branch: refs/heads/master Commit: 5d7dfb8570fe4dfb92153b71618b19a0c832709a Parents: 504f1ad Author: Jochen Kemnade <[email protected]> Authored: Thu Jul 14 12:24:35 2016 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Thu Jul 14 12:38:35 2016 +0200 ---------------------------------------------------------------------- .../services/ComponentInstanceResultProcessorTest.java | 6 ++++-- .../src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy | 2 +- .../src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy | 2 +- .../src/test/groovy/ioc/specs/RegistryStartupSpec.groovy | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5d7dfb85/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java index 19c4156..b65e38a 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java @@ -63,10 +63,12 @@ public class ComponentInstanceResultProcessorTest extends InternalBaseTestCase train_getContainer(valueResources, containerResources); - train_getCompleteId(valueResources, PAGE_NAME + ":child"); + String completeId = PAGE_NAME + ":child"; + + train_getCompleteId(valueResources, completeId); logger - .warn("Component Zoop:child was returned from an event handler method, but is not a page component. The page containing the component will render the client response."); + .warn("Component {} was returned from an event handler method, but is not a page component. The page containing the component will render the client response.", completeId); train_getPageName(valueResources, PAGE_NAME); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5d7dfb85/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy index 402d3a9..e414a18 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy @@ -120,7 +120,7 @@ class BridgeBuilderSpec extends AbstractSharedRegistrySpecification { then: - 1 * logger.error("Method void extraFilterMethod() of filter interface org.apache.tapestry5.ioc.internal.services.ExtraFilterMethod does not have a matching method in java.io.Serializable.") + 1 * logger.error('Method {} of filter interface {} does not have a matching method in {}.', { it.name == "extraFilterMethod" }, ExtraFilterMethod.name, Serializable.name) 0 * _ } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5d7dfb85/tapestry-ioc/src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy index ea01ebf..b349a7f 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/PerthreadManagerImplSpec.groovy @@ -65,7 +65,7 @@ class PerthreadManagerImplSpec extends Specification { then: 1 * l1.threadDidCleanup() >> { throw t } - 1 * logger.warn({ it.contains "Error invoking callback"}, t) + 1 * logger.warn("Error invoking callback {}: {}", {it instanceof Runnable}, t, t) then: http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5d7dfb85/tapestry-ioc/src/test/groovy/ioc/specs/RegistryStartupSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryStartupSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryStartupSpec.groovy index 8c23fc8..ea0e459 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryStartupSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryStartupSpec.groovy @@ -49,7 +49,7 @@ class RegistryStartupSpec extends Specification { then: 1 * r1.run() >> { throw ex } - 1 * logger.error("An exception occurred during startup: Crunch!", ex) + 1 * logger.error("An exception occurred during startup: {}", 'Crunch!', ex) 1 * r2.run() }
