FAForever#2420 - Do not create a game with empty title (FAForever#2424)

Co-authored-by: Ivan <v23620@gmail.com>
mrchris2000 · Apr 15, 2022 · 18226e0 · 18226e0
1 parent 9a4008c
commit 18226e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/main/java/com/faforever/client/game/CreateGameController.java b/src/main/java/com/faforever/client/game/CreateGameController.java
@@ -53,6 +53,7 @@
 import javafx.stage.PopupWindow.AnchorLocation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -218,7 +219,7 @@ private void setCreateGameButtonState() {
       case DISCONNECTED -> "game.create.disconnected";
       case CONNECTING -> "game.create.connecting";
       case CONNECTED -> {
-        if (Strings.isNullOrEmpty(title)) {
+        if (StringUtils.isBlank(title)) {
           yield "game.create.titleMissing";
         } else if (!StandardCharsets.US_ASCII.newEncoder().canEncode(title)) {
           yield "game.create.titleNotAscii";
@@ -250,7 +251,7 @@ private void initMapFilterPopup() {
   }
 
   private void validateTitle(String gameTitle) {
-    titleTextField.pseudoClassStateChanged(PSEUDO_CLASS_INVALID, Strings.isNullOrEmpty(gameTitle)
+    titleTextField.pseudoClassStateChanged(PSEUDO_CLASS_INVALID, StringUtils.isBlank(gameTitle)
         || !StandardCharsets.US_ASCII.newEncoder().canEncode(gameTitle));
   }
 
@@ -484,7 +485,7 @@ private void hostGame(MapVersionBean mapVersion, Set<String> mods) {
     enforceRating = enforceRankingCheckBox.isSelected();
 
     NewGameInfo newGameInfo = new NewGameInfo(
-        titleTextField.getText(),
+        titleTextField.getText().trim(),
         Strings.emptyToNull(passwordTextField.getText()),
         featuredModListView.getSelectionModel().getSelectedItem(),
         mapVersion.getFolderName(),

diff --git a/src/test/java/com/faforever/client/game/CreateGameControllerTest.java b/src/test/java/com/faforever/client/game/CreateGameControllerTest.java
@@ -221,18 +221,19 @@ public void testButtonBindingIfFeaturedModNotSet() {
 
   @Test
   public void testButtonBindingIfTitleNotSet() {
-
-    when(i18n.get("game.create.titleMissing")).thenReturn("title missing");
-    WaitForAsyncUtils.asyncFx(() -> instance.initialize());
-    WaitForAsyncUtils.waitForFxEvents();
-
+    String message = "title missing";
+    when(i18n.get("game.create.titleMissing")).thenReturn(message);
+    runOnFxThreadAndWait(() -> instance.initialize());
     assertThat(instance.titleTextField.getText(), is(""));
-    assertThat(instance.createGameButton.getText(), is("title missing"));
+    assertThat(instance.createGameButton.getText(), is(message));
+
+    runOnFxThreadAndWait(() -> instance.titleTextField.setText(" "));
+    assertThat(instance.titleTextField.getText(), is(" "));
+    assertThat(instance.createGameButton.getText(), is(message));
   }
 
   @Test
   public void testButtonBindingIfTitleNotAscii() {
-
     when(i18n.get("game.create.titleNotAscii")).thenReturn("title not ascii");
     instance.titleTextField.setText("ты");
     WaitForAsyncUtils.asyncFx(() -> instance.initialize());