EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix the test jailing.

Browse Source
This commit is contained in:
graywolf336 2013-12-23 14:46:09 -06:00
parent ab0c236711
commit c123689e67
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -51,13 +51,18 @@ public class JailIO {
if(langFile.isFile()) { if(langFile.isFile()) {
lang = YamlConfiguration.loadConfiguration(langFile); lang = YamlConfiguration.loadConfiguration(langFile);
}else { }else {
pl.getLogger().severe("The language file can not be a folder, please double check your setup. Because of that, we are reverting back to English as the language."); pl.getLogger().severe("The language file can not be a folder, please");
pl.getLogger().info("double check your setup. Because of that, we");
pl.getLogger().info("are reverting back to English as the language.");
lang = YamlConfiguration.loadConfiguration(pl.getResource("en.yml")); lang = YamlConfiguration.loadConfiguration(pl.getResource("en.yml"));
save = true; save = true;
} }
}else { }else {
pl.getLogger().info("Loading the default language of: en"); pl.getLogger().info("Loading the default language of: en");
pl.getLogger().info("If you wish to change this, please rename 'en.yml' to whatever you wish and set the config value to the name of the file."); pl.getLogger().info("If you wish to change this,");
pl.getLogger().info("please rename 'en.yml' to whatever");
pl.getLogger().info("you wish and set the config value");
pl.getLogger().info("to the name of the file.");
lang = YamlConfiguration.loadConfiguration(pl.getResource("en.yml")); lang = YamlConfiguration.loadConfiguration(pl.getResource("en.yml"));
save = true; save = true;
} }

1
src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java
View File

@ -91,6 +91,7 @@ public class TestInstanceCreator {
logger.set(main, new PluginLogger(main)); logger.set(main, new PluginLogger(main));
doReturn(getClass().getClassLoader().getResourceAsStream("config.yml")).when(main).getResource("config.yml"); doReturn(getClass().getClassLoader().getResourceAsStream("config.yml")).when(main).getResource("config.yml");
doReturn(getClass().getClassLoader().getResourceAsStream("en.yml")).when(main).getResource("en.yml");
// Add Jail to the list of loaded plugins // Add Jail to the list of loaded plugins
JavaPlugin[] plugins = new JavaPlugin[] { main }; JavaPlugin[] plugins = new JavaPlugin[] { main };