[xwiki-notifications] r6462 - in xwiki-products/curriki/trunk/plugins/spacemanager/src: main/java/org/xwiki/plugin/spacemanager/impl test/java/org/xwiki/plugin/spacemanager/impl

[SVN]

Author: ludovic
Date: 2007-12-26 16:52:30 +0100 (Wed, 26 Dec 2007)
New Revision: 6462

Modified:
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java
Log:
CURRIKI-1179 Fix addMember

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
    2007-12-26 14:32:37 UTC (rev 6461)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
    2007-12-26 15:52:30 UTC (rev 6462)
@@ -707,14 +707,18 @@
         memberObject.setName(groupDoc.getFullName());
         memberObject.setStringValue("member", username);
         groupDoc.addObject(groupClass.getName(), memberObject);
+        xwiki.saveDocument(groupDoc, 
context.getMessageTool().get("core.comment.addedUserToGroup"),
+                 context);
+        /*
         if (groupDoc.isNew()) {
-            xwiki.saveDocument(groupDoc, 
context.getMessageTool().get("core.comment.addedUserToGroup"),
-                context);
         } else {
             xwiki.getHibernateStore().saveXWikiObject(memberObject, context, 
true);
         }
         // we need to make sure we add the user to the group cache
-        xwiki.getGroupService(context).addUserToGroup(username, 
context.getDatabase(), groupName, context);
+        try {
+            xwiki.getGroupService(context).addUserToGroup(username, 
context.getDatabase(), groupName, context);
+        } catch (Exception e) {}
+        */
    }
 
 

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java
       2007-12-26 14:32:37 UTC (rev 6461)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java
       2007-12-26 15:52:30 UTC (rev 6462)
@@ -19,7 +19,7 @@
 import com.xpn.xwiki.store.XWikiStoreInterface;
 import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
 
-public class SpaceImplTest extends org.jmock.cglib.MockObjectTestCase{
+public class SpaceImplTest extends org.jmock.cglib.MockObjectTestCase {
        
        private XWikiContext context;
        private SpaceManagerImpl spaceManager;

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java
        2007-12-26 14:32:37 UTC (rev 6461)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java
        2007-12-26 15:52:30 UTC (rev 6462)
@@ -244,9 +244,10 @@
 
                List testlist = new ArrayList();
                testlist.add("XWiki.cristi");
-               testlist.addAll(newusers);
+        testlist.add("XWiki.testuser1");
+        testlist.add("XWiki.testuser2");
                l = (List) this.spaceManager.getMembers(s1.getSpaceName(), 
context);
-               assertEquals(l, testlist);
+               assertEquals(testlist, l);
        }
 
     public void testAddAdmin() throws SpaceManagerException {
@@ -262,10 +263,11 @@
                this.spaceManager.addAdmins(s1.getSpaceName(), newusers, 
context);
 
                List testlist = new ArrayList();
-               testlist.add("XWiki.cristi");
-               testlist.addAll(newusers);
+        testlist.add("XWiki.cristi");
+        testlist.add("XWiki.testuser1");
+        testlist.add("XWiki.testuser2");
                l = (List) this.spaceManager.getAdmins(s1.getSpaceName(), 
context);
-               assertEquals(l, testlist);
+               assertEquals(testlist, l);
        }
 
     /**

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications