Fixed several mock-bugs inside hitogo-testing artifact

AlexanderEggers · Feb 27, 2018 · 2ab4802 · 2ab4802
1 parent c8c522f
commit 2ab4802
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 25 deletions.
diff --git a/testing/src/main/java/org/hitogo/alert/DialogAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/DialogAlertBuilderMock.java
@@ -34,7 +34,8 @@ public class DialogAlertBuilderMock {
      */
     @NonNull
     public static DialogAlertBuilder getMock() {
-        return getMock(mock(DialogAlert.class));
+        DialogAlert dialogAlertMock = mock(DialogAlert.class);
+        return getMock(dialogAlertMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/alert/PopupAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/PopupAlertBuilderMock.java
@@ -37,7 +37,8 @@ public class PopupAlertBuilderMock {
      */
     @NonNull
     public static PopupAlertBuilder getMock() {
-        return getMock(mock(PopupAlert.class));
+        PopupAlert popupAlertMock = mock(PopupAlert.class);
+        return getMock(popupAlertMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/alert/SnackbarAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/SnackbarAlertBuilderMock.java
@@ -31,7 +31,8 @@ public class SnackbarAlertBuilderMock {
      */
     @NonNull
     public static SnackbarAlertBuilder getMock() {
-        return getMock(mock(SnackbarAlert.class));
+        SnackbarAlert snackbarAlert = mock(SnackbarAlert.class);
+        return getMock(snackbarAlert);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/alert/ToastAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/ToastAlertBuilderMock.java
@@ -33,7 +33,8 @@ public class ToastAlertBuilderMock {
      */
     @NonNull
     public static ToastAlertBuilder getMock() {
-        return getMock(mock(ToastAlert.class));
+        ToastAlert toastAlertMock = mock(ToastAlert.class);
+        return getMock(toastAlertMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/alert/ViewAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/ViewAlertBuilderMock.java
@@ -34,7 +34,8 @@ public class ViewAlertBuilderMock {
      */
     @NonNull
     public static ViewAlertBuilder getMock() {
-        return getMock(mock(ViewAlert.class));
+        ViewAlert viewAlert = mock(ViewAlert.class);
+        return getMock(viewAlert);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/button/TextButtonBuilderMock.java b/testing/src/main/java/org/hitogo/button/TextButtonBuilderMock.java
@@ -28,7 +28,8 @@ public class TextButtonBuilderMock {
      */
     @NonNull
     public static TextButtonBuilder getMock() {
-        return getMock(mock(TextButton.class));
+        TextButton textButtonMock = mock(TextButton.class);
+        return getMock(textButtonMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/button/ViewButtonBuilderMock.java b/testing/src/main/java/org/hitogo/button/ViewButtonBuilderMock.java
@@ -29,7 +29,8 @@ public class ViewButtonBuilderMock {
      */
     @NonNull
     public static ViewButtonBuilder getMock() {
-        return getMock(mock(ViewButton.class));
+        ViewButton viewButtonMock = mock(ViewButton.class);
+        return getMock(viewButtonMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/core/HitogoMock.java b/testing/src/main/java/org/hitogo/core/HitogoMock.java
@@ -38,10 +38,19 @@ public class HitogoMock {
      */
     @NonNull
     public static <T extends Hitogo> T getMock(@NonNull T hitogo) {
-        return getMock(hitogo, DialogAlertBuilderMock.getMock(), PopupAlertBuilderMock.getMock(),
-                SnackbarAlertBuilderMock.getMock(), ToastAlertBuilderMock.getMock(),
-                ViewAlertBuilderMock.getMock(), CloseButtonBuilderMock.getMock(),
-                TextButtonBuilderMock.getMock(), ViewButtonBuilderMock.getMock());
+        DialogAlertBuilder dialogAlertBuilderMock = DialogAlertBuilderMock.getMock();
+        PopupAlertBuilder popupAlertBuilderMock = PopupAlertBuilderMock.getMock();
+        SnackbarAlertBuilder snackbarAlertBuilderMock = SnackbarAlertBuilderMock.getMock();
+        ToastAlertBuilder toastAlertBuilderMock = ToastAlertBuilderMock.getMock();
+        ViewAlertBuilder viewAlertBuilderMock = ViewAlertBuilderMock.getMock();
+        ViewButtonBuilder closeButtonBuilderMock = CloseButtonBuilderMock.getMock();
+        TextButtonBuilder textButtonBuilderMock = TextButtonBuilderMock.getMock();
+        ViewButtonBuilder viewButtonBuilderMock = ViewButtonBuilderMock.getMock();
+
+        return getMock(hitogo, dialogAlertBuilderMock, popupAlertBuilderMock,
+                snackbarAlertBuilderMock, toastAlertBuilderMock,
+                viewAlertBuilderMock, closeButtonBuilderMock,
+                textButtonBuilderMock, viewButtonBuilderMock);
     }
 
     /**
@@ -52,10 +61,19 @@ public static <T extends Hitogo> T getMock(@NonNull T hitogo) {
      */
     @NonNull
     public static Hitogo getMock() {
-        return getMock(DialogAlertBuilderMock.getMock(), PopupAlertBuilderMock.getMock(),
-                SnackbarAlertBuilderMock.getMock(), ToastAlertBuilderMock.getMock(),
-                ViewAlertBuilderMock.getMock(), CloseButtonBuilderMock.getMock(),
-                TextButtonBuilderMock.getMock(), ViewButtonBuilderMock.getMock());
+        DialogAlertBuilder dialogAlertBuilderMock = DialogAlertBuilderMock.getMock();
+        PopupAlertBuilder popupAlertBuilderMock = PopupAlertBuilderMock.getMock();
+        SnackbarAlertBuilder snackbarAlertBuilderMock = SnackbarAlertBuilderMock.getMock();
+        ToastAlertBuilder toastAlertBuilderMock = ToastAlertBuilderMock.getMock();
+        ViewAlertBuilder viewAlertBuilderMock = ViewAlertBuilderMock.getMock();
+        ViewButtonBuilder closeButtonBuilderMock = CloseButtonBuilderMock.getMock();
+        TextButtonBuilder textButtonBuilderMock = TextButtonBuilderMock.getMock();
+        ViewButtonBuilder viewButtonBuilderMock = ViewButtonBuilderMock.getMock();
+
+        return getMock(dialogAlertBuilderMock, popupAlertBuilderMock,
+                snackbarAlertBuilderMock, toastAlertBuilderMock,
+                viewAlertBuilderMock, closeButtonBuilderMock,
+                textButtonBuilderMock, viewButtonBuilderMock);
     }
 
     /**

diff --git a/testing/src/main/java/org/hitogo/core/HitogoServiceMock.java b/testing/src/main/java/org/hitogo/core/HitogoServiceMock.java
@@ -8,6 +8,7 @@
 import org.hitogo.button.text.TextButtonBuilder;
 import org.hitogo.button.view.ViewButtonBuilder;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 /**
@@ -26,8 +27,9 @@ public class HitogoServiceMock {
      * @since 1.0.0
      */
     public static <T extends HitogoService> T getMock(T hitogoService) {
+        Hitogo hitogo = HitogoMock.getMock();
         when(hitogoService.create())
-                .thenReturn(HitogoMock.getMock());
+                .thenReturn(hitogo);
         return hitogoService;
     }
 
@@ -40,8 +42,9 @@ public static <T extends HitogoService> T getMock(T hitogoService) {
      * @since 1.0.0
      */
     public static <T extends HitogoService> T getMock(T hitogoService, Hitogo hitogo) {
+        hitogo = HitogoMock.getMock(hitogo);
         when(hitogoService.create())
-                .thenReturn(HitogoMock.getMock(hitogo));
+                .thenReturn(hitogo);
         return hitogoService;
     }
 
@@ -61,11 +64,10 @@ public static <T extends HitogoService> T getMock(T hitogoService,
                                                       ViewButtonBuilder closeButtonBuilderMock,
                                                       TextButtonBuilder textButtonBuilderMock,
                                                       ViewButtonBuilder viewButtonBuilderMock) {
-        when(hitogoService.create())
-                .thenReturn(HitogoMock.getMock(dialogAlertBuilder, popupAlertBuilder,
-                        snackbarAlertBuilder, toastAlertBuilder, viewAlertBuilder,
-                        closeButtonBuilderMock, textButtonBuilderMock, viewButtonBuilderMock));
-        return hitogoService;
+        Hitogo hitogo = mock(Hitogo.class);
+        return getMock(hitogoService, hitogo, dialogAlertBuilder, popupAlertBuilder,
+                snackbarAlertBuilder, toastAlertBuilder, viewAlertBuilder, closeButtonBuilderMock,
+                textButtonBuilderMock, viewButtonBuilderMock);
     }
 
     /**
@@ -86,10 +88,12 @@ public static <T extends HitogoService> T getMock(T hitogoService,
                                                       ViewButtonBuilder closeButtonBuilderMock,
                                                       TextButtonBuilder textButtonBuilderMock,
                                                       ViewButtonBuilder viewButtonBuilderMock) {
+
+        hitogo = HitogoMock.getMock(hitogo, dialogAlertBuilder, popupAlertBuilder,
+                snackbarAlertBuilder, toastAlertBuilder, viewAlertBuilder,
+                closeButtonBuilderMock, textButtonBuilderMock, viewButtonBuilderMock);
         when(hitogoService.create())
-                .thenReturn(HitogoMock.getMock(hitogo, dialogAlertBuilder, popupAlertBuilder,
-                        snackbarAlertBuilder, toastAlertBuilder, viewAlertBuilder,
-                        closeButtonBuilderMock, textButtonBuilderMock, viewButtonBuilderMock));
+                .thenReturn(hitogo);
         return hitogoService;
     }
 }