Fixes Dagger 2 example

Author: vogella

com.vogella.android.daggerjunitmockito/app/build.gradle

@@ -50,6 +50,8 @@ dependencies {
     testCompile "org.powermock:powermock-module-junit4:$powerMockito"
     testCompile "org.powermock:powermock-api-mockito:$powerMockito"
     testCompile 'com.google.dagger:dagger:2.4'
+    testCompile 'com.android.support:support-annotations:23.0.0'
+
     compile 'com.google.dagger:dagger:2.4'
     apt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
     testApt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"

com.vogella.android.daggerjunitmockito/app/src/main/java/com/vogella/android/daggerjunitmockito/MainService.java

@@ -11,14 +11,21 @@ public class MainService {
     private MyPrinter printer;
 
     @Inject
-    public MainService(RestService restService,
-                       MyPrinter printer) {
+    public MainService(RestService restService,  MyPrinter printer) {
         this.restService = restService;
         this.printer = printer;
     }
 
     public void doSomething() {
+        if (restService == null) {
+           System.out.println("restService not allowed to be null");
+        }
         String s = restService.getSomething();
+        System.out.println(s);
+        if (printer == null) {
+            System.out.println("printer not allowed to be null");
+        }
+
         printer.print(s.toUpperCase());
     }
 }

com.vogella.android.daggerjunitmockito/app/src/test/java/com/vogella/android/daggerjunitmockito/MainServiceDaggerTest.java

@@ -1,8 +1,11 @@
 package com.vogella.android.daggerjunitmockito;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.Test;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 import javax.inject.Inject;
 
@@ -12,6 +15,7 @@
 
 public class MainServiceDaggerTest {
 
+
     @Inject
     RestService restService;
 
@@ -21,13 +25,18 @@ public class MainServiceDaggerTest {
 
     @Before
     public void setUp() {
-        TestComponent build = DaggerTestComponent.builder().testModule(new TestModule()).build();
+        TestComponent build = DaggerTestComponent.builder().build();
         build.inject(this);
     }
 
     @Test
     public void testDoSomething() {
+        System.out.println("Rest service " + restService);
+        System.out.println("Printer " + myPrinter);
+        System.out.println("MainService " + mainService);
+
         when(restService.getSomething()).thenReturn("abc");
+        System.out.println(restService.getSomething());
 
         mainService.doSomething();
 

com.vogella.android.daggerjunitmockito/app/src/test/java/com/vogella/android/daggerjunitmockito/MainServiceTest.java

@@ -25,8 +25,11 @@ public class MainServiceTest {
 
     @Test
     public void testDoSomething() {
+
+
         when(restService.getSomething()).thenReturn("abc");
 
+
         mainService.doSomething();
 
         verify(myPrinter).print("ABC");

com.vogella.android.daggerjunitmockito/app/src/test/java/com/vogella/android/daggerjunitmockito/TestModule.java

@@ -1,18 +1,26 @@
 package com.vogella.android.daggerjunitmockito;
+import android.support.annotation.NonNull;
+
 import static org.mockito.Mockito.*;
 import org.mockito.Mockito;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
 import dagger.Provides;
 
 @Module
 public class TestModule  {
     @Provides
+    @Singleton
+    @NonNull
     public MyPrinter provideMyPrinter() {
         return Mockito.mock(MyPrinter.class);
     }
 
     @Provides
+    @Singleton
+    @NonNull
     public RestService provideRestService() {
         return Mockito.mock(RestService.class);
     }