svn commit: r589404 - /tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java

[hl...@apache.org]

Author: hlship
Date: Sun Oct 28 12:45:51 2007
New Revision: 589404

URL: http://svn.apache.org/viewvc?rev=589404&view=rev
Log:
TAPESTRY-1828: Convert uses of @InjectService to be @Inject plus a marker annotation

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java?rev=589404&r1=589403&r2=589404&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java Sun Oct 28 12:45:51 2007
@@ -28,6 +28,7 @@
 import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
 import org.apache.tapestry.ioc.services.Status;
 import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.easymock.EasyMock;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -645,6 +646,7 @@
 
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     public void builtin_services_available_via_marker_annotation()
     {
@@ -657,6 +659,12 @@
         AnnotationProvider ap = mockAnnotationProvider();
 
         train_getAnnotation(ap, Builtin.class, annotation);
+
+        // On the build server, the order of keys inside the RegistryImpl's _markerToServiceDef
+        // is different, and so it *may* query ofr a number of other annotations
+        // besides Builtin.
+        
+        expect(ap.getAnnotation(EasyMock.isA(Class.class))).andStubReturn(null);
 
         replay();