From 0a106995d2c79518cb8a3818dd565e6fbfec080a Mon Sep 17 00:00:00 2001
From: Feildmaster <admin@feildmaster.com>
Date: Wed, 29 Feb 2012 18:46:09 -0600
Subject: Revert Plugin to Interface, added PluginBase

Fixed Tests, moved TestPlugin out of messaging
---
 .../bukkit/metadata/FixedMetadataValueTest.java    |   2 +-
 .../org/bukkit/metadata/LazyMetadataValueTest.java |   2 +-
 .../bukkit/metadata/MetadataConversionTest.java    |   2 +-
 .../org/bukkit/metadata/MetadataStoreTest.java     |   2 +-
 src/test/java/org/bukkit/plugin/TestPlugin.java    | 106 +++++++++++++++++
 .../plugin/messaging/StandardMessengerTest.java    |   2 +-
 .../org/bukkit/plugin/messaging/TestPlugin.java    | 130 ---------------------
 7 files changed, 111 insertions(+), 135 deletions(-)
 create mode 100644 src/test/java/org/bukkit/plugin/TestPlugin.java
 delete mode 100644 src/test/java/org/bukkit/plugin/messaging/TestPlugin.java

(limited to 'src/test/java')

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/TestPlugin.java b/src/test/java/org/bukkit/plugin/TestPlugin.java
new file mode 100644
index 00000000..a435771a
--- /dev/null
+++ b/src/test/java/org/bukkit/plugin/TestPlugin.java
@@ -0,0 +1,106 @@
+package org.bukkit.plugin;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.bukkit.Server;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.generator.ChunkGenerator;
+
+import com.avaje.ebean.EbeanServer;
+
+public class TestPlugin extends PluginBase {
+    private boolean enabled = true;
+
+    final private String pluginName;
+
+    public TestPlugin(String pluginName) {
+        this.pluginName = pluginName;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public File getDataFolder() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public PluginDescriptionFile getDescription() {
+        return new PluginDescriptionFile(pluginName, "1.0", "test.test");
+    }
+
+    public FileConfiguration getConfig() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public InputStream getResource(String filename) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void saveConfig() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void saveDefaultConfig() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void saveResource(String resourcePath, boolean replace) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void reloadConfig() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public PluginLogger getLogger() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public PluginLoader getPluginLoader() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public Server getServer() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void onDisable() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void onLoad() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void onEnable() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public boolean isNaggable() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public void setNaggable(boolean canNag) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public EbeanServer getDatabase() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+}
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.*;
diff --git a/src/test/java/org/bukkit/plugin/messaging/TestPlugin.java b/src/test/java/org/bukkit/plugin/messaging/TestPlugin.java
deleted file mode 100644
index f14e2e75..00000000
--- a/src/test/java/org/bukkit/plugin/messaging/TestPlugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.bukkit.plugin.messaging;
-
-import java.io.File;
-import java.io.InputStream;
-
-import org.bukkit.Server;
-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 {
-    private boolean enabled = true;
-
-    final private String pluginName;
-
-    public TestPlugin(String pluginName) {
-        this.pluginName = pluginName;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getName() {
-        return pluginName;
-    }
-
-    public File getDataFolder() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public PluginDescriptionFile getDescription() {
-        return new PluginDescriptionFile(pluginName, "1.0", "test.test");
-    }
-
-    public FileConfiguration getConfig() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public InputStream getResource(String filename) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void saveConfig() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void saveDefaultConfig() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void saveResource(String resourcePath, boolean replace) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void reloadConfig() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public PluginLogger getLogger() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public PluginLoader getPluginLoader() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public Server getServer() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void onDisable() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void onLoad() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void onEnable() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public boolean isNaggable() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public void setNaggable(boolean canNag) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public EbeanServer getDatabase() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    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());
-    }
-}
-- 
cgit v1.2.3