Changeset 2583

Timestamp:

07/02/08 11:13:39 (5 months ago)

Author:

jmoore

Message:

ticket:1021 - Checking for duplicate groups in createExperimenter

Location:

trunk/components/server

Files:

• src/ome/logic/AdminImpl.java (modified) (3 diffs)
• test/ome/server/itests/sec/AdminTest.java (modified) (1 diff)

trunk/components/server/src/ome/logic/AdminImpl.java

@@ -24 +24 @@
 import javax.ejb.TransactionManagementType;
 import javax.interceptor.Interceptors;
+
 import ome.annotations.NotNull;
 import ome.annotations.RevisionDate;
@@ -190 +191 @@
         getBeanHelper().throwIfAlreadySet(ldap, ldapService);
         this.ldap = ldapService;
-        if(!this.ldap.getSetting()) {
+        if (!this.ldap.getSetting()) {
             this.ldap = null;
         }
@@ -496 +497 @@
 
         group = new ExperimenterGroup(group.getId(), false);
+
+        // ticket:1021 - check for already added groups
+        for (GroupExperimenterMap link : e.unmodifiableGroupExperimenterMap()) {
+            ExperimenterGroup test = link.parent();
+            if (test.getId().equals(group.getId())) {
+                return link; // EARLY EXIT!
+            }
+        }
 
         GroupExperimenterMap link = e.linkExperimenterGroup(group);

trunk/components/server/test/ome/server/itests/sec/AdminTest.java

@@ -123 +123 @@
     }
 
+    @Test(groups = "ticket:1021")
+    public void testDefaultGroupNotAddedTwice() throws Exception {
+        List<ExperimenterGroup> groups = iAdmin.lookupGroups();
+        ExperimenterGroup def = null, nonDef = null;
+        for (ExperimenterGroup group : groups) {
+            if (group.getName().equals("user")
+                    || group.getName().equals("system")) {
+                continue;
+            }
+            if (def == null) {
+                def = group;
+            } else if (nonDef == null) {
+                nonDef = group;
+            } else {
+                break;
+            }
+        }
+        assertNotNull(def);
+        assertNotNull(nonDef);
+
+        Experimenter e = testExperimenter();
+        long id = iAdmin.createExperimenter(e, def, nonDef);
+        e = iAdmin.lookupExperimenter(e.getOmeName());
+        assertEquals("should be 2", 2, e.sizeOfGroupExperimenterMap());
+
+        e = testExperimenter();
+        id = iAdmin.createExperimenter(e, def, nonDef, def);
+        e = iAdmin.lookupExperimenter(e.getOmeName());
+        assertEquals("should still be 2", 2, e.sizeOfGroupExperimenterMap());
+
+    }
+
     private ExperimenterGroup testGroup() {
         ExperimenterGroup g = new ExperimenterGroup();