s1890: added tests for UserRequest servlet and web actions (fac331e5) · Commits · OATS-CADC / ac

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java

+0 −42

Original line number	Diff line number	Diff line
		@@ -68,19 +68,11 @@
		*/
		package ca.nrc.cadc.ac.server.web.userrequests;

		import ca.nrc.cadc.ac.User;
		import ca.nrc.cadc.ac.server.web.WebUtil;
		import ca.nrc.cadc.auth.CookiePrincipal;
		import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.auth.IdentityType;
		import ca.nrc.cadc.auth.NumericPrincipal;
		import ca.nrc.cadc.auth.OpenIdPrincipal;
		import org.apache.log4j.Logger;

		import javax.security.auth.x500.X500Principal;
		import javax.servlet.http.HttpServletRequest;
		import java.io.IOException;
		import java.util.UUID;


		public abstract class UserRequestActionFactory
		@@ -171,38 +163,4 @@ public abstract class UserRequestActionFactory
		};
		}

		private static User getUser(String userName, String idType)
		{
		User user = new User();
		if (idType == null \|\| idType.isEmpty())
		{
		throw new IllegalArgumentException("User endpoint missing idType parameter");
		}
		else if (idType.equalsIgnoreCase(IdentityType.USERNAME.getValue()))
		{
		user.getIdentities().add(new HttpPrincipal(userName));
		}
		else if (idType.equalsIgnoreCase(IdentityType.X500.getValue()))
		{
		user.getIdentities().add(new X500Principal(userName));
		}
		else if (idType.equalsIgnoreCase(IdentityType.CADC.getValue()))
		{
		user.getIdentities().add(new NumericPrincipal(UUID.fromString(userName)));
		}
		else if (idType.equalsIgnoreCase(IdentityType.OPENID.getValue()))
		{
		user.getIdentities().add(new OpenIdPrincipal(userName));
		}
		else if (idType.equalsIgnoreCase(IdentityType.COOKIE.getValue()))
		{
		user.getIdentities().add(new CookiePrincipal(userName));
		}
		else
		{
		throw new IllegalArgumentException("Unregonized userid");
		}
		return user;
		}

		}

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

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		package ca.nrc.cadc.ac.server.web;


		import org.junit.Test;

		import javax.servlet.http.HttpServletRequest;

		import static org.easymock.EasyMock.createMock;
		import static org.easymock.EasyMock.expect;
		import static org.easymock.EasyMock.replay;
		import static org.easymock.EasyMock.verify;
		import static org.junit.Assert.assertEquals;


		public class UserRequestServletTest
		{
		@Test
		public void getAcceptedContentTypeJSON() throws Exception
		{
		final HttpServletRequest mockRequest =
		createMock(HttpServletRequest.class);
		final UserRequestServlet testSubject = new UserRequestServlet();

		expect(mockRequest.getHeader("Accept")).
		andReturn("application/json").once();

		replay(mockRequest);

		assertEquals("Wrong content type.", "application/json",
		testSubject.getAcceptedContentType(mockRequest));

		verify(mockRequest);
		}

		@Test
		public void getAcceptedContentTypeDefault() throws Exception
		{
		final HttpServletRequest mockRequest =
		createMock(HttpServletRequest.class);
		final UserRequestServlet testSubject = new UserRequestServlet();

		expect(mockRequest.getHeader("Accept")).andReturn(null).once();

		replay(mockRequest);

		assertEquals("Wrong content type.", "text/xml",
		testSubject.getAcceptedContentType(mockRequest));

		verify(mockRequest);
		}
		}

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

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		/*
		************************************************************************
		***************** CANADIAN ASTRONOMY DATA CENTRE *****************
		************ CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************
		*
		* (c) 2014. (c) 2014.
		* Government of Canada Gouvernement du Canada
		* National Research Council Conseil national de recherches
		* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
		* All rights reserved Tous droits réservés
		*
		* NRC disclaims any warranties, Le CNRC dénie toute garantie
		* expressed, implied, or énoncée, implicite ou légale,
		* statutory, of any kind with de quelque nature que ce
		* respect to the software, soit, concernant le logiciel,
		* including without limitation y compris sans restriction
		* any warranty of merchantability toute garantie de valeur
		* or fitness for a particular marchande ou de pertinence
		* purpose. NRC shall not be pour un usage particulier.
		* liable in any event for any Le CNRC ne pourra en aucun cas
		* damages, whether direct or être tenu responsable de tout
		* indirect, special or general, dommage, direct ou indirect,
		* consequential or incidental, particulier ou général,
		* arising from the use of the accessoire ou fortuit, résultant
		* software. Neither the name de l'utilisation du logiciel. Ni
		* of the National Research le nom du Conseil National de
		* Council of Canada nor the Recherches du Canada ni les noms
		* names of its contributors may de ses participants ne peuvent
		* be used to endorse or promote être utilisés pour approuver ou
		* products derived from this promouvoir les produits dérivés
		* software without specific prior de ce logiciel sans autorisation
		* written permission. préalable et particulière
		* par écrit.
		*
		* This file is part of the Ce fichier fait partie du projet
		* OpenCADC project. OpenCADC.
		*
		* OpenCADC is free software: OpenCADC est un logiciel libre ;
		* you can redistribute it and/or vous pouvez le redistribuer ou le
		* modify it under the terms of modifier suivant les termes de
		* the GNU Affero General Public la “GNU Affero General Public
		* License as published by the License” telle que publiée
		* Free Software Foundation, par la Free Software Foundation
		* either version 3 of the : soit la version 3 de cette
		* License, or (at your option) licence, soit (à votre gré)
		* any later version. toute version ultérieure.
		*
		* OpenCADC is distributed in the OpenCADC est distribué
		* hope that it will be useful, dans l’espoir qu’il vous
		* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE
		* without even the implied GARANTIE : sans même la garantie
		* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ
		* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF
		* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence
		* General Public License for Générale Publique GNU Affero
		* more details. pour plus de détails.
		*
		* You should have received Vous devriez avoir reçu une
		* a copy of the GNU Affero copie de la Licence Générale
		* General Public License along Publique GNU Affero avec
		* with OpenCADC. If not, see OpenCADC ; si ce n’est
		* <http://www.gnu.org/licenses/>. pas le cas, consultez :
		* <http://www.gnu.org/licenses/>.
		*
		* $Revision: 4 $
		*
		************************************************************************
		*/

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

		import org.junit.Test;

		public class CreateUserRequestActionTest
		{
		@Test
		public void testCreateUser() throws Exception
		{

		}
		}

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

