From 2ab4802008fb84b6817d7628c37463a932825116 Mon Sep 17 00:00:00 2001 From: Alexander Eggers Date: Tue, 27 Feb 2018 20:26:27 +0100 Subject: [PATCH] Fixed several mock-bugs inside hitogo-testing artifact --- .../hitogo/alert/DialogAlertBuilderMock.java | 3 +- .../hitogo/alert/PopupAlertBuilderMock.java | 3 +- .../alert/SnackbarAlertBuilderMock.java | 3 +- .../hitogo/alert/ToastAlertBuilderMock.java | 3 +- .../hitogo/alert/ViewAlertBuilderMock.java | 3 +- .../hitogo/button/TextButtonBuilderMock.java | 3 +- .../hitogo/button/ViewButtonBuilderMock.java | 3 +- .../main/java/org/hitogo/core/HitogoMock.java | 34 ++++++++++++++----- .../org/hitogo/core/HitogoServiceMock.java | 24 +++++++------ 9 files changed, 54 insertions(+), 25 deletions(-) diff --git a/testing/src/main/java/org/hitogo/alert/DialogAlertBuilderMock.java b/testing/src/main/java/org/hitogo/alert/DialogAlertBuilderMock.java index a69c877..cd58163 100644 --- 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 index 43848fc..3a24f55 100644 --- 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 index 91b9137..a0da70d 100644 --- 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 index 0cb4377..45e5565 100644 --- 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 index 31d4a53..eff85bc 100644 --- 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 index 533550b..ff8ce84 100644 --- 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 index dd9e5e2..900851c 100644 --- 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 index aa9ffd0..4f0a605 100644 --- 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 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 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 index 0ab5a23..9148fc2 100644 --- 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 getMock(T hitogoService) { + Hitogo hitogo = HitogoMock.getMock(); when(hitogoService.create()) - .thenReturn(HitogoMock.getMock()); + .thenReturn(hitogo); return hitogoService; } @@ -40,8 +42,9 @@ public static T getMock(T hitogoService) { * @since 1.0.0 */ public static 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 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 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; } }