Updated Branches: refs/heads/master 0cca44b7e -> 52c6f6c25
revert to a1bef8696b1737a15986de2ce502842de6989f00 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/52c6f6c2 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/52c6f6c2 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/52c6f6c2 Branch: refs/heads/master Commit: 52c6f6c254e781369e23f378f3945bdb978ca13f Parents: 0cca44b Author: ffacon <[email protected]> Authored: Mon Feb 10 22:49:46 2014 +0100 Committer: ffacon <[email protected]> Committed: Mon Feb 10 22:49:46 2014 +0100 ---------------------------------------------------------------------- .../src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy | 2 +- .../ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy | 2 +- tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy | 2 +- .../groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy | 2 +- .../ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c6f6c2/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy index 9682a4b..d017dfc 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy @@ -144,7 +144,7 @@ class DefaultModuleDefImplSpec extends Specification { RuntimeException ex = thrown() - ex.message.contains "NonAnnotatedServiceInterface Fred (defined by ${ServiceIdConflictMethodModule.name}.buildFred()" + ex.message.contains "Service Fred (defined by ${ServiceIdConflictMethodModule.name}.buildFred()" ex.message.contains "conflicts with previously defined service defined by ${ServiceIdConflictMethodModule.name}.buildFred(Object)" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c6f6c2/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy index fc8ca85..a746d07 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy @@ -20,7 +20,7 @@ class RegistryConstructionAndRuntimeErrorsSpec extends AbstractRegistrySpecifica RuntimeException ex = thrown() - ex.message.startsWith "NonAnnotatedServiceInterface id 'Fred' has already been defined by" + ex.message.startsWith "Service id 'Fred' has already been defined by" // Can't check entire message, can't guarantee what order modules will be processed in } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c6f6c2/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy index 7bee080..5bfc34e 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy @@ -65,7 +65,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification { RuntimeException e = thrown() - e.message == "NonAnnotatedServiceInterface interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface." + e.message == "Service interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface." } def "access to builtin service via marker annotation"() { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c6f6c2/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy index 37899fb..c76cb3c 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingConfigurationWrapperSpec.groovy @@ -75,6 +75,6 @@ class ValidatingConfigurationWrapperSpec extends Specification { NullPointerException e = thrown() - e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null." + e.message == "Service contribution (to service 'Baz') was null." } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c6f6c2/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy index ea55ace..60241a7 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/ValidatingMappedConfigurationWrapperSpec.groovy @@ -97,7 +97,7 @@ class ValidatingMappedConfigurationWrapperSpec extends AbstractSharedRegistrySpe IllegalArgumentException e = thrown() - e.message.contains "NonAnnotatedServiceInterface contribution (to service 'Baz') conflicts with existing contribution" + e.message.contains "Service contribution (to service 'Baz') conflicts with existing contribution" keyToContribution[Integer].is(def1) map.isEmpty() @@ -148,7 +148,7 @@ class ValidatingMappedConfigurationWrapperSpec extends AbstractSharedRegistrySpe NullPointerException e = thrown() - e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null." + e.message == "Service contribution (to service 'Baz') was null." map.isEmpty() } } \ No newline at end of file