0 → 100644

+294 −0

Original line number	Diff line number	Diff line
		/**
		************************************************************************
		***************** CANADIAN ASTRONOMY DATA CENTRE *****************
		************ CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************
		*
		* (c) 2014. (c) 2014.
		* Government of Canada Gouvernement du Canada
		* National Research Council Conseil national de recherches
		* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
		* All rights reserved Tous droits réservés
		*
		* NRC disclaims any warranties, Le CNRC dénie toute garantie
		* expressed, implied, or énoncée, implicite ou légale,
		* statutory, of any kind with de quelque nature que ce
		* respect to the software, soit, concernant le logiciel,
		* including without limitation y compris sans restriction
		* any warranty of merchantability toute garantie de valeur
		* or fitness for a particular marchande ou de pertinence
		* purpose. NRC shall not be pour un usage particulier.
		* liable in any event for any Le CNRC ne pourra en aucun cas
		* damages, whether direct or être tenu responsable de tout
		* indirect, special or general, dommage, direct ou indirect,
		* consequential or incidental, particulier ou général,
		* arising from the use of the accessoire ou fortuit, résultant
		* software. Neither the name de l'utilisation du logiciel. Ni
		* of the National Research le nom du Conseil National de
		* Council of Canada nor the Recherches du Canada ni les noms
		* names of its contributors may de ses participants ne peuvent
		* be used to endorse or promote être utilisés pour approuver ou
		* products derived from this promouvoir les produits dérivés
		* software without specific prior de ce logiciel sans autorisation
		* written permission. préalable et particulière
		* par écrit.
		*
		* This file is part of the Ce fichier fait partie du projet
		* OpenCADC project. OpenCADC.
		*
		* OpenCADC is free software: OpenCADC est un logiciel libre ;
		* you can redistribute it and/or vous pouvez le redistribuer ou le
		* modify it under the terms of modifier suivant les termes de
		* the GNU Affero General Public la “GNU Affero General Public
		* License as published by the License” telle que publiée
		* Free Software Foundation, par la Free Software Foundation
		* either version 3 of the : soit la version 3 de cette
		* License, or (at your option) licence, soit (à votre gré)
		* any later version. toute version ultérieure.
		*
		* OpenCADC is distributed in the OpenCADC est distribué
		* hope that it will be useful, dans l’espoir qu’il vous
		* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE
		* without even the implied GARANTIE : sans même la garantie
		* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ
		* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF
		* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence
		* General Public License for Générale Publique GNU Affero
		* more details. pour plus de détails.
		*
		* You should have received Vous devriez avoir reçu une
		* a copy of the GNU Affero copie de la Licence Générale
		* General Public License along Publique GNU Affero avec
		* with OpenCADC. If not, see OpenCADC ; si ce n’est
		* <http://www.gnu.org/licenses/>. pas le cas, consultez :
		* <http://www.gnu.org/licenses/>.
		*
		************************************************************************
		*/

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

		import ca.nrc.cadc.ac.server.web.users.AbstractUserAction;
		import ca.nrc.cadc.ac.server.web.users.CreateUserAction;
		import ca.nrc.cadc.ac.server.web.users.DeleteUserAction;
		import ca.nrc.cadc.ac.server.web.users.GetUserAction;
		import ca.nrc.cadc.ac.server.web.users.GetUserListAction;
		import ca.nrc.cadc.ac.server.web.users.ModifyUserAction;
		import ca.nrc.cadc.ac.server.web.users.UserActionFactory;
		import ca.nrc.cadc.util.Log4jInit;
		import org.apache.log4j.Level;
		import org.apache.log4j.Logger;
		import org.easymock.EasyMock;
		import org.junit.Assert;
		import org.junit.Test;

		import javax.servlet.http.HttpServletRequest;


		public class UserRequestActionFactoryTest
		{
		private final static Logger log = Logger.getLogger(UserRequestActionFactoryTest.class);

		public UserRequestActionFactoryTest()
		{
		Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);
		}

		@Test
		public void testCreateUserRequestAction()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.expect(request.getPathInfo()).andReturn("");
		EasyMock.expect(request.getInputStream()).andReturn(null);
		EasyMock.replay(request);
		AbstractUserRequestAction action = UserRequestActionFactory.httpPutFactory().createAction(request);
		EasyMock.verify(request);
		Assert.assertTrue("Wrong action", action instanceof CreateUserRequestAction);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testDeleteUserRequestAction()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.replay(request);
		try
		{
		UserRequestActionFactory.httpDeleteFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (UnsupportedOperationException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testGetUserRequestAction()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.replay(request);
		try
		{
		UserRequestActionFactory.httpGetFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (UnsupportedOperationException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testGetUserRequestNamesAction()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.replay(request);
		try
		{
		UserRequestActionFactory.httpGetFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (UnsupportedOperationException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testModifyUserRequestAction()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.replay(request);
		try
		{
		UserRequestActionFactory.httpPostFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (UnsupportedOperationException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testBadPostRequest()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.expect(request.getPathInfo()).andReturn("");
		EasyMock.replay(request);
		try
		{
		UserActionFactory.httpPostFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (IllegalArgumentException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testBadDeleteRequest()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.expect(request.getPathInfo()).andReturn("");
		EasyMock.replay(request);
		try
		{
		UserActionFactory.httpDeleteFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (IllegalArgumentException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}

		@Test
		public void testBadHeadRequest()
		{
		try
		{
		HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
		EasyMock.replay(request);
		try
		{
		UserActionFactory.httpHeadFactory().createAction(request);
		Assert.fail("Should have been a bad request");
		}
		catch (UnsupportedOperationException e)
		{
		// expected
		}
		EasyMock.verify(request);
		}
		catch (Throwable t)
		{
		log.error(t.getMessage(), t);
		Assert.fail("unexpected error: " + t.getMessage());
		}
		}


		}