From 1626cd461dbcb7d03c474d5c504055d8df02992e Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Fri, 21 Oct 2022 05:07:05 +0200
Subject: [PATCH] Little cleanup

Signed-off-by: TheMode <themode@outlook.fr>
---
 .../server/command/CommandManagerTest.java    | 16 ++--------
 .../minestom/server/command/CommandTest.java  | 29 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/test/java/net/minestom/server/command/CommandManagerTest.java b/src/test/java/net/minestom/server/command/CommandManagerTest.java
index 0c69902dc..4f955db23 100644
--- a/src/test/java/net/minestom/server/command/CommandManagerTest.java
+++ b/src/test/java/net/minestom/server/command/CommandManagerTest.java
@@ -1,12 +1,12 @@
 package net.minestom.server.command;
 
 import net.minestom.server.command.builder.Command;
-import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CommandManagerTest {
 
@@ -44,16 +44,4 @@ public class CommandManagerTest {
         manager.executeServerCommand("invalid_command");
         assertTrue(check.get());
     }
-
-    private static void assertNodeEquals(DeclareCommandsPacket.Node node, byte flags, int[] children, int redirectedNode,
-                                         String name, String parser, byte[] properties, String suggestionsType) {
-        assertEquals(flags, node.flags);
-        assertArrayEquals(children, node.children);
-        assertEquals(redirectedNode, node.redirectedNode);
-        assertEquals(name, node.name);
-        assertEquals(parser, node.parser);
-        assertArrayEquals(properties, node.properties);
-        assertEquals(suggestionsType, node.suggestionsType);
-    }
-
 }
diff --git a/src/test/java/net/minestom/server/command/CommandTest.java b/src/test/java/net/minestom/server/command/CommandTest.java
index 5f9294f3d..2c10b56c7 100644
--- a/src/test/java/net/minestom/server/command/CommandTest.java
+++ b/src/test/java/net/minestom/server/command/CommandTest.java
@@ -54,7 +54,7 @@ public class CommandTest {
     }
 
     @Test
-    public void testConflictingSyntaxAndSubcommand() {
+    public void conflictSubcommandString() {
         final CommandManager manager = new CommandManager();
 
         final AtomicBoolean subcommandRun = new AtomicBoolean();
@@ -76,4 +76,31 @@ public class CommandTest {
         assertTrue(subcommandRun.get());
         assertFalse(syntaxRun.get());
     }
+
+    @Test
+    public void conflictLiteralString() {
+        final CommandManager manager = new CommandManager();
+
+        final AtomicBoolean literalBool = new AtomicBoolean();
+        final AtomicBoolean stringBool = new AtomicBoolean();
+
+        final Command command = new Command("command");
+        var literal = ArgumentType.Literal("literal");
+        var string = ArgumentType.String("id");
+        command.addSyntax((sender, ctx) -> stringBool.set(true), string);
+        command.addSyntax((sender, ctx) -> literalBool.set(true), literal);
+
+        manager.register(command);
+
+        manager.executeServerCommand("command literal");
+        assertTrue(literalBool.get());
+        assertFalse(stringBool.get());
+
+        literalBool.set(false);
+        stringBool.set(false);
+
+        manager.executeServerCommand("command string");
+        assertFalse(literalBool.get());
+        assertTrue(stringBool.get());
+    }
 }