From 48a7435fbe94a457b59388476df4fd32c04ab9b6 Mon Sep 17 00:00:00 2001 From: graywolf336 Date: Tue, 11 Feb 2014 20:44:19 -0600 Subject: [PATCH] Fix the tests failing and also fix the jail command not doing anything. --- .../java/com/graywolf336/jail/JailMain.java | 2 +- .../graywolf336/jail/command/JailHandler.java | 4 --- .../jail/command/commands/jewels/Jailing.java | 7 ++++- .../jail/command/subcommands/JailCommand.java | 2 +- .../com/graywolf336/jail/JewelCommands.java | 28 +++++++++++++++++++ 5 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 src/test/java/test/java/com/graywolf336/jail/JewelCommands.java diff --git a/src/main/java/com/graywolf336/jail/JailMain.java b/src/main/java/com/graywolf336/jail/JailMain.java index 60bd2f4..2bb7d99 100644 --- a/src/main/java/com/graywolf336/jail/JailMain.java +++ b/src/main/java/com/graywolf336/jail/JailMain.java @@ -118,7 +118,7 @@ public class JailMain extends JavaPlugin { */ public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) { if(command.getName().equalsIgnoreCase("jail")) { - jh.handleCommand(jm, sender, args); + jh.parseCommand(jm, sender, args); }else { cmdHand.handleCommand(jm, sender, command.getName().toLowerCase(), args); } diff --git a/src/main/java/com/graywolf336/jail/command/JailHandler.java b/src/main/java/com/graywolf336/jail/command/JailHandler.java index 015bd01..db5330f 100644 --- a/src/main/java/com/graywolf336/jail/command/JailHandler.java +++ b/src/main/java/com/graywolf336/jail/command/JailHandler.java @@ -37,10 +37,6 @@ public class JailHandler { plugin.getLogger().info("Loaded " + commands.size() + " sub-commands of /jail."); } - - public void handleCommand(JailManager jm, CommandSender sender, String... args) { - - } /** * Handles the given command and checks that the command is in valid form. diff --git a/src/main/java/com/graywolf336/jail/command/commands/jewels/Jailing.java b/src/main/java/com/graywolf336/jail/command/commands/jewels/Jailing.java index 777516e..a7dc5ff 100644 --- a/src/main/java/com/graywolf336/jail/command/commands/jewels/Jailing.java +++ b/src/main/java/com/graywolf336/jail/command/commands/jewels/Jailing.java @@ -19,9 +19,14 @@ public interface Jailing { public String getCell(); @Option(longName={"muted", "canttalk"}, shortName="m", description = "whether the prisoner is muted or not") - public boolean isMuted(); + public boolean getMuted(); @Option(longName={"reason"}, shortName="r", description = "the reason this player is being jailed") public List getReason(); + public boolean isTime(); + public boolean isJail(); + public boolean isCell(); + public boolean isMuted(); + public boolean isReason(); } diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java index 2fdbafd..83656b8 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java @@ -150,7 +150,7 @@ public class JailCommand implements Command { } //If the config has automatic muting, then let's set them as muted - boolean muted = params.isMuted(); + boolean muted = params.getMuted(); if(jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath())) { muted = true; } diff --git a/src/test/java/test/java/com/graywolf336/jail/JewelCommands.java b/src/test/java/test/java/com/graywolf336/jail/JewelCommands.java new file mode 100644 index 0000000..99519ed --- /dev/null +++ b/src/test/java/test/java/com/graywolf336/jail/JewelCommands.java @@ -0,0 +1,28 @@ +package test.java.com.graywolf336.jail; + +import junit.framework.Assert; + +import org.junit.Test; + +import com.graywolf336.jail.command.commands.jewels.Jailing; +import com.lexicalscope.jewel.cli.CliFactory; + +public class JewelCommands { + @Test + public void testJewel() { + String[] args = { "--player", "graywolf336", "-c", "testing", "-r", "This", "is", "a", "reason" }; + Jailing j = CliFactory.parseArguments(Jailing.class, args); + + Assert.assertEquals("graywolf336", j.getPlayer()); + Assert.assertEquals("testing", j.getCell()); + + StringBuilder sb = new StringBuilder(); + for(String s : j.getReason()) { + sb.append(s).append(' '); + } + + sb.deleteCharAt(sb.length() - 1); + + Assert.assertEquals("This is a reason", sb.toString()); + } +} \ No newline at end of file