diff options
author | Feildmaster <admin@feildmaster.com> | 2012-02-29 18:46:09 -0600 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 20:59:56 -0500 |
commit | 0a106995d2c79518cb8a3818dd565e6fbfec080a (patch) | |
tree | 549e829fe890ebecf13119b2b039746370f28542 /src/test/java | |
parent | 337860b7c0f26e296827bca6c4e79f1ec27437f9 (diff) | |
download | bukkit-0a106995d2c79518cb8a3818dd565e6fbfec080a.tar bukkit-0a106995d2c79518cb8a3818dd565e6fbfec080a.tar.gz bukkit-0a106995d2c79518cb8a3818dd565e6fbfec080a.tar.lz bukkit-0a106995d2c79518cb8a3818dd565e6fbfec080a.tar.xz bukkit-0a106995d2c79518cb8a3818dd565e6fbfec080a.zip |
Revert Plugin to Interface, added PluginBase
Fixed Tests, moved TestPlugin out of messaging
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/bukkit/metadata/MetadataConversionTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/bukkit/metadata/MetadataStoreTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/bukkit/plugin/TestPlugin.java (renamed from src/test/java/org/bukkit/plugin/messaging/TestPlugin.java) | 28 | ||||
-rw-r--r-- | src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java | 2 |
6 files changed, 7 insertions, 31 deletions
diff --git a/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java b/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java index 0844f975..405169bc 100644 --- a/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java +++ b/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java @@ -3,7 +3,7 @@ package org.bukkit.metadata; import static org.junit.Assert.assertEquals; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.messaging.TestPlugin; +import org.bukkit.plugin.TestPlugin; import org.junit.Test; public class FixedMetadataValueTest { diff --git a/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java b/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java index ece6a0f4..a3172db7 100644 --- a/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java +++ b/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java @@ -1,6 +1,6 @@ package org.bukkit.metadata; -import org.bukkit.plugin.messaging.TestPlugin; +import org.bukkit.plugin.TestPlugin; import org.junit.Test; import java.util.concurrent.Callable; diff --git a/src/test/java/org/bukkit/metadata/MetadataConversionTest.java b/src/test/java/org/bukkit/metadata/MetadataConversionTest.java index 428768ad..a595cc8d 100644 --- a/src/test/java/org/bukkit/metadata/MetadataConversionTest.java +++ b/src/test/java/org/bukkit/metadata/MetadataConversionTest.java @@ -16,7 +16,7 @@ package org.bukkit.metadata; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.messaging.TestPlugin; +import org.bukkit.plugin.TestPlugin; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/bukkit/metadata/MetadataStoreTest.java b/src/test/java/org/bukkit/metadata/MetadataStoreTest.java index 98a96423..255324b5 100644 --- a/src/test/java/org/bukkit/metadata/MetadataStoreTest.java +++ b/src/test/java/org/bukkit/metadata/MetadataStoreTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.concurrent.Callable; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.messaging.TestPlugin; +import org.bukkit.plugin.TestPlugin; import org.junit.Test; public class MetadataStoreTest { diff --git a/src/test/java/org/bukkit/plugin/messaging/TestPlugin.java b/src/test/java/org/bukkit/plugin/TestPlugin.java index f14e2e75..a435771a 100644 --- a/src/test/java/org/bukkit/plugin/messaging/TestPlugin.java +++ b/src/test/java/org/bukkit/plugin/TestPlugin.java @@ -1,4 +1,4 @@ -package org.bukkit.plugin.messaging; +package org.bukkit.plugin; import java.io.File; import java.io.InputStream; @@ -8,14 +8,10 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.generator.ChunkGenerator; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginLoader; -import org.bukkit.plugin.PluginLogger; import com.avaje.ebean.EbeanServer; -public class TestPlugin extends Plugin { +public class TestPlugin extends PluginBase { private boolean enabled = true; final private String pluginName; @@ -28,10 +24,6 @@ public class TestPlugin extends Plugin { this.enabled = enabled; } - public String getName() { - return pluginName; - } - public File getDataFolder() { throw new UnsupportedOperationException("Not supported."); } @@ -111,20 +103,4 @@ public class TestPlugin extends Plugin { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { throw new UnsupportedOperationException("Not supported."); } - - @Override - public int hashCode() { - return getName().hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - return getName().equals(((TestPlugin) obj).getName()); - } } diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java index ee3d8acf..47bea472 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -1,6 +1,6 @@ package org.bukkit.plugin.messaging; -import org.bukkit.plugin.messaging.ReservedChannelException; +import org.bukkit.plugin.TestPlugin; import java.util.Collection; import org.junit.Test; import static org.junit.Assert.*; |