Merged revisions 598371-598586 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Qpid-559 : OSGi Patch Provided by Aidan Skinner 
........
  r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Add Target to ignores list.
........
  r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Now outputs test results in xml format to the surefire reports directory.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599036 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 42 insertions, 0 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
new file mode 100644
index 0000000000..1b082beee4
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
@@ -0,0 +1,35 @@
+package org.apache.qpid.server.plugins;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeType;
+
+import junit.framework.TestCase;
+
+public class PluginTest extends TestCase
+{
+
+    private static final String TEST_EXCHANGE_CLASS = "org.apache.qpid.extras.exchanges.example.TestExchangeType";
+    private static final String PLUGIN_DIRECTORY = System.getProperty("example.plugin.target");
+
+    public void testLoadExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager(PLUGIN_DIRECTORY);
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertNotNull("No exchanges found in "+PLUGIN_DIRECTORY, exchanges);
+        assertEquals("Wrong number of exchanges found in "+PLUGIN_DIRECTORY, 
+                     2, exchanges.size());
+        assertNotNull("Wrong exchange found in "+PLUGIN_DIRECTORY,
+                      exchanges.get(TEST_EXCHANGE_CLASS));
+    } 
+    
+    public void testNoExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager("/path/to/nowhere");
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertNull("Exchanges found", exchanges);
+    } 
+    
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index bd7ed60d1d..0218109369 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.util;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
+import org.apache.qpid.server.plugins.PluginManager;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -145,5 +146,11 @@ public class TestApplicationRegistry extends ApplicationRegistry
     {
         return _messageStore;
     }
+
+    public PluginManager getPluginManager()
+    {
+        return null;
+    }
 }
 
+