From 7dd06b9d9b636ec72de0a0e6520e851d202fe1f8 Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@gmail.com>
Date: Sat, 15 Dec 2018 10:30:17 +0100
Subject: [PATCH] Fixed tests

They were broken as of https://github.com/BentoBoxWorld/bentobox/commit/8a16940e14f23a4b37df34fff9e83868f2571f86
---
 .../bentobox/api/commands/DefaultHelpCommand.java         | 4 ++--
 .../bentobox/api/commands/DefaultHelpCommandTest.java     | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java
index 9275d84bc..2488eea48 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java
@@ -94,7 +94,7 @@ public class DefaultHelpCommand extends CompositeCommand {
         if (user.isPlayer()) {
             // Player. Check perms
             if (user.isOp() || user.hasPermission(parent.getPermission())) {
-                if (params.isEmpty()) {
+                if (params == null || params.isEmpty()) {
                     user.sendMessage(HELP_SYNTAX_NO_PARAMETERS_REF, USAGE_PLACEHOLDER, usage, DESC_PLACEHOLDER, desc);
                 } else {
                     user.sendMessage(HELP_SYNTAX_REF, USAGE_PLACEHOLDER, usage, PARAMS_PLACEHOLDER, params, DESC_PLACEHOLDER, desc);
@@ -105,7 +105,7 @@ public class DefaultHelpCommand extends CompositeCommand {
             }
         } else if (!parent.isOnlyPlayer()) {
             // Console. Only show if it is a console command
-            if (params.isEmpty()) {
+            if (params == null || params.isEmpty()) {
                 user.sendMessage(HELP_SYNTAX_NO_PARAMETERS_REF, USAGE_PLACEHOLDER, usage, DESC_PLACEHOLDER, desc);
             } else {
                 user.sendMessage(HELP_SYNTAX_REF, USAGE_PLACEHOLDER, usage, PARAMS_PLACEHOLDER, params, DESC_PLACEHOLDER, desc);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java
index f454571ee..d32f571ca 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java
@@ -140,11 +140,9 @@ public class DefaultHelpCommandTest {
         Mockito.verify(user).getTranslationOrNothing("parameters");
         Mockito.verify(user).getTranslation("description");
         Mockito.verify(user).sendMessage(
-                "commands.help.syntax",
+                "commands.help.syntax-no-parameters",
                 "[usage]",
                 "island",
-                "[parameters]",
-                "",
                 "[description]",
                 "the main island command"
                 );
@@ -169,11 +167,9 @@ public class DefaultHelpCommandTest {
         Mockito.verify(user).getTranslationOrNothing("parameters");
         Mockito.verify(user).getTranslation("description");
         Mockito.verify(user).sendMessage(
-                "commands.help.syntax",
+                "commands.help.syntax-no-parameters",
                 "[usage]",
                 "island",
-                "[parameters]",
-                "",
                 "[description]",
                 "the main island command"
                 );