Fix usage of InjectMocks

FAForever · Jun 4, 2023 · 18610c8 · 18610c8
1 parent c3e77a4
commit 18610c8
Show file tree

Hide file tree

Showing 41 changed files with 216 additions and 102 deletions.
diff --git a/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java b/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java
@@ -38,6 +38,7 @@
 import org.mockito.Mock;
 import org.mockito.Spy;
 
+import java.io.InputStream;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -191,8 +192,8 @@ public void testCheckChatUserGameListener() {
     MapVersionBean mapVersion = MapVersionBeanBuilder.create().defaultValues().get();
     defaultUser.setPlayer(player);
 
-    when(uiService.getThemeImage(UiService.CHAT_LIST_STATUS_HOSTING)).thenReturn(mock(Image.class));
-    when(mapService.loadPreview(game.getMapFolderName(), PreviewSize.SMALL)).thenReturn(mock(Image.class));
+    when(uiService.getThemeImage(UiService.CHAT_LIST_STATUS_HOSTING)).thenReturn(new Image(InputStream.nullInputStream()));
+    when(mapService.loadPreview(game.getMapFolderName(), PreviewSize.SMALL)).thenReturn(new Image(InputStream.nullInputStream()));
     when(mapService.getMapLocallyFromName(mapFolderName)).thenReturn(Optional.of(mapVersion));
     when(mapService.convertMapFolderNameToHumanNameIfPossible(mapFolderName)).thenReturn("map name");
     when(i18n.get(eq("game.onMapFormat"), anyString())).thenReturn(mapVersion.getMap()

diff --git a/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java b/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java
@@ -32,11 +32,11 @@
 import javafx.scene.image.Image;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.testfx.util.WaitForAsyncUtils;
 
+import java.io.InputStream;
 import java.net.URL;
 import java.time.Instant;
 import java.util.Optional;
@@ -49,7 +49,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -96,14 +95,15 @@ public class PrivateChatTabControllerTest extends UITest {
   @Spy
   private NotificationPrefs notificationPrefs;
 
-  @InjectMocks
   private PrivateChatTabController instance;
 
   private String playerName;
   private PlayerBean player;
 
   @BeforeEach
   public void setUp() throws Exception {
+    instance = new PrivateChatTabController(userService, null, playerService, timeService, i18n, notificationService, uiService, eventBus, audioService, chatService, webViewConfigurer, countryFlagService, emoticonService, avatarService, chatPrefs, notificationPrefs, fxApplicationThreadExecutor);
+
     player = PlayerBeanBuilder.create().defaultValues().get();
     playerName = player.getUsername();
 
@@ -114,7 +114,7 @@ public void setUp() throws Exception {
     when(uiService.getThemeFileUrl(any())).then(invocation -> getThemeFileUrl(invocation.getArgument(0)));
     when(emoticonService.getEmoticonShortcodeDetectorPattern()).thenReturn(Pattern.compile(".*"));
     when(privatePlayerInfoController.chatUserProperty()).thenReturn(new SimpleObjectProperty<>());
-    when(avatarService.loadAvatar(player.getAvatar())).thenReturn(mock(Image.class));
+    when(avatarService.loadAvatar(player.getAvatar())).thenReturn(new Image(InputStream.nullInputStream()));
     when(uiService.createShowingProperty(any())).thenReturn(new SimpleBooleanProperty(true));
 
     loadFxml("theme/chat/private_chat_tab.fxml", clazz -> {
@@ -187,7 +187,7 @@ public void checkSetDefaultIconForTabIfPlayerHasNoAvatar() {
   public void checkPlayerAvatarListener() throws Exception {
     assertNotNull(instance.avatarImageView.getImage());
 
-    Image newAvatar = mock(Image.class);
+    Image newAvatar = new Image(InputStream.nullInputStream());
     AvatarBean avatarBean = AvatarBeanBuilder.create().defaultValues().url(new URL("https://test11.com")).get();
     when(avatarService.loadAvatar(avatarBean)).thenReturn(newAvatar);
     runOnFxThreadAndWait(() -> player.setAvatar(avatarBean));

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/AddEditPlayerNoteMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/AddEditPlayerNoteMenuItemTest.java
@@ -12,8 +12,8 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,9 +33,13 @@ public class AddEditPlayerNoteMenuItemTest extends UITest {
   @Mock
   private I18n i18n;
 
-  @InjectMocks
   private AddEditPlayerNoteMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new AddEditPlayerNoteMenuItem(uiService, playerService, i18n);
+  }
+
   @Override
   protected Pane getRoot() {
     return new StackPane();

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/AddFoeMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/AddFoeMenuItemTest.java
@@ -6,8 +6,8 @@
 import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.test.UITest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -21,9 +21,14 @@ public class AddFoeMenuItemTest extends UITest {
   private PlayerService playerService;
   @Mock
   private I18n i18n;
-  @InjectMocks
+
   private AddFoeMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new AddFoeMenuItem(playerService, i18n);
+  }
+
   @Test
   public void testAddFoeIfPlayerIsFriend() {
     PlayerBean player = PlayerBeanBuilder.create().defaultValues().socialStatus(SocialStatus.FRIEND).get();

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/AddFriendMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/AddFriendMenuItemTest.java
@@ -6,8 +6,8 @@
 import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.test.UITest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -21,9 +21,14 @@ public class AddFriendMenuItemTest extends UITest {
   private PlayerService playerService;
   @Mock
   private I18n i18n;
-  @InjectMocks
+
   private AddFriendMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new AddFriendMenuItem(playerService, i18n);
+  }
+
   @Test
   public void testAddFriendIfPlayerIsFor() {
     PlayerBean player = PlayerBeanBuilder.create().defaultValues().socialStatus(SocialStatus.FOE).get();

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/BroadcastMessageMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/BroadcastMessageMenuItemTest.java
@@ -4,8 +4,8 @@
 import com.faforever.client.moderator.ModeratorService;
 import com.faforever.client.test.UITest;
 import com.faforever.commons.api.dto.GroupPermission;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import java.util.Collections;
@@ -22,9 +22,14 @@ public class BroadcastMessageMenuItemTest extends UITest {
   private I18n i18n;
   @Mock
   private ModeratorService moderatorService;
-  @InjectMocks
+
   private BroadcastMessageMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new BroadcastMessageMenuItem(i18n, moderatorService);
+  }
+
   @Test
   public void testVisibleItem() {
     when(moderatorService.getPermissions()).thenReturn(Set.of(GroupPermission.ROLE_WRITE_MESSAGE));

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/CancelActionNotifyMeMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/CancelActionNotifyMeMenuItemTest.java
@@ -4,11 +4,11 @@
 import com.faforever.client.domain.GameBean;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.replay.LiveReplayService;
-import com.faforever.client.replay.TrackingLiveReplayAction;
 import com.faforever.client.replay.TrackingLiveReplay;
+import com.faforever.client.replay.TrackingLiveReplayAction;
 import com.faforever.client.test.UITest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import java.util.Optional;
@@ -25,9 +25,14 @@ public class CancelActionNotifyMeMenuItemTest extends UITest {
   @Mock
   private LiveReplayService liveReplayService;
 
-  @InjectMocks
+
   private CancelActionNotifyMeMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new CancelActionNotifyMeMenuItem(i18n, liveReplayService);
+  }
+
   @Test
   public void testOnClickedCancelActionNotifyMe() {
     instance.onClicked();

diff --git a/...ava/com/faforever/client/fx/contextmenu/CancelActionRunReplayImmediatelyMenuItemTest.java b/...ava/com/faforever/client/fx/contextmenu/CancelActionRunReplayImmediatelyMenuItemTest.java
@@ -4,18 +4,17 @@
 import com.faforever.client.domain.GameBean;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.replay.LiveReplayService;
-import com.faforever.client.replay.TrackingLiveReplayAction;
 import com.faforever.client.replay.TrackingLiveReplay;
+import com.faforever.client.replay.TrackingLiveReplayAction;
 import com.faforever.client.test.UITest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -26,9 +25,14 @@ public class CancelActionRunReplayImmediatelyMenuItemTest extends UITest {
   @Mock
   private LiveReplayService liveReplayService;
 
-  @InjectMocks
+
   private CancelActionRunReplayImmediatelyMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new CancelActionRunReplayImmediatelyMenuItem(i18n, liveReplayService);
+  }
+
   @Test
   public void testOnClickedCancelActionRunReplayImmediately() {
     instance.setObject(GameBeanBuilder.create().get());

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/ChangeUsernameColorMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/ChangeUsernameColorMenuItemTest.java
@@ -12,7 +12,6 @@
 import javafx.scene.control.Label;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
@@ -35,11 +34,11 @@ public class ChangeUsernameColorMenuItemTest extends UITest {
   @Spy
   private ChatPrefs chatPrefs;
 
-  @InjectMocks
   private ChangeUsernameColorMenuItem instance;
 
   @BeforeEach
   public void setUp() throws Exception {
+    instance = new ChangeUsernameColorMenuItem(uiService, i18n, contextMenuBuilder, chatPrefs);
     chatPrefs.setChatColorMode(ChatColorMode.DEFAULT);
   }
 

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/InvitePlayerMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/InvitePlayerMenuItemTest.java
@@ -7,8 +7,8 @@
 import com.faforever.client.teammatchmaking.TeamMatchmakingService;
 import com.faforever.client.test.UITest;
 import com.faforever.commons.lobby.GameStatus;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
@@ -21,9 +21,14 @@ public class InvitePlayerMenuItemTest extends UITest {
   private TeamMatchmakingService teamMatchmakingService;
   @Mock
   private I18n i18n;
-  @InjectMocks
+
   private InvitePlayerMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new InvitePlayerMenuItem(i18n, teamMatchmakingService);
+  }
+
   @Test
   public void testInvitePlayer() {
     PlayerBean player = PlayerBeanBuilder.create().defaultValues().get();

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/JoinGameMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/JoinGameMenuItemTest.java
@@ -7,8 +7,8 @@
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.test.UITest;
 import com.faforever.commons.lobby.GameStatus;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -21,9 +21,14 @@ public class JoinGameMenuItemTest extends UITest {
   private I18n i18n;
   @Mock
   private JoinGameHelper joinGameHelper;
-  @InjectMocks
+
   private JoinGameMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new JoinGameMenuItem(i18n, joinGameHelper);
+  }
+
   @Test
   public void testJoinGame() {
     PlayerBean player = PlayerBeanBuilder.create().defaultValues().username("junit")

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/KickGameMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/KickGameMenuItemTest.java
@@ -8,8 +8,8 @@
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.test.UITest;
 import com.faforever.commons.api.dto.GroupPermission;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import java.util.Set;
@@ -25,12 +25,20 @@ public class KickGameMenuItemTest extends UITest {
   private I18n i18n;
   @Mock
   private ModeratorService moderatorService;
-  @InjectMocks
+
   private KickGameMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new KickGameMenuItem(i18n, moderatorService);
+  }
+
   @Test
   public void testKickGame() {
-    PlayerBean player = PlayerBeanBuilder.create().defaultValues().game(GameBeanBuilder.create().defaultValues().get()).get();
+    PlayerBean player = PlayerBeanBuilder.create()
+        .defaultValues()
+        .game(GameBeanBuilder.create().defaultValues().get())
+        .get();
 
     instance.setObject(player);
     instance.onClicked();
@@ -62,7 +70,10 @@ public void testInvisibleItemIfNoPlayer() {
   @Test
   public void testInvisibleItemIfNoPermissions() {
     when(moderatorService.getPermissions()).thenReturn(Set.of(""));
-    instance.setObject(PlayerBeanBuilder.create().defaultValues().game(GameBeanBuilder.create().defaultValues().get()).get());
+    instance.setObject(PlayerBeanBuilder.create()
+        .defaultValues()
+        .game(GameBeanBuilder.create().defaultValues().get())
+        .get());
 
     assertFalse(instance.isVisible());
   }

diff --git a/src/test/java/com/faforever/client/fx/contextmenu/KickLobbyMenuItemTest.java b/src/test/java/com/faforever/client/fx/contextmenu/KickLobbyMenuItemTest.java
@@ -8,8 +8,8 @@
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.test.UITest;
 import com.faforever.commons.api.dto.GroupPermission;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import java.util.Set;
@@ -25,12 +25,20 @@ public class KickLobbyMenuItemTest extends UITest {
   private I18n i18n;
   @Mock
   private ModeratorService moderatorService;
-  @InjectMocks
+
   private KickLobbyMenuItem instance;
 
+  @BeforeEach
+  public void setUp() throws Exception {
+    instance = new KickLobbyMenuItem(i18n, moderatorService);
+  }
+
   @Test
   public void testKickLobby() {
-    PlayerBean player = PlayerBeanBuilder.create().defaultValues().game(GameBeanBuilder.create().defaultValues().get()).get();
+    PlayerBean player = PlayerBeanBuilder.create()
+        .defaultValues()
+        .game(GameBeanBuilder.create().defaultValues().get())
+        .get();
 
     instance.setObject(player);
     instance.onClicked();