Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-29 12:37:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix race error in bulk update integration test

Browse Source
This commit is contained in:
Luck 2023-08-05 10:49:57 +01:00
parent 71416baff2
commit f12d3cd8ba
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
standalone/src/test/java/me/lucko/luckperms/standalone/CommandsIntegrationTest.java
View File

@ -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");

43
standalone/src/test/java/me/lucko/luckperms/standalone/utils/CommandTester.java
View File

@ -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 {