From fe89c476772cc6adb06a8cca53d99bf1b0f2972f Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc-cnrc.gc.ca>
Date: Mon, 3 Nov 2014 10:23:16 -0800
Subject: [PATCH] Fixed some unit tests
---
.../test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java | 2 +-
.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java | 2 +-
.../src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
index 79866c3d..253fd014 100644
--- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
+++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
@@ -802,7 +802,7 @@ public class LdapGroupDAOTest
fail("searchGroups with unknown user should throw " +
"UserNotFoundException");
}
- catch (UserNotFoundException ignore) {}
+ catch (AccessControlException ignore) {}
try
{
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
index dd1e86bf..2406692a 100644
--- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
+++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
@@ -229,7 +229,7 @@ public class LdapUserDAOTest
boolean isMember = getUserDAO().isMember(testUser.getUserID(), "foo");
assertFalse(isMember);
- String groupDN = "cn=cadcdaotestgroup1,ou=groups,ou=ds,dc=canfartest,dc=net";
+ String groupDN = "cn=cadcdaotestgroup1," + groupsDN;
isMember = getUserDAO().isMember(testUser.getUserID(), groupDN);
assertTrue(isMember);
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 91bfea29..8747ec04 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
@@ -137,7 +137,6 @@ public class GetGroupNamesActionTest
return mockPersistence;
};
- @Override
protected HttpServletResponse getHttpServletResponse()
{
return mockResponse;
--
GitLab