Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

@@ -231,11 +231,12 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
         }
         for (Group groupMember : groups)
         {
-            if (!checkGroupExists(groupID))
+            final String groupMemberID = groupMember.getID();
+            if (!checkGroupExists(groupMemberID))
             {
-                throw new GroupNotFoundException(groupID);
+                throw new GroupNotFoundException(groupMemberID);
             }
-            DN memberDN = getGroupDN(groupMember.getID());
+            DN memberDN = getGroupDN(groupMemberID);
             members.add(memberDN.toNormalizedString());
         }
         if (!members.isEmpty())

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java

@@ -70,6 +70,8 @@ package ca.nrc.cadc.ac.server.web;
 
 import ca.nrc.cadc.ac.server.GroupPersistence;
 import ca.nrc.cadc.util.Log4jInit;
+import ca.nrc.cadc.uws.server.SyncOutput;
+
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.easymock.EasyMock;
@@ -120,6 +122,11 @@ public class GetGroupNamesActionTest
             mockWriter.write("\n");
             EasyMock.expectLastCall();
 
+            final SyncOutput mockSyncOutput =
+                    EasyMock.createMock(SyncOutput.class);
+
+            mockSyncOutput.setHeader("Content-Type", "text/csv");
+
             final HttpServletResponse mockResponse = EasyMock.createMock(HttpServletResponse.class);
             mockResponse.setContentType("text/csv");
             EasyMock.expectLastCall();
@@ -136,11 +143,6 @@ public class GetGroupNamesActionTest
                 {
                     return mockPersistence;
                 };
-
-                protected HttpServletResponse getHttpServletResponse()
-                {
-                    return mockResponse;
-                }
             };
 
             action.run();