#239 Injector should not be set in case of testing

Author: Igor Polevoy

activeweb-testing/src/test/java/app/config/AppBootstrap.java

@@ -18,6 +18,7 @@
 
 import app.services.GreeterModule;
 import com.google.inject.Guice;
+import com.google.inject.Injector;
 import com.google.inject.Module;
 import org.javalite.activeweb.AppContext;
 import org.javalite.activeweb.Bootstrap;
@@ -26,8 +27,12 @@
  * @author Igor Polevoy
  */
 public class AppBootstrap extends Bootstrap {
+
+    @Override
+    public void init(AppContext context) {}
+
     @Override
-    public void init(AppContext context) {
-        setInjector(Guice.createInjector(new GreeterModule()));
+    public Injector getInjector() {
+        return Guice.createInjector(new GreeterModule());
     }
 }

activeweb/src/main/java/org/javalite/activeweb/Bootstrap.java

@@ -60,11 +60,30 @@ public void destroy(AppContext context){}
      *     with mocks for testing.
      * </p>
      *
+     * @deprecated This method will be removed in future versions. Instead, override {@link #getInjector()} method
+     * to produce your injector.
+     *
      * @param injector Injector instance to use for dependency injection.
      */
     public void setInjector(Injector injector){
         if(!Configuration.isTesting()){
             Context.getControllerRegistry().setInjector(injector);
         }
     }
+
+    /**
+     * Subclasses need to override this method to return instance of Injector to use for dependency injection.
+     *
+     * <p></p>
+
+     * <strong>
+     *     This method is NOT USED during testing. Each test class will set its own injector
+     *     with mocks for testing.
+     * </strong>
+     *
+     * @return instance of Injector to use to inject dependencies into controllers, filters and tags.
+     */
+    public Injector getInjector(){
+        return null;
+    };
 }

activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java

@@ -128,10 +128,13 @@ private void initAppConfig(String configClassName, AppContext context, boolean f
         try {
             Class c = Class.forName(configClassName);
             appConfig = (AppConfig) c.newInstance();
+            appConfig.init(context);
             if(appConfig instanceof  Bootstrap){
                 appBootstrap = (Bootstrap) appConfig;
+                if(!Configuration.isTesting() && appBootstrap.getInjector() != null){
+                    Context.getControllerRegistry().setInjector(appBootstrap.getInjector());
+                }
             }
-            appConfig.init(context);
             appConfig.completeInit();
         }
         catch (Throwable e) {