From 1e04878bb8b14044d6e45c8f408c42cc9115a378 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca> Date: Mon, 3 Nov 2014 13:31:36 -0800 Subject: [PATCH] Story 1711: Test fixes. --- .../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 7 ++++--- .../cadc/ac/server/web/GetGroupNamesActionTest.java | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java index e09dfdce..bf3af158 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java +++ b/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()) diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java index 8747ec04..f7642021 100644 --- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java +++ b/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(); -- GitLab