From 6b8dec6c7b67038bc3f0e42494d9b963d32c92c1 Mon Sep 17 00:00:00 2001 From: graywolf336 Date: Tue, 22 Jul 2014 20:58:05 -0500 Subject: [PATCH] Work on some unit tests for #7 and reorganize part of the config. --- .../java/com/graywolf336/jail/JailIO.java | 3 +- .../jail/command/subcommands/JailCommand.java | 2 +- .../command/subcommands/JailTimeCommand.java | 2 +- .../com/graywolf336/jail/enums/Settings.java | 15 +- .../jail/legacy/LegacyManager.java | 4 +- .../jail/listeners/JailingListener.java | 20 ++- src/main/resources/config.yml | 19 ++- .../com/graywolf336/jail/TestJailStuff.java | 148 ++++++++++++++---- 8 files changed, 159 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/graywolf336/jail/JailIO.java b/src/main/java/com/graywolf336/jail/JailIO.java index 0771161..9afa205 100644 --- a/src/main/java/com/graywolf336/jail/JailIO.java +++ b/src/main/java/com/graywolf336/jail/JailIO.java @@ -24,6 +24,7 @@ import com.graywolf336.jail.beans.Jail; import com.graywolf336.jail.beans.Prisoner; import com.graywolf336.jail.beans.SimpleLocation; import com.graywolf336.jail.enums.LangString; +import com.graywolf336.jail.enums.Settings; /** * Handles all the saving and loading of the plugin's data. @@ -61,7 +62,7 @@ public class JailIO { /** Loads the language file from disk, if there is none then we save the default one. */ @SuppressWarnings("deprecation") public void loadLanguage() { - String language = pl.getConfig().getString("system.language"); + String language = pl.getConfig().getString(Settings.LANGUAGE.getPath()); boolean save = false; File langFile = new File(pl.getDataFolder(), language + ".yml"); 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 cbc41d4..cdec860 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java @@ -84,7 +84,7 @@ public class JailCommand implements Command { Long time = 10L; try { if(params.getTime() == null) { - time = Util.getTime(jm.getPlugin().getConfig().getString(Settings.JAILDEFAULTTIME.getPath(), "30m")); + time = Util.getTime(jm.getPlugin().getConfig().getString(Settings.DEFAULTTIME.getPath(), "30m")); }else if(params.getTime() == String.valueOf(-1)) { time = -1L; }else { diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailTimeCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailTimeCommand.java index 4053a5e..0b36cf6 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailTimeCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailTimeCommand.java @@ -15,7 +15,7 @@ import com.graywolf336.jail.enums.LangString; needsPlayer = false, pattern = "time|t", permission = "jail.command.jailtime", - usage = "/jail time