From 88c17a7f86eacd1bc49c8f97577bf3c8bc60662f Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Sun, 15 Jan 2012 14:37:30 +0100 Subject: Generic cleaning --- .../configuration/file/FileConfigurationTest.java | 62 +++++++++++----------- .../configuration/file/YamlConfigurationTest.java | 11 ++-- .../plugin/messaging/StandardMessengerTest.java | 6 +-- 3 files changed, 39 insertions(+), 40 deletions(-) (limited to 'src/test/java/org') diff --git a/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java index 627ca24e..ce0c2e5a 100644 --- a/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java +++ b/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java @@ -16,24 +16,24 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { @Override public abstract FileConfiguration getConfig(); - + public abstract String getTestValuesString(); - + public abstract String getTestHeaderInput(); - + public abstract String getTestHeaderResult(); - + @Test public void testSave_File() throws Exception { FileConfiguration config = getConfig(); File file = testFolder.newFile("test.config"); - + for (Map.Entry entry : getTestValues().entrySet()) { config.set(entry.getKey(), entry.getValue()); } - + config.save(file); - + assertTrue(file.isFile()); } @@ -41,27 +41,27 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { public void testSave_String() throws Exception { FileConfiguration config = getConfig(); File file = testFolder.newFile("test.config"); - + for (Map.Entry entry : getTestValues().entrySet()) { config.set(entry.getKey(), entry.getValue()); } - + config.save(file.getAbsolutePath()); - + assertTrue(file.isFile()); } @Test public void testSaveToString() { FileConfiguration config = getConfig(); - + for (Map.Entry entry : getTestValues().entrySet()) { config.set(entry.getKey(), entry.getValue()); } - + String result = config.saveToString(); String expected = getTestValuesString(); - + assertEquals(expected, result); } @@ -72,19 +72,19 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { BufferedWriter writer = new BufferedWriter(new FileWriter(file)); String saved = getTestValuesString(); Map values = getTestValues(); - + try { writer.write(saved); } finally { writer.close(); } - + config.load(file); - + for (Map.Entry entry : values.entrySet()) { assertEquals(entry.getValue(), config.get(entry.getKey())); } - + assertEquals(values.keySet(), config.getKeys(true)); } @@ -95,19 +95,19 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { BufferedWriter writer = new BufferedWriter(new FileWriter(file)); String saved = getTestValuesString(); Map values = getTestValues(); - + try { writer.write(saved); } finally { writer.close(); } - + config.load(file.getAbsolutePath()); - + for (Map.Entry entry : values.entrySet()) { assertEquals(entry.getValue(), config.get(entry.getKey())); } - + assertEquals(values.keySet(), config.getKeys(true)); } @@ -116,13 +116,13 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { FileConfiguration config = getConfig(); Map values = getTestValues(); String saved = getTestValuesString(); - + config.loadFromString(saved); - + for (Map.Entry entry : values.entrySet()) { assertEquals(entry.getValue(), config.get(entry.getKey())); } - + assertEquals(values.keySet(), config.getKeys(true)); assertEquals(saved, config.saveToString()); } @@ -131,14 +131,14 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { public void testSaveToStringWithHeader() { FileConfiguration config = getConfig(); config.options().header(getTestHeaderInput()); - + for (Map.Entry entry : getTestValues().entrySet()) { config.set(entry.getKey(), entry.getValue()); } - + String result = config.saveToString(); String expected = getTestHeaderResult() + "\n" + getTestValuesString(); - + assertEquals(expected, result); } @@ -149,15 +149,15 @@ public abstract class FileConfigurationTest extends MemoryConfigurationTest { String saved = getTestValuesString(); String header = getTestHeaderResult(); String expected = getTestHeaderInput(); - + config.loadFromString(header + "\n" + saved); - + assertEquals(expected, config.options().header()); - + for (Map.Entry entry : values.entrySet()) { assertEquals(entry.getValue(), config.get(entry.getKey())); } - + assertEquals(values.keySet(), config.getKeys(true)); assertEquals(header + "\n" + saved, config.saveToString()); } diff --git a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java index edb04486..2fbb1368 100644 --- a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java +++ b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java @@ -4,13 +4,12 @@ import java.util.ArrayList; import java.util.List; import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.inventory.ItemStack; import org.junit.Test; import static org.junit.Assert.*; -public class YamlConfigurationTest extends FileConfigurationTest { +public class YamlConfigurationTest extends FileConfigurationTest { @Override public YamlConfiguration getConfig() { return new YamlConfiguration(); @@ -25,7 +24,7 @@ public class YamlConfigurationTest extends FileConfigurationTest { public String getTestHeaderResult() { return "# This is a sample\n# header.\n# \n# Newline above should be commented.\n\n"; } - + @Override public String getTestValuesString() { return "integer: -2147483648\n" + @@ -51,12 +50,12 @@ public class YamlConfigurationTest extends FileConfigurationTest { public void testSaveToStringWithIndent() { YamlConfiguration config = getConfig(); config.options().indent(9); - + config.set("section.key", 1); - + String result = config.saveToString(); String expected = "section:\n key: 1\n"; - + assertEquals(expected, result); } diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java index 415f1745..52e4a0fb 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -40,7 +40,7 @@ public class StandardMessengerTest { assertFalse(messenger.isOutgoingChannelRegistered(plugin, "foo")); } - @Test(expected=ReservedChannelException.class) + @Test(expected = ReservedChannelException.class) public void testReservedOutgoingRegistration() { Messenger messenger = getMessenger(); TestPlugin plugin = getPlugin(); @@ -86,7 +86,7 @@ public class StandardMessengerTest { assertFalse(listener.hasReceived()); } - @Test(expected=ReservedChannelException.class) + @Test(expected = ReservedChannelException.class) public void testReservedIncomingRegistration() { Messenger messenger = getMessenger(); TestPlugin plugin = getPlugin(); @@ -94,7 +94,7 @@ public class StandardMessengerTest { messenger.registerIncomingPluginChannel(plugin, "REGISTER", new TestMessageListener("foo", "bar".getBytes())); } - @Test(expected=IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testDuplicateIncomingRegistration() { Messenger messenger = getMessenger(); TestPlugin plugin = getPlugin(); -- cgit v1.2.3