tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thiag...@apache.org
Subject [1/3] TAP5-2029: Copy annotations from service implementation to proxy
Date Thu, 02 Jan 2014 16:15:23 GMT
Updated Branches:
  refs/heads/master ae473c840 -> 28df9e51c


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a818e35/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
index 143f1b9..20f2bda 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ReloadSpec.groovy
@@ -311,7 +311,7 @@ class ReloadSpec extends Specification {
 
     Exception e = thrown()
 
-    e.message == "Service implementation class com.example.ReloadableServiceImpl does not
have a suitable public constructor."
+    e.message == "NonAnnotatedServiceInterface implementation class com.example.ReloadableServiceImpl
does not have a suitable public constructor."
   }
 
   def "ensure ReloadAware services are notified when services are reloaded"() {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a818e35/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 c976a73..7bee080 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
@@ -36,7 +36,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification {
 
     RuntimeException e = thrown()
 
-    e.message.contains "Service id 'PeekABoo' is not defined by any module."
+    e.message.contains "NonAnnotatedServiceInterface id 'PeekABoo' is not defined by any
module."
   }
 
   def "verify exception when accessing a service by type and there are no matching services"()
{
@@ -65,7 +65,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification {
 
     RuntimeException e = thrown()
 
-    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."
+    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."
   }
 
   def "access to builtin service via marker annotation"() {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a818e35/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 c76cb3c..37899fb 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 == "Service contribution (to service 'Baz') was null."
+    e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null."
   }
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a818e35/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 60241a7..ea55ace 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 "Service contribution (to service 'Baz') conflicts with existing contribution"
+    e.message.contains "NonAnnotatedServiceInterface 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 == "Service contribution (to service 'Baz') was null."
+    e.message == "NonAnnotatedServiceInterface contribution (to service 'Baz') was null."
     map.isEmpty()
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a818e35/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
index a68ae6e..3acb289 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ServiceProxySerializationSpec.groovy
@@ -53,7 +53,7 @@ class ServiceProxySerializationSpec extends AbstractRegistrySpecification
{
 
     Exception e = thrown()
 
-    e.message.contains "Service token for service 'TypeCoercer' can not be converted back
into a proxy because no proxy provider has been registered"
+    e.message.contains "NonAnnotatedServiceInterface token for service 'TypeCoercer' can
not be converted back into a proxy because no proxy provider has been registered"
   }
 
   def serialize(object) {


Mime
View raw message