Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-20 11:34:53 +02:00
Code Issues Projects Releases Wiki Activity

Test loop/group arguments

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-07-06 11:12:08 +02:00
parent 5193529702
commit 0309d12540
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minestom/server/command/builder/CommandContext.java
View File

@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
/**
@ -108,4 +109,20 @@ public class CommandContext {
}
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof CommandContext that)) return false;
return Objects.equals(input, that.input) &&
Objects.equals(commandName, that.commandName) &&
Objects.equals(args, that.args) &&
Objects.equals(rawArgs, that.rawArgs) &&
Objects.equals(returnData, that.returnData);
}
@Override
public int hashCode() {
return Objects.hash(input, commandName, args, rawArgs, returnData);
}
}

55
src/test/java/net/minestom/server/command/CommandSyntaxSingleTest.java
View File

@ -1,15 +1,18 @@
package net.minestom.server.command;
import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext;
import net.minestom.server.command.builder.arguments.Argument;
import org.junit.jupiter.api.Test;
import java.lang.String;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import static net.minestom.server.command.builder.arguments.ArgumentType.Integer;
import static net.minestom.server.command.builder.arguments.ArgumentType.String;
import static net.minestom.server.command.builder.arguments.ArgumentType.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@ -54,6 +57,58 @@ public class CommandSyntaxSingleTest {
assertSyntax(args, "", ExpectedExecution.DEFAULT);
}
@Test
public void singleGroup() {
List<Argument<?>> args = List.of(Group("loop", Integer("first"), Integer("second")));
// 1 2
{
var context = new CommandContext("1 2");
context.setArg("first", 1, "1");
context.setArg("second", 2, "2");
assertSyntax(args, "1 2", ExpectedExecution.SYNTAX, Map.of("loop", context));
}
// Incomplete group
assertSyntax(args, "1", ExpectedExecution.DEFAULT);
}
@Test
public void singleLoop() {
List<Argument<?>> stringLoop = List.of(Loop("loop", String("value")));
assertSyntax(stringLoop, "one two three", ExpectedExecution.SYNTAX, Map.of("loop", List.of("one", "two", "three")));
List<Argument<?>> intLoop = List.of(Loop("loop", Integer("value")));
assertSyntax(intLoop, "1 2 3", ExpectedExecution.SYNTAX, Map.of("loop", List.of(1, 2, 3)));
}
@Test
public void singleLoopGroup() {
List<Argument<?>> groupLoop = List.of(Loop("loop", Group("group", Integer("first"), Integer("second"))));
// 1 2
{
var context = new CommandContext("1 2");
context.setArg("first", 1, "1");
context.setArg("second", 2, "2");
assertSyntax(groupLoop, "1 2", ExpectedExecution.SYNTAX, Map.of("loop", List.of(context)));
}
// 1 2 3 4
{
var context1 = new CommandContext("1 2");
var context2 = new CommandContext("3 4");
context1.setArg("first", 1, "1");
context1.setArg("second", 2, "2");
context2.setArg("first", 3, "3");
context2.setArg("second", 4, "4");
assertSyntax(groupLoop, "1 2 3 4", ExpectedExecution.SYNTAX, Map.of("loop", List.of(context1, context2)));
}
// Incomplete loop
assertSyntax(groupLoop, "1", ExpectedExecution.DEFAULT);
assertSyntax(groupLoop, "1 2 3", ExpectedExecution.DEFAULT);
assertSyntax(groupLoop, "1 2 3 4 5", ExpectedExecution.DEFAULT);
}
private static void assertSyntax(List<Argument<?>> args, String input, ExpectedExecution expectedExecution, Map<String, Object> expectedValues) {
final String commandName = "name";