svn commit: r1522003 - /turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java

[tv]

Author: tv
Date: Wed Sep 11 19:32:27 2013
New Revision: 1522003

URL: http://svn.apache.org/r1522003
Log:
Test for @TurbineService annotation

Modified:
    
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java

Modified: 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java?rev=1522003&r1=1522002&r2=1522003&view=diff
==============================================================================
--- 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
 (original)
+++ 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
 Wed Sep 11 19:32:27 2013
@@ -22,7 +22,8 @@ package org.apache.turbine.modules.actio
 
 import junit.framework.Assert;
 
-import org.apache.turbine.annotation.InjectService;
+import org.apache.fulcrum.factory.FactoryService;
+import org.apache.turbine.annotation.TurbineService;
 import org.apache.turbine.pipeline.PipelineData;
 import org.apache.turbine.services.rundata.RunDataService;
 import org.apache.turbine.util.RunData;
@@ -34,9 +35,18 @@ import org.apache.velocity.context.Conte
  */
 public class VelocityActionWithServiceInjection extends VelocityAction
 {
-    @InjectService( RunDataService.SERVICE_NAME )
+    // Test for explicit service name
+    @TurbineService( RunDataService.SERVICE_NAME )
     private RunDataService runDataService;
 
+    // Test for implicit SERVICE_NAME
+    @TurbineService
+    private RunDataService runDataService2;
+
+    // Test for implicit ROLE
+    @TurbineService
+    private FactoryService factory;
+
     /**
      *  Default action is nothing.
      *
@@ -61,5 +71,9 @@ public class VelocityActionWithServiceIn
         log.debug("Calling doPerform(PipelineData)");
                Assert.assertNotNull("runDataService object was Null.", 
runDataService);
         log.debug("Injected service is " + runDataService.getName());
+        Assert.assertNotNull("runDataService2 object was Null.", 
runDataService2);
+        log.debug("Injected service is " + runDataService2.getName());
+        Assert.assertNotNull("factory object was Null.", factory);
+        log.debug("Injected service is " + factory.getClass());
     }
 }