From f12d3cd8ba47fb0d25f7c13e1f3a89d770bd34a6 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 5 Aug 2023 10:49:57 +0100
Subject: [PATCH] Fix race error in bulk update integration test

---
 .../standalone/CommandsIntegrationTest.java   |  2 +-
 .../standalone/utils/CommandTester.java       | 43 ++++++++++++++-----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/CommandsIntegrationTest.java b/standalone/src/test/java/me/lucko/luckperms/standalone/CommandsIntegrationTest.java
index 419960465..485a3ccbe 100644
--- a/standalone/src/test/java/me/lucko/luckperms/standalone/CommandsIntegrationTest.java
+++ b/standalone/src/test/java/me/lucko/luckperms/standalone/CommandsIntegrationTest.java
@@ -1086,7 +1086,7 @@ public class CommandsIntegrationTest {
 
                     .givenHasPermissions("luckperms.bulkupdate")
                     .whenRunCommand("bulkupdate all update permission group.mod \"permission == group.moderator\"")
-                    .thenExpect("[LP] Running bulk update.");
+                    .thenExpectStartsWith("[LP] Running bulk update.");
 
             assertTrue(completed.await(15, TimeUnit.SECONDS), "operation did not complete in the allotted time");
 
diff --git a/standalone/src/test/java/me/lucko/luckperms/standalone/utils/CommandTester.java b/standalone/src/test/java/me/lucko/luckperms/standalone/utils/CommandTester.java
index bd6e16e93..97d85a0fc 100644
--- a/standalone/src/test/java/me/lucko/luckperms/standalone/utils/CommandTester.java
+++ b/standalone/src/test/java/me/lucko/luckperms/standalone/utils/CommandTester.java
@@ -45,8 +45,10 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Utility for testing LuckPerms commands with BDD-like given/when/then assertions.
@@ -155,10 +157,7 @@ public final class CommandTester implements Consumer<Component>, Function<String
      * @return this
      */
     public CommandTester thenExpect(String expected) {
-        String actual = this.renderBuffer().stream()
-                .map(String::trim)
-                .collect(Collectors.joining("\n"));
-
+        String actual = this.renderBuffer();
         assertEquals(expected.trim(), actual.trim());
 
         if (this.permissions != null) {
@@ -168,6 +167,23 @@ public final class CommandTester implements Consumer<Component>, Function<String
         return this.clearMessageBuffer();
     }
 
+    /**
+     * Asserts that the current contents of the message buffer starts with the given input string.
+     *
+     * @param expected the expected contents
+     * @return this
+     */
+    public CommandTester thenExpectStartsWith(String expected) {
+        String actual = this.renderBuffer();
+        assertTrue(actual.trim().startsWith(expected.trim()), "expected '" + actual + "' to start with '" + expected + "'");
+
+        if (this.permissions != null) {
+            assertEquals(this.checkedPermissions, this.permissions.keySet());
+        }
+
+        return this.clearMessageBuffer();
+    }
+
     /**
      * Clears the message buffer.
      *
@@ -180,14 +196,21 @@ public final class CommandTester implements Consumer<Component>, Function<String
     }
 
     /**
-     * Renders the contents of the message buffer.
+     * Renders the contents of the message buffer as a stream of lines.
      *
      * @return rendered copy of the buffer
      */
-    public List<String> renderBuffer() {
-        return this.messageBuffer.stream()
-                .map(component -> PlainTextComponentSerializer.plainText().serialize(component))
-                .collect(Collectors.toList());
+    public Stream<String> renderBufferStream() {
+        return this.messageBuffer.stream().map(component -> PlainTextComponentSerializer.plainText().serialize(component));
+    }
+
+    /**
+     * Renders the contents of the message buffer as a joined string.
+     *
+     * @return rendered copy of the buffer
+     */
+    public String renderBuffer() {
+        return this.renderBufferStream().map(String::trim).collect(Collectors.joining("\n"));
     }
 
     /**
@@ -206,7 +229,7 @@ public final class CommandTester implements Consumer<Component>, Function<String
         System.out.printf(".givenHasPermissions(%s)%n", checkedPermissions);
         System.out.printf(".whenRunCommand(\"%s\")%n", cmd);
 
-        List<String> render = this.renderBuffer();
+        List<String> render = this.renderBufferStream().toList();
         if (render.size() == 1) {
             System.out.printf(".thenExpect(\"%s\")%n", render.get(0));
         } else {