Fix tests

FAForever · Mar 8, 2023 · b5831c9 · b5831c9
1 parent dcc5e05
commit b5831c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/faforever/client/player/PlayerService.java b/src/main/java/com/faforever/client/player/PlayerService.java
@@ -175,6 +175,7 @@ private PlayerBean createOrUpdateFromOwnPlayer(@NonNull com.faforever.commons.lo
         newPlayer.setUsername(playerInfo.getLogin());
         newPlayer.setNote(notesByPlayerId.get(id));
         setPlayerSocialStatus(newPlayer);
+        playersByName.put(newPlayer.getUsername(), newPlayer);
         return playerMapper.update(playerInfo, newPlayer);
       } else {
         return playerMapper.update(playerInfo, knownPlayer);

diff --git a/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java b/src/test/java/com/faforever/client/chat/ChatUserItemControllerTest.java
@@ -29,8 +29,8 @@
 import javafx.scene.input.ContextMenuEvent;
 import javafx.scene.input.MouseButton;
 import org.hamcrest.CoreMatchers;
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
@@ -207,7 +207,7 @@ public void testAvatarImageViewHasTooltip() {
   }
 
   @Test
-  @Ignore("Flaky test due to race condition with tooltip installation")
+  @Disabled("Flaky test due to race condition with tooltip installation")
   public void testPlayerNoteTooltip() throws Exception {
     defaultUser.setPlayer(PlayerBeanBuilder.create()
         .defaultValues()

diff --git a/src/test/java/com/faforever/client/mod/ModServiceTest.java b/src/test/java/com/faforever/client/mod/ModServiceTest.java
@@ -40,8 +40,8 @@
 import javafx.collections.ObservableList;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mapstruct.factory.Mappers;
@@ -181,7 +181,7 @@ public void testPostConstructLoadInstalledMods() {
   }
 
   @Test
-  @Ignore("Flaky Test")
+  @Disabled("Flaky Test")
   public void testDownloadAndInstallMod() throws Exception {
     assertThat(instance.getInstalledMods().size(), is(1));
 

diff --git a/src/test/java/com/faforever/client/vault/VaultEntityControllerTest.java b/src/test/java/com/faforever/client/vault/VaultEntityControllerTest.java
@@ -20,8 +20,8 @@
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Spy;
@@ -305,7 +305,7 @@ public void testOnBackButton() {
   }
 
   @Test
-  @Ignore("Flaky Test")
+  @Disabled("Flaky Test")
   public void testOnSearch() {
     JavaFxUtil.runLater(() -> instance.display(new NavigateEvent(NavigationItem.MAP)));
     WaitForAsyncUtils.waitForFxEvents();