s1890 - fixed some test compile errors due to removal of generics in User.java (b498d64c) · Commits · OATS-CADC / ac

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

+25 −23

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertTrue;
		import static org.junit.Assert.fail;

		import java.security.AccessControlException;
		import java.security.PrivilegedExceptionAction;
		import java.util.Collection;

		@@ -81,18 +80,17 @@ import javax.security.auth.x500.X500Principal;

		import org.apache.log4j.Level;
		import org.apache.log4j.Logger;
		import org.junit.Assert;
		import org.junit.BeforeClass;
		import org.junit.Test;

		import ca.nrc.cadc.ac.Group;
		import ca.nrc.cadc.ac.GroupNotFoundException;
		import ca.nrc.cadc.ac.GroupProperty;
		import ca.nrc.cadc.ac.Role;
		import ca.nrc.cadc.ac.User;
		import ca.nrc.cadc.auth.DNPrincipal;
		import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.util.Log4jInit;
		import org.junit.Assert;

		public class LdapGroupDAOTest extends AbstractLdapDAOTest
		{
		@@ -120,10 +118,10 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
		static X500Principal daoTestPrincipal3;
		static X500Principal unknownPrincipal;

		static User<X500Principal> daoTestUser1;
		static User<X500Principal> daoTestUser2;
		static User<X500Principal> daoTestUser3;
		static User<X500Principal> unknownUser;
		static User daoTestUser1;
		static User daoTestUser2;
		static User daoTestUser3;
		static User unknownUser;

		static Subject daoTestUser1Subject;
		static Subject daoTestUser2Subject;
		@@ -148,31 +146,35 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
		daoDNPrincipal1 = new DNPrincipal(daoTestEntryDN1);
		daoDNPrincipal2 = new DNPrincipal(daoTestEntryDN2);

		daoTestUser1 = new User<X500Principal>(daoTestPrincipal1);
		daoTestUser1 = new User();
		daoTestUser1.getIdentities().add(daoTestPrincipal1);
		daoTestUser1.getIdentities().add(daoDNPrincipal1);
		daoTestUser2 = new User<X500Principal>(daoTestPrincipal2);
		daoTestUser2 = new User();
		daoTestUser2.getIdentities().add(daoTestPrincipal2);
		daoTestUser2.getIdentities().add(daoDNPrincipal2);
		daoTestUser3 = new User<X500Principal>(daoTestPrincipal3);
		daoTestUser3 = new User();
		daoTestUser3.getIdentities().add(daoTestPrincipal3);
		daoTestUser3.getIdentities().add(daoDNPrincipal3);
		unknownUser = new User<X500Principal>(unknownPrincipal);
		unknownUser = new User();
		unknownUser.getIdentities().add(unknownPrincipal);

		daoTestUser1Subject = new Subject();
		daoTestUser1Subject.getPrincipals().add(daoTestUser1.getUserID());
		daoTestUser1Subject.getPrincipals().add(daoTestPrincipal1);
		daoTestUser1Subject.getPrincipals().add(daoDNPrincipal1);

		daoTestUser2Subject = new Subject();
		daoTestUser2Subject.getPrincipals().add(daoTestUser2.getUserID());
		daoTestUser2Subject.getPrincipals().add(daoTestPrincipal2);
		daoTestUser2Subject.getPrincipals().add(daoDNPrincipal2);

		anonSubject = new Subject();
		anonSubject.getPrincipals().add(unknownUser.getUserID());
		anonSubject.getPrincipals().add(unknownPrincipal);
		}

		LdapGroupDAO<X500Principal> getGroupDAO() throws Exception
		LdapGroupDAO getGroupDAO() throws Exception
		{
		LdapConnections connections = new LdapConnections(config);
		return new LdapGroupDAO<X500Principal>(connections,
		new LdapUserDAO<X500Principal>(connections));
		return new LdapGroupDAO(connections,
		new LdapUserDAO(connections));
		}

		String getGroupID()
		@@ -220,8 +222,8 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
		// Principals. The duplicate should be ignored
		// the the returned result should contain only
		// one entry (the dn one)
		User<HttpPrincipal> duplicateIdentity =
		new User<HttpPrincipal>(new HttpPrincipal(daoTestUid2));
		User duplicateIdentity = new User();
		duplicateIdentity.getIdentities().add(new HttpPrincipal(daoTestUid2));
		expectGroup.getUserMembers().add(daoTestUser2);
		expectGroup.getUserMembers().add(duplicateIdentity);
		actualGroup = getGroupDAO().modifyGroup(expectGroup);
		@@ -512,7 +514,7 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
		assertEquals(gr1.getUserMembers(), gr2.getUserMembers());
		assertEquals(gr1.getUserMembers().size(), gr2.getUserMembers()
		.size());
		for (User<?> user : gr1.getUserMembers())
		for (User user : gr1.getUserMembers())
		{
		assertTrue(gr2.getUserMembers().contains(user));
		}
		@@ -527,7 +529,7 @@ public class LdapGroupDAOTest extends AbstractLdapDAOTest
		assertEquals(gr1.getUserAdmins(), gr2.getUserAdmins());
		assertEquals(gr1.getUserAdmins().size(), gr2.getUserAdmins()
		.size());
		for (User<?> user : gr1.getUserAdmins())
		for (User user : gr1.getUserAdmins())
		{
		assertTrue(gr2.getUserAdmins().contains(user));
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class ModifyPasswordServletTest
		final String newPassword = "newPass";
		HttpPrincipal userID = new HttpPrincipal("CADCtest");

		final UserPersistence<?> mockUserPersistence =
		final UserPersistence mockUserPersistence =
		createMock(UserPersistence.class);
		mockUserPersistence.setPassword(userID, oldPassword, newPassword);
		if (hasInternalServerError)

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

+63 −60

Original line number	Diff line number	Diff line
		@@ -68,26 +68,29 @@

		package ca.nrc.cadc.ac.server.web;

		import ca.nrc.cadc.ac.UserAlreadyExistsException;
		import ca.nrc.cadc.ac.UserNotFoundException;
		import ca.nrc.cadc.ac.server.UserPersistence;
		import ca.nrc.cadc.ac.server.ldap.LdapUserDAO;
		import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.util.StringUtil;
		import static org.easymock.EasyMock.createMock;
		import static org.easymock.EasyMock.expect;
		import static org.easymock.EasyMock.expectLastCall;
		import static org.easymock.EasyMock.replay;
		import static org.easymock.EasyMock.verify;

		import org.junit.Test;
		import java.security.PrivilegedExceptionAction;
		import java.util.ArrayList;
		import java.util.List;

		import javax.security.auth.Subject;
		import javax.servlet.ServletException;
		import javax.servlet.http.HttpServletRequest;
		import javax.servlet.http.HttpServletResponse;

		import java.security.Principal;
		import java.security.PrivilegedExceptionAction;
		import java.util.ArrayList;
		import java.util.List;
		import org.junit.Test;

		import static org.easymock.EasyMock.*;
		import ca.nrc.cadc.ac.UserAlreadyExistsException;
		import ca.nrc.cadc.ac.UserNotFoundException;
		import ca.nrc.cadc.ac.server.UserPersistence;
		import ca.nrc.cadc.ac.server.ldap.LdapUserDAO;
		import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.util.StringUtil;


		public class ResetPasswordServletTest
		@@ -155,7 +158,7 @@ public class ResetPasswordServletTest

		public void testPrivilegedSubjectAndEmailAddress(final List<Subject> privSubjects,
		final Subject subject, int responseStatus, final String emailAddress,
		final UserPersistence<Principal> mockUserPersistence) throws Exception
		final UserPersistence mockUserPersistence) throws Exception
		{
		@SuppressWarnings("serial")
		final ResetPasswordServlet testSubject = new ResetPasswordServlet()
		@@ -232,8 +235,8 @@ public class ResetPasswordServletTest
		{
		final Subject subject = new Subject();;
		subject.getPrincipals().add(new HttpPrincipal("CADCtest"));
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		testPrivilegedSubjectAndEmailAddress(null, subject,
		HttpServletResponse.SC_FORBIDDEN, "", mockUserPersistence);
		}
		@@ -243,8 +246,8 @@ public class ResetPasswordServletTest
		{
		final Subject subject = new Subject();;
		subject.getPrincipals().add(new HttpPrincipal("CADCtest"));
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		testPrivilegedSubjectAndEmailAddress(new ArrayList<Subject>(), subject,
		HttpServletResponse.SC_FORBIDDEN, "", mockUserPersistence);
		}
		@@ -256,8 +259,8 @@ public class ResetPasswordServletTest
		subject.getPrincipals().add(new HttpPrincipal("CADCtest"));
		List<Subject> privilegedSubjects = new ArrayList<Subject>();
		privilegedSubjects.add(new Subject());
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		testPrivilegedSubjectAndEmailAddress(privilegedSubjects, subject,
		HttpServletResponse.SC_BAD_REQUEST, "", mockUserPersistence);
		}
		@@ -272,8 +275,8 @@ public class ResetPasswordServletTest
		privilegedSubjects.add(new Subject());
		UserAlreadyExistsException uaee =
		new UserAlreadyExistsException(LdapUserDAO.EMAIL_ADDRESS_CONFLICT_MESSAGE);
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		expect(mockUserPersistence.getUserByEmailAddress(EMAIL_ADDRESS)).andThrow(uaee);
		testPrivilegedSubjectAndEmailAddress(privilegedSubjects, subject,
		HttpServletResponse.SC_CONFLICT, EMAIL_ADDRESS, mockUserPersistence);
		@@ -288,8 +291,8 @@ public class ResetPasswordServletTest
		List<Subject> privilegedSubjects = new ArrayList<Subject>();
		privilegedSubjects.add(new Subject());
		UserNotFoundException unfe = new UserNotFoundException("User with email address ");
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		expect(mockUserPersistence.getUserByEmailAddress(EMAIL_ADDRESS)).andThrow(unfe);
		testPrivilegedSubjectAndEmailAddress(privilegedSubjects, subject,
		HttpServletResponse.SC_NOT_FOUND, EMAIL_ADDRESS, mockUserPersistence);
		@@ -304,8 +307,8 @@ public class ResetPasswordServletTest
		List<Subject> privilegedSubjects = new ArrayList<Subject>();
		privilegedSubjects.add(new Subject());
		RuntimeException rte = new RuntimeException();
		UserPersistence<Principal> mockUserPersistence =
		(UserPersistence<Principal>) createMock(UserPersistence.class);
		UserPersistence mockUserPersistence =
		(UserPersistence) createMock(UserPersistence.class);
		expect(mockUserPersistence.getUserByEmailAddress(EMAIL_ADDRESS)).andThrow(rte);
		testPrivilegedSubjectAndEmailAddress(privilegedSubjects, subject,
		HttpServletResponse.SC_INTERNAL_SERVER_ERROR, EMAIL_ADDRESS, mockUserPersistence);

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -10,7 +10,8 @@ import java.security.AccessControlException;
		import java.util.Collection;
		import java.util.HashSet;

		import ca.nrc.cadc.auth.AuthenticatorImpl;
		import javax.security.auth.Subject;

		import org.easymock.EasyMock;
		import org.junit.Test;

		@@ -18,10 +19,9 @@ import ca.nrc.cadc.ac.Group;
		import ca.nrc.cadc.ac.Role;
		import ca.nrc.cadc.ac.server.GroupDetailSelector;
		import ca.nrc.cadc.ac.server.ldap.LdapGroupPersistence;
		import ca.nrc.cadc.auth.AuthenticatorImpl;
		import ca.nrc.cadc.auth.HttpPrincipal;

		import javax.security.auth.Subject;

		public class UserLoginServletTest
		{
		@Test
		@@ -75,7 +75,7 @@ public class UserLoginServletTest
		// }

		@Override
		protected LdapGroupPersistence<HttpPrincipal> getLdapGroupPersistence()
		protected LdapGroupPersistence getLdapGroupPersistence()
		{
		proxyGroup = "proxyGroup";
		nonImpersonGroup = "niGroup";
		@@ -85,8 +85,8 @@ public class UserLoginServletTest
		niGroups.add(new Group(nonImpersonGroup));
		// mock returns a shell instance
		@SuppressWarnings("unchecked")
		LdapGroupPersistence<HttpPrincipal> mockGp =
		(LdapGroupPersistence<HttpPrincipal>)EasyMock
		LdapGroupPersistence mockGp =
		(LdapGroupPersistence)EasyMock
		.createMock(LdapGroupPersistence.class);
		mockGp.setDetailSelector(new GroupDetailSelector()
		{

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,8 @@ public class AddUserMemberActionTest
		String userID = "foo";
		String userIDType = IdentityType.USERNAME.getValue();
		Principal userPrincipal = AuthenticationUtil.createPrincipal(userID, userIDType);
		User<Principal> user = new User<Principal>(userPrincipal);
		User user = new User();
		user.getIdentities().add(userPrincipal);

		Group group = new Group("group", null);
		group.getUserMembers().add(user);
		@@ -145,7 +146,8 @@ public class AddUserMemberActionTest
		String userID = "foo";
		String userIDType = IdentityType.USERNAME.getValue();
		Principal userPrincipal = AuthenticationUtil.createPrincipal(userID, userIDType);
		User<Principal> user = new User<Principal>(userPrincipal);
		User user = new User();
		user.getIdentities().add(userPrincipal);

		Group group = new Group("group", null);
		Group modified = new Group("group", null);