r1274 - in xwiki/trunk/src: main/java/com/xpn/xwiki/plugin test/java/com/xpn/xwiki/test

[Jeremi Joslin]

Author: jeremi
Date: 2006-09-04 15:09:05 +0200 (Mon, 04 Sep 2006)
New Revision: 1274

Added:
   xwiki/trunk/src/test/java/com/xpn/xwiki/test/PluginAddTest.java
Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java
Log:
Fix the broken tests and add some tests

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java	2006-09-04 11:25:39 UTC (rev 1273)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java	2006-09-04 13:09:05 UTC (rev 1274)
@@ -123,7 +123,8 @@
         {
             Method method = methods[i];
             String name = method.getName();
-            ((Vector)functionList.get(name)).add(plugin);
+            if (functionList.containsKey(name))
+                ((Vector)functionList.get(name)).add(plugin);
         }
     }
 
@@ -145,7 +146,7 @@
     }
 
     public void flushCache() {
-        Vector plugins = getPlugins("virtualInit");
+        Vector plugins = getPlugins("flushCache");
         for (int i=0;i<plugins.size();i++) {
             try {
                 ((XWikiPluginInterface)plugins.get(i)).flushCache();
@@ -155,7 +156,7 @@
     }
 
     public String commonTagsHandler(String text, XWikiContext context) {
-        Vector plugins = getPlugins("virtualInit");
+        Vector plugins = getPlugins("commonTagsHandler");
         for (int i=0;i<plugins.size();i++) {
             try {
                 text = ((XWikiPluginInterface)plugins.get(i)).commonTagsHandler(text,context);
@@ -166,7 +167,7 @@
     }
 
     public String startRenderingHandler(String text, XWikiContext context) {
-        Vector plugins = getPlugins("virtualInit");
+        Vector plugins = getPlugins("startRenderingHandler");
         for (int i=0;i<plugins.size();i++) {
             try {
                 text = ((XWikiPluginInterface)plugins.get(i)).startRenderingHandler(text,context);
@@ -177,7 +178,7 @@
     }
 
     public String outsidePREHandler(String text, XWikiContext context) {
-        Vector plugins = getPlugins("virtualInit");
+        Vector plugins = getPlugins("outsidePREHandler");
         for (int i=0;i<plugins.size();i++) {
             try {
                 text = ((XWikiPluginInterface)plugins.get(i)).outsidePREHandler(text,context);
@@ -188,6 +189,7 @@
     }
 
     public String insidePREHandler(String text, XWikiContext context) {
+        Vector plugins = getPlugins("insidePREHandler");
         for (int i=0;i<plugins.size();i++) {
             try {
                 text = ((XWikiPluginInterface)plugins.get(i)).insidePREHandler(text,context);
@@ -198,6 +200,7 @@
     }
 
     public String endRenderingHandler(String text, XWikiContext context) {
+        Vector plugins = getPlugins("endRenderingHandler");
         for (int i=0;i<plugins.size();i++) {
             try {
                 text = ((XWikiPluginInterface)plugins.get(i)).endRenderingHandler(text,context);
@@ -208,6 +211,7 @@
     }
 
     public void beginRendering(XWikiContext context) {
+        Vector plugins = getPlugins("beginRendering");
         for (int i=0;i<plugins.size();i++) {
             try {
                 ((XWikiPluginInterface)plugins.get(i)).beginRendering(context);
@@ -217,6 +221,7 @@
     }
 
     public void endRendering(XWikiContext context) {
+        Vector plugins = getPlugins("endRendering");
         for (int i=0;i<plugins.size();i++) {
             try {
                 ((XWikiPluginInterface)plugins.get(i)).endRendering(context);
@@ -226,6 +231,7 @@
     }
 
     public XWikiAttachment downloadAttachment(XWikiAttachment attachment, XWikiContext context) {
+        Vector plugins = getPlugins("downloadAttachment");
         XWikiAttachment attach = attachment;
         for (int i=0;i<plugins.size();i++) {
             try {

Added: xwiki/trunk/src/test/java/com/xpn/xwiki/test/PluginAddTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/PluginAddTest.java	2006-09-04 11:25:39 UTC (rev 1273)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/PluginAddTest.java	2006-09-04 13:09:05 UTC (rev 1274)
@@ -0,0 +1,27 @@
+package com.xpn.xwiki.test;
+
+import com.xpn.xwiki.plugin.XWikiPluginManager;
+import com.xpn.xwiki.XWikiContext;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: jeremi
+ * Date: Sep 1, 2006
+ * Time: 12:30:55 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PluginAddTest extends HibernateTestCase {
+
+    public void setUp() throws Exception {
+        super.setUp();
+        getXWiki().setPluginManager(new XWikiPluginManager("com.xpn.xwiki.plugin.test.testPlugin", getXWikiContext()));
+    }
+
+    public void testGetPlugin(){
+        assertNull(getXWiki().getPluginManager().getPlugins("invalidFunctionName"));
+        assertEquals("There should be one plugin with the function commonTagsHandler implemented", 1, getXWiki().getPluginManager().getPlugins("commonTagsHandler").size());
+        assertEquals(0, getXWiki().getPluginManager().getPlugins("flushCache").size());        
+    }
+
+
+}