From ca27914cdb374068d807d12dc20de69a5b9ced5e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 19 Feb 2011 17:19:47 +0100 Subject: [PATCH] added UserPermissionITCase --- .../sonia/scm/it/AbstractAdminITCaseBase.java | 8 +- .../sonia/scm/it/AuthenticationITCase.java | 12 +- .../test/java/sonia/scm/it/GroupITCase.java | 2 + ...CaseBase.java => IntegrationTestUtil.java} | 58 +-- .../java/sonia/scm/it/RepositoryITCase.java | 2 + .../test/java/sonia/scm/it/UserITCase.java | 32 ++ .../sonia/scm/it/UserPermissionITCase.java | 356 ++++++++++++++++++ 7 files changed, 433 insertions(+), 37 deletions(-) rename scm-webapp/src/test/java/sonia/scm/it/{AbstractITCaseBase.java => IntegrationTestUtil.java} (91%) create mode 100644 scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java index ea2dd07cdf..f8ec4d2d10 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java @@ -38,6 +38,8 @@ package sonia.scm.it; import org.junit.After; import org.junit.Before; +import static sonia.scm.it.IntegrationTestUtil.*; + //~--- JDK imports ------------------------------------------------------------ import com.sun.jersey.api.client.Client; @@ -46,7 +48,7 @@ import com.sun.jersey.api.client.Client; * * @author Sebastian Sdorra */ -public class AbstractAdminITCaseBase extends AbstractITCaseBase +public class AbstractAdminITCaseBase { /** @@ -57,7 +59,7 @@ public class AbstractAdminITCaseBase extends AbstractITCaseBase public void login() { client = createClient(); - adminLogin(client); + authenticateAdmin(client); } /** @@ -67,7 +69,7 @@ public class AbstractAdminITCaseBase extends AbstractITCaseBase @After public void logout() { - logout(client); + logoutClient(client); } //~--- fields --------------------------------------------------------------- diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java index 38834f7e53..00d35eb174 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java @@ -39,6 +39,8 @@ import org.junit.Test; import static org.junit.Assert.*; +import static sonia.scm.it.IntegrationTestUtil.*; + //~--- JDK imports ------------------------------------------------------------ import com.sun.jersey.api.client.Client; @@ -48,7 +50,7 @@ import com.sun.jersey.api.client.ClientResponse; * * @author Sebastian Sdorra */ -public class AuthenticationITCase extends AbstractITCaseBase +public class AuthenticationITCase { /** @@ -61,7 +63,7 @@ public class AuthenticationITCase extends AbstractITCaseBase { Client client = createClient(); - adminLogin(client); + authenticateAdmin(client); } /** @@ -72,7 +74,7 @@ public class AuthenticationITCase extends AbstractITCaseBase public void testLoginFailed() { Client client = createClient(); - ClientResponse response = login(client, "dent", "trillian"); + ClientResponse response = authenticate(client, "dent", "trillian"); assertNotNull(response); assertTrue(response.getStatus() == 401); @@ -88,7 +90,7 @@ public class AuthenticationITCase extends AbstractITCaseBase { Client client = createClient(); - adminLogin(client); - logout(client); + authenticateAdmin(client); + logoutClient(client); } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java index e80eeb78f5..3d95079c89 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java @@ -41,6 +41,8 @@ import sonia.scm.group.Group; import static org.junit.Assert.*; +import static sonia.scm.it.IntegrationTestUtil.*; + //~--- JDK imports ------------------------------------------------------------ import com.sun.jersey.api.client.ClientResponse; diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java similarity index 91% rename from scm-webapp/src/test/java/sonia/scm/it/AbstractITCaseBase.java rename to scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java index d8d88d3bc6..00393ede0c 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AbstractITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java @@ -59,7 +59,7 @@ import javax.ws.rs.core.MultivaluedMap; * * @author Sebastian Sdorra */ -public class AbstractITCaseBase +public class IntegrationTestUtil { /** Field description */ @@ -76,10 +76,33 @@ public class AbstractITCaseBase * * * @param client + * @param username + * @param password + * + * @return */ - protected void adminLogin(Client client) + public static ClientResponse authenticate(Client client, String username, + String password) { - ClientResponse cr = login(client, "scmadmin", "scmadmin"); + WebResource wr = createResource(client, "authentication/login"); + MultivaluedMap formData = new MultivaluedMapImpl(); + + formData.add("username", username); + formData.add("password", password); + + return wr.type("application/x-www-form-urlencoded").post( + ClientResponse.class, formData); + } + + /** + * Method description + * + * + * @param client + */ + public static void authenticateAdmin(Client client) + { + ClientResponse cr = authenticate(client, "scmadmin", "scmadmin"); ScmState state = cr.getEntity(ScmState.class); cr.close(); @@ -104,7 +127,7 @@ public class AbstractITCaseBase * * @return */ - protected Client createClient() + public static Client createClient() { DefaultApacheHttpClientConfig config = new DefaultApacheHttpClientConfig(); @@ -123,7 +146,7 @@ public class AbstractITCaseBase * * @return */ - protected WebResource createResource(Client client, String url) + public static WebResource createResource(Client client, String url) { return client.resource(BASE_URL.concat(url).concat(EXTENSION)); } @@ -133,31 +156,8 @@ public class AbstractITCaseBase * * * @param client - * @param username - * @param password - * - * @return */ - protected ClientResponse login(Client client, String username, - String password) - { - WebResource wr = createResource(client, "authentication/login"); - MultivaluedMap formData = new MultivaluedMapImpl(); - - formData.add("username", username); - formData.add("password", password); - - return wr.type("application/x-www-form-urlencoded").post( - ClientResponse.class, formData); - } - - /** - * Method description - * - * - * @param client - */ - protected void logout(Client client) + public static void logoutClient(Client client) { WebResource wr = createResource(client, "authentication/logout"); ClientResponse response = wr.get(ClientResponse.class); diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java index 4fd07ce73c..c2d883d9d5 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java @@ -48,6 +48,8 @@ import sonia.scm.util.IOUtil; import static org.junit.Assert.*; +import static sonia.scm.it.IntegrationTestUtil.*; + //~--- JDK imports ------------------------------------------------------------ import com.sun.jersey.api.client.ClientResponse; diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java index eb7a8e2263..2d126faa17 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java @@ -37,13 +37,18 @@ package sonia.scm.it; import org.junit.Test; +import sonia.scm.ScmState; +import sonia.scm.Type; import sonia.scm.user.User; import sonia.scm.user.UserTestData; import static org.junit.Assert.*; +import static sonia.scm.it.IntegrationTestUtil.*; + //~--- JDK imports ------------------------------------------------------------ +import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.GenericType; import com.sun.jersey.api.client.WebResource; @@ -163,6 +168,33 @@ public class UserITCase extends AbstractAdminITCaseBase //~--- methods -------------------------------------------------------------- + /** + * Method description + * + * + * @param client + */ + protected void adminLogin(Client client) + { + ClientResponse cr = authenticate(client, "scmadmin", "scmadmin"); + ScmState state = cr.getEntity(ScmState.class); + + cr.close(); + assertNotNull(state); + assertTrue(state.isSuccess()); + + User user = state.getUser(); + + assertNotNull(user); + assertEquals(user.getName(), "scmadmin"); + assertTrue(user.isAdmin()); + + Collection types = state.getRepositoryTypes(); + + assertNotNull(types); + assertFalse(types.isEmpty()); + } + /** * Method description * diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java new file mode 100644 index 0000000000..b71d805ed1 --- /dev/null +++ b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java @@ -0,0 +1,356 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.it; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import sonia.scm.user.User; +import sonia.scm.user.UserTestData; +import sonia.scm.util.Util; + +import static org.junit.Assert.*; + +import static sonia.scm.it.IntegrationTestUtil.*; + +//~--- JDK imports ------------------------------------------------------------ + +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; + +import java.util.ArrayList; +import java.util.Collection; + +/** + * + * @author Sebastian Sdorra + */ +@RunWith(Parameterized.class) +public class UserPermissionITCase +{ + + /** + * Constructs ... + * + * + * + * @param credentials + */ + public UserPermissionITCase(Credentials credentials) + { + this.credentials = credentials; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @Parameters + public static Collection createParameters() + { + Collection params = new ArrayList(); + + params.add(new Credentials[] { new Credentials() }); + + User dent = createTestUser(); + + params.add(new Credentials[] { + new Credentials(dent.getName(), dent.getPassword()) }); + + return params; + } + + /** + * Method description + * + * + * @return + */ + private static User createTestUser() + { + User dent = UserTestData.createDent(); + + dent.setPassword("a.dent124"); + + Client client = createClient(); + + authenticateAdmin(client); + + WebResource wr = createResource(client, "users"); + ClientResponse response = wr.post(ClientResponse.class, dent); + + assertNotNull(response); + assertTrue(response.getStatus() == 201); + response.close(); + logoutClient(client); + client.destroy(); + + return dent; + } + + /** + * Method description + * + */ + @After + public void after() + { + client = createClient(); + logout(); + } + + /** + * Method description + * + */ + @Before + public void before() + { + client = createClient(); + login(); + } + + /** + * Method description + * + */ + @Test + public void create() + { + WebResource wr = createResource(client, "users"); + User zaphod = UserTestData.createZaphod(); + + checkResponse(wr.post(ClientResponse.class, zaphod)); + } + + /** + * Method description + * + */ + @Test + public void delete() + { + WebResource wr = createResource(client, "users/scmadmin"); + + checkResponse(wr.delete(ClientResponse.class)); + } + + /** + * Method description + * + */ + @Test + public void modify() + { + WebResource wr = createResource(client, "users/scmadmin"); + User user = new User("scmadmin", "SCM Administrator", + "scm-admin@scm-manager.org"); + + user.setPassword("hallo123"); + user.setAdmin(true); + user.setType("xml"); + checkResponse(wr.put(ClientResponse.class, user)); + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + */ + @Test + public void get() + { + WebResource wr = createResource(client, "users/scmadmin"); + + checkResponse(wr.get(ClientResponse.class)); + } + + /** + * Method description + * + */ + @Test + public void getAll() + { + WebResource wr = createResource(client, "users"); + + checkResponse(wr.get(ClientResponse.class)); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param response + */ + private void checkResponse(ClientResponse response) + { + assertNotNull(response); + System.out.append("STATUS: ").println(response.getStatus()); + + if (credentials.isAnonymous()) + { + assertTrue(response.getStatus() == 401); + } + else + { + assertTrue(response.getStatus() == 403); + } + + response.close(); + } + + /** + * Method description + * + */ + private void login() + { + if (!credentials.isAnonymous()) + { + authenticate(client, credentials.getUsername(), + credentials.getPassword()); + } + } + + /** + * Method description + * + */ + private void logout() + { + if (!credentials.isAnonymous()) + { + logoutClient(client); + } + } + + //~--- inner classes -------------------------------------------------------- + + /** + * Class description + * + * + * @version Enter version here..., 2011-02-19 + * @author Sebastian Sdorra + */ + public static class Credentials + { + + /** + * Constructs ... + * + */ + public Credentials() {} + + /** + * Constructs ... + * + * + * @param username + * @param password + */ + public Credentials(String username, String password) + { + this.password = password; + this.username = username; + } + + //~--- get methods -------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + public String getPassword() + { + return password; + } + + /** + * Method description + * + * + * @return + */ + public String getUsername() + { + return username; + } + + /** + * Method description + * + * + * @return + */ + public boolean isAnonymous() + { + return Util.isEmpty(username) && Util.isEmpty(password); + } + + //~--- fields ------------------------------------------------------------- + + /** Field description */ + private String password; + + /** Field description */ + private String username; + } + + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + protected Client client; + + /** Field description */ + private Credentials credentials; +}