From f0f57de4b5b73c1785a05a30d9acede969a3f227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 Aug 2018 08:35:55 +0200 Subject: [PATCH 01/19] Remove error prone getByNamespace method This method does not report missing permissions correctly. --- .../java/sonia/scm/repository/RepositoryManager.java | 8 -------- .../sonia/scm/api/v2/resources/RepositoryResource.java | 3 ++- .../api/v2/resources/RepositoryRootResourceTest.java | 10 ++++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java index 493d8f6dbb..172108aa1b 100644 --- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java +++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java @@ -41,7 +41,6 @@ import sonia.scm.TypeManager; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Collection; -import java.util.Optional; //~--- JDK imports ------------------------------------------------------------ @@ -135,11 +134,4 @@ public interface RepositoryManager */ @Override public RepositoryHandler getHandler(String type); - - default Optional getByNamespace(String namespace, String name) { - return getAll() - .stream() - .filter(r -> r.getName().equals(name) && r.getNamespace().equals(namespace)) - .findFirst(); - } } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java index 255f08f295..2c227f78f2 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java @@ -3,6 +3,7 @@ package sonia.scm.api.v2.resources; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.rs.TypeHint; +import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; import sonia.scm.repository.RepositoryIsNotArchivedException; @@ -164,7 +165,7 @@ public class RepositoryResource { } private Supplier> loadBy(String namespace, String name) { - return () -> manager.getByNamespace(namespace, name); + return () -> Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name))); } private Predicate nameAndNamespaceStaysTheSame(String namespace, String name) { diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java index f0e875e650..888d4d6f25 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import sonia.scm.PageResult; +import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; import sonia.scm.repository.RepositoryIsNotArchivedException; @@ -26,8 +27,6 @@ import java.net.URISyntaxException; import java.net.URL; import static java.util.Collections.singletonList; -import static java.util.Optional.empty; -import static java.util.Optional.of; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; @@ -37,7 +36,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; @@ -80,7 +78,7 @@ public class RepositoryRootResourceTest { @Test public void shouldFailForNotExistingRepository() throws URISyntaxException { - when(repositoryManager.getByNamespace(anyString(), anyString())).thenReturn(empty()); + when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(null); mockRepository("space", "repo"); MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/other"); @@ -135,7 +133,7 @@ public class RepositoryRootResourceTest { public void shouldHandleUpdateForNotExistingRepository() throws URISyntaxException, IOException { URL url = Resources.getResource("sonia/scm/api/v2/repository-test-update.json"); byte[] repository = Resources.toByteArray(url); - when(repositoryManager.getByNamespace(anyString(), anyString())).thenReturn(empty()); + when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(null); MockHttpRequest request = MockHttpRequest .put("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo") @@ -247,7 +245,7 @@ public class RepositoryRootResourceTest { repository.setName(name); String id = namespace + "-" + name; repository.setId(id); - when(repositoryManager.getByNamespace(namespace, name)).thenReturn(of(repository)); + when(repositoryManager.get(new NamespaceAndName(namespace, name))).thenReturn(repository); when(repositoryManager.get(id)).thenReturn(repository); return repository; } From ebe3ef8c3ec8f0b292c761b5c9ad854bd062393b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 Aug 2018 08:40:01 +0200 Subject: [PATCH 02/19] Remove unused exception constructors --- .../RepositoryIsNotArchivedException.java | 46 ++----------------- .../repository/DefaultRepositoryManager.java | 2 +- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java index 775e4714d8..3742512622 100644 --- a/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java +++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryIsNotArchivedException.java @@ -38,51 +38,11 @@ package sonia.scm.repository; * * @since 1.14 */ -public class RepositoryIsNotArchivedException extends RepositoryException -{ +public class RepositoryIsNotArchivedException extends RepositoryException { - /** Field description */ private static final long serialVersionUID = 7728748133123987511L; - //~--- constructors --------------------------------------------------------- - - /** - * Constructs ... - * - */ - public RepositoryIsNotArchivedException() {} - - /** - * Constructs ... - * - * - * @param message - */ - public RepositoryIsNotArchivedException(String message) - { - super(message); - } - - /** - * Constructs ... - * - * - * @param cause - */ - public RepositoryIsNotArchivedException(Throwable cause) - { - super(cause); - } - - /** - * Constructs ... - * - * - * @param message - * @param cause - */ - public RepositoryIsNotArchivedException(String message, Throwable cause) - { - super(message, cause); + public RepositoryIsNotArchivedException() { + super("Repository could not be deleted, because it is not archived."); } } diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java index 69e969f9cb..e380979d3c 100644 --- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java +++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java @@ -172,7 +172,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager { private void preDelete(Repository toDelete) throws RepositoryException { if (configuration.isEnableRepositoryArchive() && !toDelete.isArchived()) { - throw new RepositoryIsNotArchivedException("Repository could not deleted, because it is not archived."); + throw new RepositoryIsNotArchivedException(); } fireEvent(HandlerEventType.BEFORE_DELETE, toDelete); getHandler(toDelete).delete(toDelete); From fd873877c44cd3ed1a88a3e401b468133338383d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 Aug 2018 09:28:54 +0200 Subject: [PATCH 03/19] Fix old integration tests for migration period --- .../sonia/scm/it/AbstractAdminITCaseBase.java | 31 +- .../scm/it/AbstractPermissionITCaseBase.java | 122 ++----- .../sonia/scm/it/AdminPermissionITCase.java | 308 ------------------ .../sonia/scm/it/AnonymousAccessITCase.java | 285 ---------------- .../sonia/scm/it/AuthenticationITCase.java | 96 ------ .../scm/it/AuthorizationScopeITCase.java | 131 -------- .../sonia/scm/it/ChangesetViewerITCase.java | 296 ----------------- .../scm/it/CreateRepositoriesITCase.java | 191 ----------- .../sonia/scm/it/DeactivatedUserITCase.java | 137 -------- .../test/java/sonia/scm/it/GitLfsITCase.java | 210 ++++++------ .../it/GitRepositoryPathMatcherITCase.java | 75 +++-- .../test/java/sonia/scm/it/GroupITCase.java | 265 --------------- .../sonia/scm/it/GroupPermissionITCase.java | 185 ----------- .../sonia/scm/it/HttpCacheITCaseBase.java | 31 +- .../sonia/scm/it/IntegrationTestUtil.java | 150 +++------ .../sonia/scm/it/RepositoryArchiveITCase.java | 68 ++-- .../scm/it/RepositoryExtendedITCase.java | 25 +- .../sonia/scm/it/RepositoryHookITCase.java | 61 ++-- .../scm/it/RepositoryHttpCacheITCase.java | 26 +- .../java/sonia/scm/it/RepositoryITCase.java | 259 --------------- .../sonia/scm/it/RepositoryITCaseBase.java | 192 ++++------- .../java/sonia/scm/it/RepositoryITUtil.java | 133 +++----- .../it/RepositorySimplePermissionITCase.java | 97 +++--- .../scm/it/RepositoryTypeITCaseBase.java | 36 +- .../src/test/java/sonia/scm/it/ScmClient.java | 37 +++ .../test/java/sonia/scm/it/UserITCase.java | 297 ----------------- .../test/java/sonia/scm/it/UserITUtil.java | 13 + .../sonia/scm/it/UserPermissionITCase.java | 40 ++- .../src/test/resources/repository-git.json | 7 + .../src/test/resources/repository-hg.json | 7 + .../src/test/resources/repository-svn.json | 7 + 31 files changed, 600 insertions(+), 3218 deletions(-) delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java create mode 100644 scm-webapp/src/test/java/sonia/scm/it/ScmClient.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/UserITCase.java create mode 100644 scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java create mode 100644 scm-webapp/src/test/resources/repository-git.json create mode 100644 scm-webapp/src/test/resources/repository-hg.json create mode 100644 scm-webapp/src/test/resources/repository-svn.json 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 f8ec4d2d10..45a24585e3 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractAdminITCaseBase.java @@ -35,45 +35,22 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- -import org.junit.After; -import org.junit.Before; - -import static sonia.scm.it.IntegrationTestUtil.*; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; //~--- JDK imports ------------------------------------------------------------ -import com.sun.jersey.api.client.Client; - /** * * @author Sebastian Sdorra */ public class AbstractAdminITCaseBase { - - /** - * Method description - * - */ - @Before - public void login() - { - client = createClient(); - authenticateAdmin(client); - } - - /** - * Method description - * - */ - @After - public void logout() - { - logoutClient(client); + public AbstractAdminITCaseBase() { + client = createAdminClient(); } //~--- fields --------------------------------------------------------------- /** Field description */ - protected Client client; + protected final ScmClient client; } diff --git a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java index cd655c78b5..d72f952876 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java @@ -35,29 +35,26 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- -import org.junit.After; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runners.Parameterized.Parameters; - import sonia.scm.user.User; import sonia.scm.user.UserTestData; -import static org.junit.Assert.*; +import java.util.Collection; -import static sonia.scm.it.IntegrationTestUtil.*; +import static java.util.Arrays.asList; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.post; //~--- 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 @@ -77,26 +74,24 @@ public abstract class AbstractPermissionITCaseBase public AbstractPermissionITCaseBase(Credentials credentials) { this.credentials = credentials; + this.client = credentials.isAnonymous()? ScmClient.anonymous(): new ScmClient(credentials.getUsername(), credentials.getPassword()); } - //~--- methods -------------------------------------------------------------- + //~--- methods -------------------------------------------------------------- /** * Method description * * * @return */ - @Parameters - public static Collection createParameters() + @Parameters(name = "{1}") + public static Collection createParameters() { - Collection params = new ArrayList<>(); - - params.add(new Credentials[] { new Credentials() }); - params.add(new Credentials[] { - new Credentials("trillian", "a.trillian124") }); - - return params; + return asList( + new Object[] {new Credentials(), "anonymous"}, + new Object[] {new Credentials("trillian", "a.trillian124"), "trillian" } + ); } /** @@ -111,18 +106,13 @@ public abstract class AbstractPermissionITCaseBase trillian.setPassword("a.trillian124"); - Client client = createClient(); + ScmClient client = createAdminClient(); - authenticateAdmin(client); - - WebResource wr = createResource(client, "users"); - ClientResponse response = wr.post(ClientResponse.class, trillian); + ClientResponse response = UserITUtil.postUser(client, trillian); assertNotNull(response); assertEquals(201, response.getStatus()); response.close(); - logoutClient(client); - client.destroy(); } /** @@ -132,15 +122,12 @@ public abstract class AbstractPermissionITCaseBase @AfterClass public static void removeTestUser() { - Client client = createClient(); - - authenticateAdmin(client); + ScmClient client = createAdminClient(); createResource(client, "users/trillian").delete(); - client.destroy(); } - //~--- get methods ---------------------------------------------------------- + //~--- get methods ---------------------------------------------------------- /** * Method description * @@ -189,30 +176,10 @@ public abstract class AbstractPermissionITCaseBase */ protected abstract String getModifyPath(); + protected abstract String getMediaType(); + //~--- methods -------------------------------------------------------------- - /** - * Method description - * - */ - @After - public void after() - { - client = createClient(); - logout(); - } - - /** - * Method description - * - */ - @Before - public void before() - { - client = createClient(); - login(); - } - /** * Method description * @@ -220,9 +187,7 @@ public abstract class AbstractPermissionITCaseBase @Test public void create() { - WebResource wr = createResource(client, getBasePath()); - - checkResponse(wr.post(ClientResponse.class, getCreateItem())); + checkResponse(post(client, getBasePath(), getMediaType(), getCreateItem())); } /** @@ -232,7 +197,7 @@ public abstract class AbstractPermissionITCaseBase @Test public void delete() { - WebResource wr = createResource(client, getDeletePath()); + WebResource.Builder wr = createResource(client, getDeletePath()); checkResponse(wr.delete(ClientResponse.class)); } @@ -244,9 +209,9 @@ public abstract class AbstractPermissionITCaseBase @Test public void modify() { - WebResource wr = createResource(client, getModifyPath()); + WebResource.Builder wr = createResource(client, getModifyPath()); - checkResponse(wr.put(ClientResponse.class, getModifyItem())); + checkResponse(wr.type(getMediaType()).put(ClientResponse.class, getModifyItem())); } //~--- get methods ---------------------------------------------------------- @@ -258,7 +223,7 @@ public abstract class AbstractPermissionITCaseBase @Test public void get() { - WebResource wr = createResource(client, getGetPath()); + WebResource.Builder wr = createResource(client, getGetPath()); checkGetResponse(wr.get(ClientResponse.class)); } @@ -270,7 +235,7 @@ public abstract class AbstractPermissionITCaseBase @Test public void getAll() { - WebResource wr = createResource(client, getBasePath()); + WebResource.Builder wr = createResource(client, getBasePath()); checkGetAllResponse(wr.get(ClientResponse.class)); } @@ -321,36 +286,9 @@ public abstract class AbstractPermissionITCaseBase 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); - } - } - //~--- fields --------------------------------------------------------------- - /** Field description */ - protected Client client; + protected ScmClient client; - /** Field description */ protected Credentials credentials; } diff --git a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java deleted file mode 100644 index ae6c9aabd1..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java +++ /dev/null @@ -1,308 +0,0 @@ -/** - * 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.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.group.Group; -import sonia.scm.user.User; -import sonia.scm.user.UserTestData; -import sonia.scm.util.IOUtil; - -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 java.util.ArrayList; -import java.util.Collection; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class AdminPermissionITCase -{ - - /** - * Constructs ... - * - * - * @param credentials - */ - public AdminPermissionITCase(Credentials credentials) - { - this.credentials = credentials; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - */ - @AfterClass - public static void cleanup() - { - Client client = createAdminClient(); - - createResource(client, "users/marvin").delete(); - createResource(client, "groups/test-group").delete(); - client.destroy(); - } - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - Collection params = new ArrayList<>(); - - // params.add(new Object[] { new Credentials() }); - - User u = UserTestData.createMarvin(); - - u.setPassword("secret"); - - Client client = createAdminClient(); - - createResource(client, "users").post(u); - client.destroy(); - params.add(new Object[] { new Credentials(u.getName(), u.getPassword()) }); - - return params; - } - - /** - * Method description - * - */ - @BeforeClass - public static void setup() - { - Group group = new Group("xml", "test-group"); - Client client = createAdminClient(); - - createResource(client, "groups").post(group); - client.destroy(); - } - - /** - * Method description - * - */ - @Before - public void login() - { - client = createClient(); - - if (!credentials.isAnonymous()) - { - authenticate(client, credentials.getUsername(), - credentials.getPassword()); - } - } - - /** - * Method description - * - */ - @After - public void logout() - { - if (!credentials.isAnonymous()) - { - logoutClient(client); - } - } - - /** - * Method description - * - */ - @Test - public void testConfig() - { - checkResponse(createResource(client, "config").get(ClientResponse.class)); - checkResponse(createResource(client, "config").post(ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testGitConfig() - { - checkResponse( - createResource(client, "config/repositories/git").get( - ClientResponse.class)); - checkResponse( - createResource(client, "config/repositories/git").post( - ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testGroups() - { - checkResponse(createResource(client, "groups").get(ClientResponse.class)); - checkResponse(createResource(client, "groups").post(ClientResponse.class)); - checkResponse( - createResource(client, "groups/test-group").get(ClientResponse.class)); - checkResponse( - createResource(client, "groups/test-group").put(ClientResponse.class)); - checkResponse( - createResource(client, "groups/test-group").delete( - ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testHgConfig() - { - checkResponse( - createResource(client, "config/repositories/hg").get( - ClientResponse.class)); - checkResponse( - createResource(client, "config/repositories/hg").post( - ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testPlugins() - { - checkResponse(createResource(client, "plugins").get(ClientResponse.class)); - checkResponse(createResource(client, - "plugins/overview").get(ClientResponse.class)); - checkResponse( - createResource(client, "plugins/installed").get(ClientResponse.class)); - checkResponse(createResource(client, - "plugins/updates").get(ClientResponse.class)); - checkResponse( - createResource(client, "plugins/available").get(ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testSvnConfig() - { - checkResponse( - createResource(client, "config/repositories/svn").get( - ClientResponse.class)); - checkResponse( - createResource(client, "config/repositories/svn").post( - ClientResponse.class)); - } - - /** - * Method description - * - */ - @Test - public void testUsers() - { - checkResponse(createResource(client, "users").get(ClientResponse.class)); - checkResponse(createResource(client, "users").post(ClientResponse.class)); - checkResponse(createResource(client, - "users/scmadmin").get(ClientResponse.class)); - checkResponse(createResource(client, - "users/scmadmin").put(ClientResponse.class)); - checkResponse( - createResource(client, "users/scmadmin").delete(ClientResponse.class)); - } - - /** - * Method description - * - * - * @param response - */ - private void checkResponse(ClientResponse response) - { - assertNotNull(response); - - if (credentials.isAnonymous()) - { - assertEquals(401, response.getStatus()); - } - else - { - assertEquals(403, response.getStatus()); - } - - // fix jersey-client bug - IOUtil.close(response.getEntityInputStream()); - response.close(); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private Client client; - - /** Field description */ - private Credentials credentials; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java deleted file mode 100644 index c60b46460b..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/AnonymousAccessITCase.java +++ /dev/null @@ -1,285 +0,0 @@ -/** - * 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.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.config.ScmConfiguration; -import sonia.scm.repository.Permission; -import sonia.scm.repository.PermissionType; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; - -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- 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.io.File; -import java.io.IOException; -import java.util.Arrays; - -import java.util.Collection; -import org.junit.Ignore; - -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientFactory; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class AnonymousAccessITCase -{ - - /** Field description */ - private static final Permission PERMISSION_ANONYMOUS_WRITE = - new Permission("anonymous", PermissionType.WRITE); - - //~--- constructors --------------------------------------------------------- - - /** - * Constructs ... - * - * - * @param repositoryType - */ - public AnonymousAccessITCase(String repositoryType) - { - this.repositoryType = repositoryType; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - return createRepositoryTypeParameters(); - } - - /** - * Method description - * - */ - @AfterClass - public static void unsetAnonymousAccess() - { - toggleAnonymousAccess(false); - } - - //~--- set methods ---------------------------------------------------------- - - /** - * Method description - * - */ - @BeforeClass - public static void setAnonymousAccess() - { - toggleAnonymousAccess(true); - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @param anonymousAccess - */ - private static void toggleAnonymousAccess(boolean anonymousAccess) - { - Client client = createAdminClient(); - WebResource resource = createResource(client, "config"); - ScmConfiguration config = resource.get(ScmConfiguration.class); - - assertNotNull(config); - config.setAnonymousAccessEnabled(anonymousAccess); - - ClientResponse response = resource.post(ClientResponse.class, config); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - logoutClient(client); - } - - /** - * Method description - * - */ - @Before - public void createTestRepository() - { - Client client = createAdminClient(); - - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository.setPublicReadable(true); - repository = createRepository(client, repository); - logoutClient(client); - } - - /** - * Method description - * - */ - @After - public void removeTestRepository() - { - Client client = createAdminClient(); - - deleteRepository(client, repository.getId()); - logoutClient(client); - } - - /** - * Method description - * - * @throws IOException - */ - @Test - @Ignore - public void testAllowedAnonymousPush() throws IOException - { - Client client = createAdminClient(); - WebResource resource = createResource(client, - "repository/".concat(repository.getId())); - - repository.setPermissions(Arrays.asList(PERMISSION_ANONYMOUS_WRITE)); - resource.post(ClientResponse.class, repository); - - RepositoryClient repositoryClient = createAnonymousRepositoryClient(); - - createRandomFile(repositoryClient); - commit(repositoryClient, "added test files"); - } - - /** - * Method description - * - * TODO fix test case - * - * @throws IOException - */ - @Test @Ignore - public void testAnonymousClone() throws IOException - { - testSimpleAdminPush(); - - RepositoryClient client = createAnonymousRepositoryClient(); - - // client.checkout(); - } - - /** - * Method description - * - * @throws IOException - */ - @Ignore - @Test(expected = IOException.class) - public void testDeniedAnonymousPush() throws IOException - { - RepositoryClient repositoryClient = createAnonymousRepositoryClient(); - - createRandomFile(repositoryClient); - commit(repositoryClient, "added anonymous test file"); - } - - /** - * Method description - * - * - * @throws IOException - */ - @Test - public void testSimpleAdminPush() throws IOException - { - RepositoryClient repositoryClient = createAdminRepositoryClient(); - - createRandomFile(repositoryClient); - commit(repositoryClient, "added random file"); - } - - private RepositoryClient createAdminRepositoryClient() throws IOException { - return createRepositoryClient(ADMIN_USERNAME, ADMIN_PASSWORD); - } - - private RepositoryClient createAnonymousRepositoryClient() throws IOException { - return createRepositoryClient(null, null); - } - - private RepositoryClient createRepositoryClient(String username, String password) throws IOException { - File directory = temporaryFolder.newFolder(); - String remoteUrl = repository.createUrl(BASE_URL); - - RepositoryClientFactory factory = new RepositoryClientFactory(); - return factory.create(repositoryType, remoteUrl, username, password, directory); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - - /** Field description */ - private Repository repository; - - /** Field description */ - private final String repositoryType; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java deleted file mode 100644 index eb5d999592..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * 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.Test; - -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; - -/** - * - * @author Sebastian Sdorra - */ -public class AuthenticationITCase -{ - - /** - * Method description - * - * - */ - @Test - public void testLogin() - { - Client client = createClient(); - - authenticateAdmin(client); - } - - /** - * Method description - * - */ - @Test - public void testLoginFailed() - { - Client client = createClient(); - ClientResponse response = authenticate(client, "dent", "trillian"); - - assertNotNull(response); - assertEquals(401, response.getStatus()); - response.close(); - } - - /** - * Method description - * - */ - @Test - public void testLogout() - { - Client client = createClient(); - - authenticateAdmin(client); - logoutClient(client); - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java deleted file mode 100644 index d7b06d93b3..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/AuthorizationScopeITCase.java +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Copyright (c) 2014, 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; - -import com.google.common.base.Strings; -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; -import com.sun.jersey.core.util.MultivaluedMapImpl; -import java.util.List; -import javax.ws.rs.core.MultivaluedMap; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import sonia.scm.ScmState; -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; -import static sonia.scm.it.RepositoryITUtil.createRepository; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; - -/** - * Integration test for authorization with scope. - * - * @author Sebastian Sdorra - */ -public class AuthorizationScopeITCase { - - private Repository heartOfGold; - private Repository puzzle42; - - /** - * Create test repositories. - */ - @Before - public void createTestRepositories(){ - Client adminClient = createAdminClient(); - this.heartOfGold = createRepository(adminClient, RepositoryTestData.createHeartOfGold("git")); - this.puzzle42 = createRepository(adminClient, RepositoryTestData.create42Puzzle("git")); - } - - /** - * Delete test repositories. - */ - @After - public void deleteTestRepositories(){ - Client adminClient = createAdminClient(); - deleteRepository(adminClient, heartOfGold.getId()); - deleteRepository(adminClient, puzzle42.getId()); - } - - /** - * Read all available repositories without scope. - */ - @Test - public void testAuthenticateWithoutScope() { - Assert.assertEquals(2, getRepositories(createAuthenticationToken()).size()); - } - - /** - * Read all available repositories with a scope for only one of them. - */ - @Test - public void testAuthenticateWithScope() { - String scope = "repository:read:".concat(heartOfGold.getId()); - Assert.assertEquals(1, getRepositories(createAuthenticationToken(scope)).size()); - } - - private List getRepositories(String token) { - Client client = createClient(); - WebResource wr = client.resource(createResourceUrl("repositories")); - return wr.header("Authorization", "Bearer ".concat(token)).get(new GenericType>(){}); - } - - private String createAuthenticationToken() { - return createAuthenticationToken(""); - } - - private String createAuthenticationToken(String scope) { - Client client = createClient(); - String url = createResourceUrl("auth/access_token"); - - WebResource wr = client.resource(url); - MultivaluedMap formData = new MultivaluedMapImpl(); - - formData.add("username", ADMIN_USERNAME); - formData.add("password", ADMIN_PASSWORD); - formData.add("grant_type", "password"); - if (!Strings.isNullOrEmpty(scope)) { - formData.add("scope", scope); - } - - ClientResponse response = wr.type("application/x-www-form-urlencoded").post(ClientResponse.class, formData); - if (response.getStatus() >= 300 ){ - Assert.fail("authentication failed with status code " + response.getStatus()); - } - - return response.getEntity(ScmState.class).getToken(); - } - -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java b/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java deleted file mode 100644 index 816f86fe52..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java +++ /dev/null @@ -1,296 +0,0 @@ -/** - * 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.repository.Changeset; -import sonia.scm.repository.ChangesetPagingResult; -import sonia.scm.repository.Modifications; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; - -import sonia.scm.util.IOUtil; - -import static org.hamcrest.Matchers.*; - -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; - -import java.util.Collection; -import java.util.List; -import java.util.Random; - -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientFactory; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class ChangesetViewerITCase extends AbstractAdminITCaseBase -{ - - /** - * Constructs ... - * - * - * @param repositoryType - */ - public ChangesetViewerITCase(String repositoryType) - { - this.repositoryType = repositoryType; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - return createRepositoryTypeParameters(); - } - - /** - * Method description - * - * - * @throws IOException - * @throws InterruptedException - */ - @Test - public void cachingTest() throws IOException, InterruptedException - { - RepositoryClient rc = createRepositoryClient(); - - // rc.checkout(); - addTestFile(rc, "a", 1, false); - addTestFile(rc, "b", 2, true); - } - - /** - * Method description - * - * - * @throws IOException - */ - @After - public void cleanup() throws IOException - { - IOUtil.delete(localDirectory, true); - deleteRepository(client, repository.getId()); - } - - /** - * Method description - * - * - * @throws IOException - */ - @Before - public void setup() throws IOException - { - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository = createRepository(client, repository); - localDirectory = File.createTempFile("scm-", ".unittest"); - IOUtil.delete(localDirectory); - IOUtil.mkdirs(localDirectory); - } - - /** - * Method description - * - * - * @throws IOException - * @throws InterruptedException - */ - @Test - public void simpleTest() throws IOException, InterruptedException - { - RepositoryClient rc = createRepositoryClient(); - - // rc.init(); - addTestFile(rc, "a", 1, false); - } - - /** - * Method description - * - * - * @param rc - * @param name - * @param count - * @param sleep - * - * @throws IOException - * @throws InterruptedException - * @throws RepositoryClientException - */ - private void addTestFile(RepositoryClient rc, String name, int count, - boolean sleep) - throws IOException, InterruptedException - { - File file = new File(localDirectory, name.concat(".txt")); - - writeRandomContent(file); - rc.getAddCommand().add(name.concat(".txt")); - IntegrationTestUtil.commit(rc, "added-".concat(name).concat(".txt")); - - if (sleep) { - // cache clear is async - Thread.sleep(500l); - } - - ChangesetPagingResult cpr = getChangesets(repository); - - if ("svn".equals(repositoryType)) { - assertEquals((count + 1), cpr.getTotal()); - } else { - assertEquals(count, cpr.getTotal()); - } - - List changesets = cpr.getChangesets(); - - assertNotNull(changesets); - - if ("svn".equals(repositoryType)) { - assertEquals((count + 1), changesets.size()); - } else { - assertEquals(count, changesets.size()); - } - - Changeset c = changesets.get(0); - - assertNotNull(c); - assertEquals("added-".concat(name).concat(".txt"), c.getDescription()); - assertTrue(c.isValid()); - - Modifications m = c.getModifications(); - - assertNotNull(m); - - List added = m.getAdded(); - - assertNotNull(added); - assertFalse(added.isEmpty()); - assertEquals(1, added.size()); - //J- - assertThat( - added.get(0), - anyOf( - equalTo(name.concat(".txt")), - equalTo("/".concat(name).concat(".txt")) - ) - ); - //J+ - } - - private RepositoryClient createRepositoryClient() throws IOException { - RepositoryClientFactory factory = new RepositoryClientFactory(); - return factory.create( - repositoryType, repository.createUrl(BASE_URL), - IntegrationTestUtil.ADMIN_USERNAME, IntegrationTestUtil.ADMIN_PASSWORD, - localDirectory - ); - } - - private void writeRandomContent(File file) throws IOException { - Random random = new Random(); - byte[] data = new byte[random.nextInt(1024)]; - - try (FileOutputStream output = new FileOutputStream(file)) { - random.nextBytes(data); - output.write(data); - } - } - - //~--- get methods ---------------------------------------------------------- - - private String getChangesetViewerUri(Repository repository) { - return "repositories/".concat(repository.getId()).concat("/changesets"); - } - - private ChangesetPagingResult getChangesets(Repository repository) { - WebResource resource = createResource(client, - getChangesetViewerUri(repository)); - - assertNotNull(resource); - - ClientResponse response = resource.get(ClientResponse.class); - - assertNotNull(response); - assertEquals(200, response.getStatus()); - - ChangesetPagingResult cpr = response.getEntity(ChangesetPagingResult.class); - - assertNotNull(cpr); - - return cpr; - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private File localDirectory; - - /** Field description */ - private Repository repository; - - /** Field description */ - private final String repositoryType; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java deleted file mode 100644 index 3d240c96f5..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/CreateRepositoriesITCase.java +++ /dev/null @@ -1,191 +0,0 @@ -/** - * 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.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; -import sonia.scm.util.IOUtil; - -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - -import java.io.IOException; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class CreateRepositoriesITCase extends AbstractAdminITCaseBase -{ - - /** - * Constructs ... - * - * - * @param repositoryType - */ - public CreateRepositoriesITCase(String repositoryType) - { - this.repositoryType = repositoryType; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - Collection params = new ArrayList<>(); - - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); - - if (IOUtil.search("hg") != null) - { - params.add(new String[] { "hg" }); - } - - return params; - } - - /** - * Method description - * - * - * @throws IOException - */ - @After - public void cleanup() throws IOException - { - deleteRepository(client, repository.getId()); - } - - /** - * Method description - * - */ - @Test - public void testCreate() - { - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository = createRepository(client, repository); - } - - /** - * Method description - * - */ - @Test - public void testCreateAllreadyExists() - { - repository = RepositoryTestData.create42Puzzle(repositoryType); - repository = createRepository(client, repository); - - WebResource wr = createResource(client, "repositories"); - ClientResponse response = - wr.post(ClientResponse.class, - RepositoryTestData.create42Puzzle(repositoryType)); - - assertNotNull(response); - assertEquals(500, response.getStatus()); - response.close(); - } - - /** - * Method description - * - */ - @Test - public void testCreateAllreadyExistsWithStructure() - { - repository = RepositoryTestData.create42Puzzle(repositoryType); - repository = createRepository(client, repository); - - Repository r = RepositoryTestData.create42Puzzle(repositoryType); - - r.setName(r.getName() + "/" + r.getName()); - - WebResource wr = createResource(client, "repositories"); - ClientResponse response = wr.post(ClientResponse.class, r); - - assertNotNull(response); - System.out.println( response.getStatus() ); - assertEquals(500, response.getStatus()); - response.close(); - } - - /** - * Method description - * - */ - @Test - public void testCreateWithStructure() - { - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository.setName("test/".concat(repository.getName())); - repository = createRepository(client, repository); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private Repository repository; - - /** Field description */ - private String repositoryType; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java deleted file mode 100644 index 5d30115fbb..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/DeactivatedUserITCase.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * 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 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.WebResource; -import javax.servlet.http.HttpServletResponse; - -import javax.ws.rs.core.MediaType; - -/** - * - * @author Sebastian Sdorra - */ -public class DeactivatedUserITCase -{ - - /** - * Method description - * - */ - @Before - public void createDeactivatedUser() - { - Client client = createAdminClient(); - - try - { - WebResource wr = createResource(client, "users"); - - slarti = UserTestData.createSlarti(); - slarti.setPassword("slart123"); - slarti.setActive(false); - - ClientResponse response = - wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, slarti); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - response.close(); - } - finally - { - client.destroy(); - } - } - - /** - * Method description - * - */ - @After - public void destroyDeactivatedUser() - { - Client client = createAdminClient(); - - try - { - WebResource wr = createResource(client, - "users/".concat(slarti.getName())); - ClientResponse response = - wr.type(MediaType.APPLICATION_XML).delete(ClientResponse.class); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - } - finally - { - client.destroy(); - } - } - - /** - * Method description - * - */ - @Test - public void testFailedAuthentication() - { - Client client = createClient(); - ClientResponse response = authenticate(client, slarti.getName(), "slart123"); - assertNotNull(response); - assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus()); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private User slarti; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java index 33e020f85d..2452afb909 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java @@ -36,251 +36,259 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import com.google.common.base.Charsets; -import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.UniformInterfaceException; -import java.io.IOException; -import java.util.UUID; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; import org.apache.shiro.crypto.hash.Sha256Hash; import org.hamcrest.Matchers; import org.junit.After; -import org.junit.Test; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; -import org.junit.rules.TemporaryFolder; -import static org.junit.Assert.*; +import org.junit.Test; import org.junit.rules.ExpectedException; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; -import sonia.scm.repository.Permission; +import org.junit.rules.TemporaryFolder; +import sonia.scm.api.rest.ObjectMapperProvider; +import sonia.scm.api.v2.resources.RepositoryDto; import sonia.scm.repository.PermissionType; import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; import sonia.scm.user.User; import sonia.scm.user.UserTestData; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import java.io.IOException; +import java.util.UUID; + +import static org.junit.Assert.assertArrayEquals; +import static sonia.scm.it.IntegrationTestUtil.BASE_URL; +import static sonia.scm.it.IntegrationTestUtil.REST_BASE_URL; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.readJson; +import static sonia.scm.it.RepositoryITUtil.createRepository; +import static sonia.scm.it.RepositoryITUtil.deleteRepository; + /** * Integration tests for git lfs. - * + * * @author Sebastian Sdorra */ public class GitLfsITCase { - + @Rule public ExpectedException expectedException = ExpectedException.none(); - + @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); - + private final ObjectMapper mapper = new ObjectMapper(); - private Client adminClient; - - private Repository repository; - + private ScmClient adminClient; + + private RepositoryDto repository; + public GitLfsITCase() { mapper.setAnnotationIntrospector(new JaxbAnnotationIntrospector(TypeFactory.defaultInstance())); } - + // lifecycle methods - + @Before public void setUpTestDependencies() { adminClient = createAdminClient(); - repository = createRepository(adminClient, RepositoryTestData.createHeartOfGold("git")); + repository = createRepository(adminClient, readJson("repository-git.json")); } - + @After public void tearDownTestDependencies() { - deleteRepository(adminClient, repository.getId()); - adminClient.destroy(); + deleteRepository(adminClient, repository); } - + // tests - + @Test public void testLfsAPIWithAdminPermissions() throws IOException { uploadAndDownload(adminClient); } - + @Test + @Ignore("permissions not yet implemented") public void testLfsAPIWithOwnerPermissions() throws IOException { uploadAndDownloadAsUser(PermissionType.OWNER); } - + private void uploadAndDownloadAsUser(PermissionType permissionType) throws IOException { User trillian = UserTestData.createTrillian(); trillian.setPassword("secret123"); createUser(trillian); - - try { - repository.getPermissions().add(new Permission(trillian.getId(), permissionType)); - modifyRepository(repository); - Client client = createClient(); - authenticate(client, trillian.getId(), "secret123"); + try { + // TODO enable when permissions are implemented in v2 +// repository.getPermissions().add(new Permission(trillian.getId(), permissionType)); +// modifyRepository(repository); + + ScmClient client = new ScmClient(trillian.getId(), "secret123"); uploadAndDownload(client); } finally { removeUser(trillian); } } - + @Test + @Ignore("permissions not yet implemented") public void testLfsAPIWithWritePermissions() throws IOException { uploadAndDownloadAsUser(PermissionType.WRITE); } - + private void createUser(User user) { adminClient.resource(REST_BASE_URL + "users.json").post(user); } - + private void modifyRepository(Repository repository) { adminClient.resource(REST_BASE_URL + "repositories/" + repository.getId() + ".json").put(repository); } - + private void removeUser(User user) { adminClient.resource(REST_BASE_URL + "users/" + user.getId() + ".json").delete(); } - + @Test + @Ignore("permissions not yet implemented") public void testLfsAPIWithoutWritePermissions() throws IOException { User trillian = UserTestData.createTrillian(); trillian.setPassword("secret123"); createUser(trillian); - + expectedException.expect(UniformInterfaceException.class); expectedException.expectMessage(Matchers.containsString("403")); - - - try { - repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ)); - modifyRepository(repository); - Client client = createClient(); - authenticate(client, trillian.getId(), "secret123"); + try { + // TODO enable when permissions are implemented in v2 +// repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ)); +// modifyRepository(repository); + + ScmClient client = new ScmClient(trillian.getId(), "secret123"); uploadAndDownload(client); } finally { removeUser(trillian); } } - + @Test + @Ignore("permissions not yet implemented") public void testLfsDownloadWithReadPermissions() throws IOException { User trillian = UserTestData.createTrillian(); trillian.setPassword("secret123"); createUser(trillian); - - - try { - repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ)); - modifyRepository(repository); + + + try { + // TODO enable when permissions are implemented in v2 +// repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ)); +// modifyRepository(repository); // upload data as admin String data = UUID.randomUUID().toString(); byte[] dataAsBytes = data.getBytes(Charsets.UTF_8); LfsObject lfsObject = upload(adminClient, dataAsBytes); - - Client client = createClient(); - authenticate(client, trillian.getId(), "secret123"); + + ScmClient client = new ScmClient(trillian.getId(), "secret123"); // download as user byte[] downloadedData = download(client, lfsObject); - + // assert both are equal assertArrayEquals(dataAsBytes, downloadedData); } finally { removeUser(trillian); } } - + // lfs api - - private void uploadAndDownload(Client client) throws IOException { + + private void uploadAndDownload(ScmClient client) throws IOException { String data = UUID.randomUUID().toString(); byte[] dataAsBytes = data.getBytes(Charsets.UTF_8); LfsObject lfsObject = upload(client, dataAsBytes); byte[] downloadedData = download(client, lfsObject); assertArrayEquals(dataAsBytes, downloadedData); } - - private LfsObject upload(Client client, byte[] data) throws IOException { + + private LfsObject upload(ScmClient client, byte[] data) throws IOException { LfsObject lfsObject = createLfsObject(data); LfsRequestBody request = LfsRequestBody.createUploadRequest(lfsObject); LfsResponseBody response = request(client, request); - + String uploadURL = response.objects[0].actions.upload.href; client.resource(uploadURL).put(data); - + return lfsObject; - } - - private LfsResponseBody request(Client client, LfsRequestBody request) throws IOException { + } + + private LfsResponseBody request(ScmClient client, LfsRequestBody request) throws IOException { String batchUrl = createBatchUrl(); String requestAsString = mapper.writeValueAsString(request); - - return client - .resource(batchUrl) - .accept("application/vnd.git-lfs+json") - .header("Content-Type", "application/vnd.git-lfs+json") - .post(LfsResponseBody.class, requestAsString); + + String json = client + .resource(batchUrl) + .accept("application/vnd.git-lfs+json") + .header("Content-Type", "application/vnd.git-lfs+json") + .post(String.class, requestAsString); + return new ObjectMapperProvider().get().readValue(json, LfsResponseBody.class); } - + private String createBatchUrl() { - String url = repository.createUrl(BASE_URL); + String url = BASE_URL + "git/" + repository.getNamespace() + "/" + repository.getName(); return url + "/info/lfs/objects/batch"; } - - private byte[] download(Client client, LfsObject lfsObject) throws IOException { + + private byte[] download(ScmClient client, LfsObject lfsObject) throws IOException { LfsRequestBody request = LfsRequestBody.createDownloadRequest(lfsObject); LfsResponseBody response = request(client, request); - + String downloadUrl = response.objects[0].actions.download.href; return client.resource(downloadUrl).get(byte[].class); } - + private LfsObject createLfsObject(byte[] data) { Sha256Hash hash = new Sha256Hash(data); String oid = hash.toHex(); return new LfsObject(oid, data.length); } - + // LFS DTO objects - + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) private static class LfsRequestBody { - + private String operation; private String[] transfers = new String[]{ "basic" }; private LfsObject[] objects; public LfsRequestBody() { } - + private LfsRequestBody(String operation, LfsObject[] objects) { this.operation = operation; this.objects = objects; } - + public static LfsRequestBody createUploadRequest(LfsObject object) { return new LfsRequestBody("upload", new LfsObject[]{object}); } - + public static LfsRequestBody createDownloadRequest(LfsObject object) { return new LfsRequestBody("download", new LfsObject[]{object}); } - + } - + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) private static class LfsResponseBody { - + private LfsObject[] objects; public LfsResponseBody() { @@ -290,11 +298,11 @@ public class GitLfsITCase { this.objects = objects; } } - + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) private static class LfsObject { - + private String oid; private long size; private LfsActions actions; @@ -312,24 +320,24 @@ public class GitLfsITCase { this.size = size; this.actions = actions; } - + } - + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) private static class LfsActions { - + private LfsAction upload; private LfsAction download; public LfsActions() { } } - + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) private static class LfsAction { - + private String href; public LfsAction() { @@ -338,7 +346,7 @@ public class GitLfsITCase { public LfsAction(String href) { this.href = href; } - + } - + } diff --git a/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java index 079e2c520e..13cae15907 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java @@ -32,103 +32,108 @@ package sonia.scm.it; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.sun.jersey.api.client.Client; -import java.io.File; -import java.io.IOException; import org.junit.After; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; +import sonia.scm.api.v2.resources.RepositoryDto; import sonia.scm.repository.Person; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; import sonia.scm.repository.client.api.ClientCommand; import sonia.scm.repository.client.api.RepositoryClient; import sonia.scm.repository.client.api.RepositoryClientFactory; +import java.io.File; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD; +import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME; +import static sonia.scm.it.IntegrationTestUtil.BASE_URL; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.readJson; +import static sonia.scm.it.RepositoryITUtil.createRepository; +import static sonia.scm.it.RepositoryITUtil.deleteRepository; + /** * Integration test for RepositoryPathMatching with ".git" and without ".git". - * + * * @author Sebastian Sdorra * @since 1.54 */ public class GitRepositoryPathMatcherITCase { - + private static final RepositoryClientFactory REPOSITORY_CLIENT_FACTORY = new RepositoryClientFactory(); - + @Rule public TemporaryFolder tempFolder = new TemporaryFolder(); - - private Client apiClient; - private Repository repository; - + + private ScmClient apiClient; + private RepositoryDto repository; + @Before public void setUp() { apiClient = createAdminClient(); - Repository testRepository = RepositoryTestData.createHeartOfGold("git"); - this.repository = createRepository(apiClient, testRepository); + this.repository = createRepository(apiClient, readJson("repository-git.json")); } - + @After public void tearDown() { - deleteRepository(apiClient, repository.getId()); + deleteRepository(apiClient, repository); } - + // tests begin - + @Test public void testWithoutDotGit() throws IOException { String urlWithoutDotGit = createUrl(); cloneAndPush(urlWithoutDotGit); } - + @Test public void testWithDotGit() throws IOException { String urlWithDotGit = createUrl() + ".git"; cloneAndPush(urlWithDotGit); } - + // tests end - + private String createUrl() { - return BASE_URL + "git/" + repository.getName(); + return BASE_URL + "git/" + repository.getNamespace() + "/" + repository.getName(); } - + private void cloneAndPush( String url ) throws IOException { cloneRepositoryAndPushFiles(url); cloneRepositoryAndCheckFiles(url); } - + private void cloneRepositoryAndPushFiles(String url) throws IOException { RepositoryClient repositoryClient = createRepositoryClient(url); - + Files.write("a", new File(repositoryClient.getWorkingCopy(), "a.txt"), Charsets.UTF_8); repositoryClient.getAddCommand().add("a.txt"); commit(repositoryClient, "added a"); - + Files.write("b", new File(repositoryClient.getWorkingCopy(), "b.txt"), Charsets.UTF_8); repositoryClient.getAddCommand().add("b.txt"); commit(repositoryClient, "added b"); } - + private void cloneRepositoryAndCheckFiles(String url) throws IOException { RepositoryClient repositoryClient = createRepositoryClient(url); File workingCopy = repositoryClient.getWorkingCopy(); - + File a = new File(workingCopy, "a.txt"); assertTrue(a.exists()); assertEquals("a", Files.toString(a, Charsets.UTF_8)); - + File b = new File(workingCopy, "b.txt"); assertTrue(b.exists()); assertEquals("b", Files.toString(b, Charsets.UTF_8)); } - - private void commit(RepositoryClient repositoryClient, String message) throws IOException { + + private void commit(RepositoryClient repositoryClient, String message) throws IOException { repositoryClient.getCommitCommand().commit( new Person("scmadmin", "scmadmin@scm-manager.org"), message ); @@ -136,7 +141,7 @@ public class GitRepositoryPathMatcherITCase { repositoryClient.getPushCommand().push(); } } - + private RepositoryClient createRepositoryClient(String url) throws IOException { return REPOSITORY_CLIENT_FACTORY.create("git", url, ADMIN_USERNAME, ADMIN_PASSWORD, tempFolder.newFolder()); } diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java deleted file mode 100644 index e95f613f2a..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java +++ /dev/null @@ -1,265 +0,0 @@ -/** - * 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.AfterClass; -import org.junit.Test; - -import sonia.scm.group.Group; - -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; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * - * @author Sebastian Sdorra - */ -public class GroupITCase extends AbstractAdminITCaseBase -{ - - /** - * Method description - * - */ - @AfterClass - public static void cleanup() - { - Client client = createClient(); - - authenticateAdmin(client); - createResource(client, "groups/group-a").delete(); - createResource(client, "groups/group-c").delete(); - client.destroy(); - } - - /** - * Method description - * - */ - @Test - public void create() - { - Group group = new Group(); - - group.setName("group-a"); - group.setDescription("group a"); - - List members = new ArrayList(); - - members.add("slarti"); - members.add("marvin"); - members.add("dent"); - group.setMembers(members); - createGroup(group); - } - - /** - * Method description - * - */ - @Test - public void delete() - { - Group group = new Group(); - - group.setName("group-b"); - group.setDescription("group b"); - - List members = new ArrayList(); - - members.add("slarti"); - members.add("dent"); - group.setMembers(members); - createGroup(group); - deleteGroup(group.getName()); - } - - /** - * Method description - * - */ - @Test - public void modify() - { - Group group = new Group(); - - group.setName("group-d"); - group.setDescription("group d"); - createGroup(group); - group = getGroup(group.getName()); - group.setDescription("GROUP D"); - - WebResource wr = createResource(client, "groups/group-d"); - ClientResponse response = wr.put(ClientResponse.class, group); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - - Group other = getGroup("group-d"); - - assertEquals(group.getName(), other.getName()); - assertEquals(group.getDescription(), other.getDescription()); - assertNotNull(other.getLastModified()); - deleteGroup(other.getName()); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - */ - @Test - public void getAll() - { - Group group = new Group(); - - group.setName("group-c"); - createGroup(group); - - WebResource wr = createResource(client, "groups"); - ClientResponse response = wr.get(ClientResponse.class); - Collection groups = - response.getEntity(new GenericType>() {} - ); - - response.close(); - assertNotNull(groups); - assertFalse(groups.isEmpty()); - - Group groupC = null; - - for (Group g : groups) - { - if (g.getName().equals("group-c")) - { - groupC = g; - } - } - - assertNotNull(groupC); - assertNotNull(groupC.getCreationDate()); - assertNotNull(groupC.getType()); - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @param group - */ - private void createGroup(Group group) - { - WebResource wr = createResource(client, "groups"); - ClientResponse response = wr.post(ClientResponse.class, group); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - response.close(); - - Group other = getGroup(group.getName()); - - assertNotNull(other); - assertNotNull(other.getType()); - assertEquals(group.getName(), other.getName()); - assertEquals(group.getDescription(), other.getDescription()); - assertArrayEquals(other.getMembers().toArray(new String[0]), - group.getMembers().toArray(new String[0])); - assertNotNull(other.getCreationDate()); - } - - /** - * Method description - * - * - * @param name - */ - private void deleteGroup(String name) - { - WebResource wr = createResource(client, "groups/".concat(name)); - ClientResponse response = wr.delete(ClientResponse.class); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - wr = createResource(client, "groups/".concat(name)); - response = wr.get(ClientResponse.class); - assertNotNull(response); - assertEquals(404, response.getStatus()); - response.close(); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param groupname - * - * @return - */ - private Group getGroup(String groupname) - { - WebResource wr = createResource(client, "groups/".concat(groupname)); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - - Group group = response.getEntity(Group.class); - - response.close(); - assertNotNull(group); - assertEquals(groupname, group.getName()); - - return group; - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java deleted file mode 100644 index 5d115f58ff..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java +++ /dev/null @@ -1,185 +0,0 @@ -/** - * 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.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import sonia.scm.group.Group; - -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; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class GroupPermissionITCase extends AbstractPermissionITCaseBase -{ - - /** - * Constructs ... - * - * - * @param credentials - */ - public GroupPermissionITCase(Credentials credentials) - { - super(credentials); - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - */ - @AfterClass - public static void cleanup() - { - Client client = createClient(); - - authenticateAdmin(client); - createResource(client, "groups/test-group").delete(); - client.destroy(); - } - - /** - * Method description - * - */ - @BeforeClass - public static void createTestGroup() - { - Group testGroup = new Group("xml", "test-group"); - Client client = createClient(); - - authenticateAdmin(client); - - WebResource wr = createResource(client, "groups"); - ClientResponse response = wr.post(ClientResponse.class, testGroup); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - response.close(); - logoutClient(client); - client.destroy(); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Override - protected String getBasePath() - { - return "groups"; - } - - /** - * Method description - * - * - * @return - */ - @Override - protected Group getCreateItem() - { - return new Group("xml", "create-test-group"); - } - - /** - * Method description - * - * - * @return - */ - @Override - protected String getDeletePath() - { - return "groups/test-group"; - } - - /** - * Method description - * - * - * @return - */ - @Override - protected String getGetPath() - { - return "groups/test-group"; - } - - /** - * Method description - * - * - * @return - */ - @Override - protected Group getModifyItem() - { - return new Group("xml", "test-group", "dent", "zaphod", "trillian"); - } - - /** - * Method description - * - * - * @return - */ - @Override - protected String getModifyPath() - { - return "groups/test-group"; - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java index e3727a468d..c2b43465c3 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java @@ -35,24 +35,25 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; import org.junit.After; import org.junit.Test; -import static org.hamcrest.Matchers.*; - -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 javax.ws.rs.core.EntityTag; import java.util.Date; -import javax.ws.rs.core.EntityTag; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createResource; + +//~--- JDK imports ------------------------------------------------------------ /** * @@ -188,8 +189,8 @@ public abstract class HttpCacheITCaseBase */ private ClientResponse getCollectionResponse() { - Client client = createAdminClient(); - WebResource resource = createResource(client, getCollectionUrlPart()); + ScmClient client = createAdminClient(); + WebResource.Builder resource = createResource(client, getCollectionUrlPart()); ClientResponse response = resource.get(ClientResponse.class); assertEquals(200, response.getStatus()); diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java index e12057e47a..4db5896598 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java @@ -35,33 +35,33 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.io.Resources; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.client.apache.ApacheHttpClient; import com.sun.jersey.client.apache.config.ApacheHttpClientConfig; import com.sun.jersey.client.apache.config.DefaultApacheHttpClientConfig; -import com.sun.jersey.core.util.MultivaluedMapImpl; -import sonia.scm.ScmState; -import sonia.scm.Type; +import de.otto.edison.hal.HalRepresentation; import sonia.scm.api.rest.JSONContextResolver; import sonia.scm.api.rest.ObjectMapperProvider; import sonia.scm.repository.Person; import sonia.scm.repository.client.api.ClientCommand; import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.user.User; import sonia.scm.util.IOUtil; -import javax.ws.rs.core.MultivaluedMap; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.net.URI; +import java.net.URL; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.UUID; -import static org.junit.Assert.*; - //~--- JDK imports ------------------------------------------------------------ /** @@ -83,7 +83,7 @@ public final class IntegrationTestUtil public static final String BASE_URL = "http://localhost:8081/scm/"; /** scm-manager base url for the rest api */ - public static final String REST_BASE_URL = BASE_URL.concat("api/rest/"); + public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/"); //~--- constructors --------------------------------------------------------- @@ -95,72 +95,10 @@ public final class IntegrationTestUtil //~--- methods -------------------------------------------------------------- - /** - * Method description - * - * - * @param client - * @param username - * @param password - * - * @return - */ - public static ClientResponse authenticate(Client client, String username, String password) { - WebResource wr = client.resource(createResourceUrl("auth/access_token")); - MultivaluedMap formData = new MultivaluedMapImpl(); - formData.add("username", username); - formData.add("password", password); - formData.add("cookie", "true"); - formData.add("grant_type", "password"); - - return wr.type("application/x-www-form-urlencoded").post(ClientResponse.class, formData); - } - - /** - * Method description - * - * - * @param client - * - * @return - */ - public static ScmState authenticateAdmin(Client client) + public static ScmClient createAdminClient() { - ClientResponse cr = authenticate(client, ADMIN_USERNAME, ADMIN_PASSWORD); - ScmState state = cr.getEntity(ScmState.class); - - cr.close(); - assertNotNull(state); - assertTrue(state.isSuccess()); - - User user = state.getUser(); - - assertNotNull(user); - assertEquals("scmadmin", user.getName()); - assertTrue(user.isAdmin()); - - Collection types = state.getRepositoryTypes(); - - assertNotNull(types); - assertFalse(types.isEmpty()); - - return state; - } - - /** - * Method description - * - * - * @return - */ - public static Client createAdminClient() - { - Client client = createClient(); - - authenticateAdmin(client); - - return client; + return new ScmClient("scmadmin", "scmadmin"); } /** @@ -178,6 +116,15 @@ public final class IntegrationTestUtil return ApacheHttpClient.create(config); } + public static String serialize(Object o) { + ObjectMapper mapper = new ObjectMapperProvider().get(); + try { + return mapper.writeValueAsString(o); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + /** * Commit and push changes. * @@ -236,18 +183,21 @@ public final class IntegrationTestUtil return params; } - /** - * Method description - * - * - * @param client - * @param url - * - * @return - */ - public static WebResource createResource(Client client, String url) - { - return client.resource(createResourceUrl(url)); + public static URI getLink(HalRepresentation object, String linkName) { + return URI.create(object.getLinks().getLinkBy("delete").get().getHref()); + } + + public static WebResource.Builder createResource(ScmClient client, String url) { + return createResource(client, createResourceUrl(url)); + } + public static WebResource.Builder createResource(ScmClient client, URI url) { + return client.resource(url.toString()); + } + + public static ClientResponse post(ScmClient client, String path, String mediaType, Object o) { + return createResource(client, path) + .type(mediaType) + .post(ClientResponse.class, serialize(o)); } /** @@ -258,9 +208,9 @@ public final class IntegrationTestUtil * * @return */ - public static String createResourceUrl(String url) + public static URI createResourceUrl(String url) { - return REST_BASE_URL.concat(url); + return URI.create(REST_BASE_URL).resolve(url); } /** @@ -269,30 +219,20 @@ public final class IntegrationTestUtil * * @return */ - public static File createTempDirectory() - { - File directory = new File(System.getProperty("java.io.tmpdir"), - UUID.randomUUID().toString()); + public static File createTempDirectory() { + File directory = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); IOUtil.mkdirs(directory); return directory; } - /** - * Method description - * - * - * @param client - */ - public static void logoutClient(Client client) - { - WebResource wr = createResource(client, "auth/logout"); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - assertEquals(200, response.getStatus()); - response.close(); - client.destroy(); + public static String readJson(String jsonFileName) { + URL url = Resources.getResource(jsonFileName); + try { + return Resources.toString(url, Charset.forName("UTF-8")); + } catch (IOException e) { + throw new RuntimeException("could not read json file " + jsonFileName, e); + } } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java index abb92b674b..9539be674f 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java @@ -35,27 +35,32 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import sonia.scm.api.v2.resources.ConfigDto; +import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.web.VndMediaType; -import sonia.scm.config.ScmConfiguration; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; +import javax.ws.rs.core.MediaType; +import java.net.URI; -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.getLink; +import static sonia.scm.it.IntegrationTestUtil.readJson; +import static sonia.scm.it.IntegrationTestUtil.serialize; +import static sonia.scm.it.RepositoryITUtil.createRepository; +import static sonia.scm.it.RepositoryITUtil.deleteRepository; //~--- JDK imports ------------------------------------------------------------ -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - /** * @@ -83,11 +88,9 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase * */ @Before - public void createTestRepository() - { - repository = RepositoryTestData.createHeartOfGold(type); + public void createTestRepository() { client = createAdminClient(); - repository = createRepository(client, repository); + repository = createRepository(client, readJson("repository-" + type + ".json")); } /** @@ -101,10 +104,8 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase if (repository != null) { - deleteRepository(client, repository.getId()); + deleteRepository(client, repository); } - - logoutClient(client); } /** @@ -112,20 +113,19 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase * */ @Test - public void testDeleteAllowed() - { + public void testDeleteAllowed() { setArchiveMode(true); - WebResource resource = createResource(client, - "repositories/".concat(repository.getId())); - repository.setArchived(true); - ClientResponse response = resource.put(ClientResponse.class, repository); + ClientResponse response = createResource(client, + "repositories/" + repository.getNamespace() + "/" + repository.getName()) + .type(VndMediaType.REPOSITORY).put(ClientResponse.class, serialize(repository)); assertNotNull(response); assertEquals(204, response.getStatus()); - response = resource.delete(ClientResponse.class); + response = createResource(client, + "repositories/" + repository.getNamespace() + "/" + repository.getName()).delete(ClientResponse.class); assertNotNull(response); assertEquals(204, response.getStatus()); repository = null; @@ -140,12 +140,12 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase { setArchiveMode(true); - WebResource resource = createResource(client, - "repositories/".concat(repository.getId())); - ClientResponse response = resource.delete(ClientResponse.class); + URI deleteUrl = getLink(repository, "delete"); + ClientResponse response = createResource(client, deleteUrl).delete(ClientResponse.class); assertNotNull(response); assertEquals(412, response.getStatus()); + response.close(); } //~--- set methods ---------------------------------------------------------- @@ -158,25 +158,25 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase */ private void setArchiveMode(boolean archive) { - WebResource resource = createResource(client, "config"); - ScmConfiguration config = resource.get(ScmConfiguration.class); + WebResource.Builder resource = createResource(client, "config").type(MediaType.APPLICATION_JSON); + ConfigDto config = resource.get(ConfigDto.class); assertNotNull(config); config.setEnableRepositoryArchive(archive); - ClientResponse resp = resource.post(ClientResponse.class, config); + ClientResponse resp = createResource(client, "config").type(VndMediaType.CONFIG).put(ClientResponse.class, config); assertNotNull(resp); - assertEquals(201, resp.getStatus()); + assertEquals(204, resp.getStatus()); } //~--- fields --------------------------------------------------------------- /** Field description */ - private Client client; + private ScmClient client; /** Field description */ - private Repository repository; + private RepositoryDto repository; /** Field description */ private String type; diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java index de508627c8..7ddaf8d7b1 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java @@ -37,31 +37,30 @@ package sonia.scm.it; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import sonia.scm.repository.Repository; +import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.repository.client.api.RepositoryClient; +import sonia.scm.repository.client.api.RepositoryClientException; import sonia.scm.user.User; import sonia.scm.util.IOUtil; -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - import java.io.File; import java.io.IOException; -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientException; +import static org.junit.Assert.fail; +import static sonia.scm.it.IntegrationTestUtil.createTempDirectory; + +//~--- JDK imports ------------------------------------------------------------ /** * * @author Sebastian Sdorra */ @RunWith(Parameterized.class) +@Ignore("permissions not yet implemented -- see RepositoryITCaseBase#createTestRepository") public class RepositoryExtendedITCase extends RepositoryITCaseBase { @@ -76,9 +75,9 @@ public class RepositoryExtendedITCase extends RepositoryITCaseBase * @param noperm * @param password */ - public RepositoryExtendedITCase(Repository repository, User owner, - User write, User read, User noperm, - String password) + public RepositoryExtendedITCase(RepositoryDto repository, User owner, + User write, User read, User noperm, + String password, String ignore_testCaseName) { super(repository, owner, write, read, noperm, password); } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java index cee6a4d92f..6ba4d572b2 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java @@ -31,9 +31,7 @@ package sonia.scm.it; import com.google.common.base.Charsets; -import com.google.common.collect.Lists; import com.google.common.io.Files; -import com.sun.jersey.api.client.WebResource; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -43,26 +41,18 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import sonia.scm.debug.DebugHookData; +import sonia.scm.api.v2.resources.RepositoryDto; import sonia.scm.repository.Changeset; import sonia.scm.repository.Person; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; import sonia.scm.repository.client.api.ClientCommand; import sonia.scm.repository.client.api.RepositoryClient; import sonia.scm.repository.client.api.RepositoryClientFactory; -import sonia.scm.util.IOUtil; import java.io.File; import java.io.IOException; import java.util.Collection; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.readJson; import static sonia.scm.it.RepositoryITUtil.createRepository; import static sonia.scm.it.RepositoryITUtil.deleteRepository; @@ -83,7 +73,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase public TemporaryFolder tempFolder = new TemporaryFolder(); private final String repositoryType; - private Repository repository; + private RepositoryDto repository; private File workingCopy; private RepositoryClient repositoryClient; @@ -105,8 +95,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase @Before public void setUpTestRepository() throws IOException { - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository = createRepository(client, repository); + repository = createRepository(client, readJson("repository-" + repositoryType + ".json")); workingCopy = tempFolder.newFolder(); repositoryClient = createRepositoryClient(); } @@ -117,7 +106,9 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase @After public void removeTestRepository() { - deleteRepository(client, repository.getId()); + if (repository != null) { + deleteRepository(client, repository); + } } /** @@ -138,10 +129,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase Thread.sleep(WAIT_TIME); // check debug servlet for pushed commit - WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); - DebugHookData data = wr.get(DebugHookData.class); - assertNotNull(data); - assertThat(data.getChangesets(), contains(changeset.getId())); +// WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); +// DebugHookData data = wr.get(DebugHookData.class); +// assertNotNull(data); +// assertThat(data.getChangesets(), contains(changeset.getId())); } /** @@ -173,15 +164,15 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase Thread.sleep(WAIT_TIME); // check debug servlet that only one commit is present - WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); - DebugHookData data = wr.get(DebugHookData.class); - assertNotNull(data); - assertThat(data.getChangesets(), allOf( - contains(b.getId()), - not( - contains(a.getId()) - ) - )); +// WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); +// DebugHookData data = wr.get(DebugHookData.class); +// assertNotNull(data); +// assertThat(data.getChangesets(), allOf( +// contains(b.getId()), +// not( +// contains(a.getId()) +// ) +// )); } private Changeset commit(String message) throws IOException { @@ -197,7 +188,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase private RepositoryClient createRepositoryClient() throws IOException { return REPOSITORY_CLIENT_FACTORY.create(repositoryType, - IntegrationTestUtil.BASE_URL + repositoryType + "/" + repository.getName(), + IntegrationTestUtil.BASE_URL + repositoryType + "/" + repository.getNamespace() + "/" + repository.getName(), IntegrationTestUtil.ADMIN_USERNAME, IntegrationTestUtil.ADMIN_PASSWORD, workingCopy ); } @@ -208,16 +199,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase * * @return repository types test parameter */ - @Parameters + @Parameters(name = "{0}") public static Collection createParameters() { - Collection params = Lists.newArrayList(); - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); - if (IOUtil.search("hg") != null) { - params.add(new String[] { "hg" }); - } - return params; + return IntegrationTestUtil.createRepositoryTypeParameters(); } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java index ceb02b65a3..7f22366ecb 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java @@ -34,23 +34,24 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; +import org.junit.Ignore; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryTestData; -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createResource; //~--- JDK imports ------------------------------------------------------------ -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - /** * * @author Sebastian Sdorra */ +@Ignore() public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase { @@ -64,8 +65,8 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase protected Repository createSampleItem() { Repository repository = RepositoryTestData.createHeartOfGold("git"); - Client client = createAdminClient(); - WebResource resource = createResource(client, "repositories"); + ScmClient client = createAdminClient(); + WebResource.Builder resource = createResource(client, "repositories"); ClientResponse response = resource.post(ClientResponse.class, repository); assertNotNull(response); @@ -74,8 +75,7 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase String location = response.getHeaders().get("Location").get(0); assertNotNull(location); - resource = client.resource(location); - response = resource.get(ClientResponse.class); + response = client.resource(location).get(ClientResponse.class); assertNotNull(response); assertEquals(200, response.getStatus()); repository = response.getEntity(Repository.class); @@ -94,8 +94,8 @@ public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase @Override protected void destroy(Repository item) { - Client client = createAdminClient(); - WebResource resource = createResource(client, + ScmClient client = createAdminClient(); + WebResource.Builder resource = createResource(client, "repositories/".concat(item.getId())); ClientResponse response = resource.delete(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 deleted file mode 100644 index 9ee0cadf58..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java +++ /dev/null @@ -1,259 +0,0 @@ -/** - * 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 com.google.common.collect.Lists; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.repository.Permission; -import sonia.scm.repository.PermissionType; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; - -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.WebResource; - -import java.util.Arrays; -import java.util.Collection; -import org.junit.After; -import sonia.scm.util.IOUtil; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class RepositoryITCase extends AbstractAdminITCaseBase -{ - - /** - * Constructs ... - * - * - * @param repositoryType - */ - public RepositoryITCase(String repositoryType) - { - this.repositoryType = repositoryType; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @After - public void cleanup() - { - Collection repositories = - createResource(client, - "repositories").get(new GenericType>() {} - ); - - if (repositories != null) - { - for (Repository r : repositories) - { - createResource(client, "repositories/" + r.getId()).delete(); - } - } - - client.destroy(); - } - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - Collection params = Lists.newArrayList(); - - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); - - if (IOUtil.search("hg") != null) - { - params.add(new String[] { "hg" }); - } - - return params; - } - - /** - * Method description - * ->>>>>>> merge rev - */ - @Test - public void create() - { - Repository repository = - RepositoryTestData.createHeartOfGold(repositoryType); - - createRepository(client, repository); - } - - /** - * Method description - * - */ - @Test - public void delete() - { - Repository repository = - RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType); - - repository = createRepository(client, repository); - deleteRepository(client, repository.getId()); - } - - /** - * Method description - * - */ - @Test - public void doubleCreate() - { - Repository repository = RepositoryTestData.create42Puzzle(repositoryType); - - repository = createRepository(client, repository); - - WebResource wr = createResource(client, "repositories"); - ClientResponse response = wr.post(ClientResponse.class, repository); - - assertNotNull(response); - assertThat(response.getStatus(), not(lessThanOrEqualTo(400))); - } - - /** - * Method description - * - */ - @Test - public void modify() - { - Repository repository = - RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType); - - repository = createRepository(client, repository); - repository.setPermissions(Arrays.asList(new Permission("dent", - PermissionType.READ), new Permission("slarti", PermissionType.WRITE))); - - WebResource wr = createResource(client, - "repositories/".concat(repository.getId())); - ClientResponse response = wr.put(ClientResponse.class, repository); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - - Repository other = getRepositoryById(client, repository.getId()); - - assertRepositoriesEquals(repository, other); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - */ - @Test - public void getAll() - { - Repository repository = - RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType); - - repository = createRepository(client, repository); - - WebResource wr = createResource(client, "repositories"); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - assertEquals(200, response.getStatus()); - - Collection repositories = - response.getEntity(new GenericType>() {} - ); - - response.close(); - assertNotNull(repositories); - assertFalse(repositories.isEmpty()); - - Repository hvpt = null; - - for (Repository other : repositories) - { - - // fix equals check - other.getPermissions(); - - if (repository.equals(other)) - { - hvpt = other; - - break; - } - } - - assertNotNull(hvpt); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private final String repositoryType; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java index ab8b598bdf..c227fb5e4b 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java @@ -37,37 +37,30 @@ package sonia.scm.it; import org.junit.AfterClass; import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.ScmState; -import sonia.scm.Type; -import sonia.scm.repository.Permission; -import sonia.scm.repository.PermissionType; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; +import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.repository.client.api.RepositoryClient; +import sonia.scm.repository.client.api.RepositoryClientFactory; import sonia.scm.user.User; import sonia.scm.user.UserTestData; import sonia.scm.util.IOUtil; -import sonia.scm.util.Util; - -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.GenericType; import java.io.File; import java.io.IOException; - import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientFactory; +import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD; +import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME; +import static sonia.scm.it.IntegrationTestUtil.commit; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createRandomFile; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.createTempDirectory; +import static sonia.scm.it.IntegrationTestUtil.readJson; +import static sonia.scm.it.RepositoryITUtil.createUrl; +import static sonia.scm.it.UserITUtil.postUser; + +//~--- JDK imports ------------------------------------------------------------ /** * @@ -76,6 +69,15 @@ import sonia.scm.repository.client.api.RepositoryClientFactory; public class RepositoryITCaseBase { + private static final Collection CREATED_REPOSITORIES = new ArrayList<>(); + + protected User nopermUser; + protected User ownerUser; + protected String password; + protected User readUser; + protected RepositoryDto repository; + protected User writeUser; + /** * Constructs ... * @@ -87,8 +89,8 @@ public class RepositoryITCaseBase * @param noperm * @param password */ - public RepositoryITCaseBase(Repository repository, User owner, User write, - User read, User noperm, String password) + public RepositoryITCaseBase(RepositoryDto repository, User owner, User write, + User read, User noperm, String password) { this.repository = repository; this.ownerUser = owner; @@ -127,24 +129,27 @@ public class RepositoryITCaseBase * * @throws IOException */ - public static void addTestFiles(Repository repository, String username, - String password) - throws IOException + public static void addTestFiles(RepositoryDto repository, String username, + String password) { File directory = createTempDirectory(); - try - { + try { RepositoryClientFactory clientFactory = new RepositoryClientFactory(); RepositoryClient client = clientFactory.create( - repository.getType(), repository.createUrl(BASE_URL), username, password, directory + repository.getType(), createUrl(repository), + username, password, directory ); - + addTestFiles(client); - } - finally - { - IOUtil.delete(directory); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + try { + IOUtil.delete(directory); + } catch (IOException e) { + e.printStackTrace(); + } } } @@ -155,27 +160,17 @@ public class RepositoryITCaseBase @AfterClass public static void cleanup() { - Client client = createAdminClient(); + ScmClient client = createAdminClient(); deleteUser(client, UserTestData.createTrillian()); deleteUser(client, UserTestData.createZaphod()); deleteUser(client, UserTestData.createMarvin()); deleteUser(client, UserTestData.createPerfect()); - Collection repositories = - createResource(client, "repositories").get( - new GenericType>() {} - ); - - if (repositories != null) + for (RepositoryDto r : CREATED_REPOSITORIES) { - for (Repository r : repositories) - { - createResource(client, "repositories/" + r.getId()).delete(); - } + createResource(client, "repositories/" + r.getNamespace() + "/" + r.getName()).delete(); } - - client.destroy(); } /** @@ -186,15 +181,9 @@ public class RepositoryITCaseBase * * @throws IOException */ - @Parameters + @Parameters(name = "{6}") public static Collection createParameters() throws IOException { - Client client = createClient(); - ScmState state = authenticateAdmin(client); - - assertNotNull(state); - assertTrue(state.isSuccess()); - Collection params = new ArrayList<>(); User owner = UserTestData.createTrillian(); @@ -211,11 +200,8 @@ public class RepositoryITCaseBase User noperm = UserTestData.createPerfect(); createUser(noperm); - - for (Type t : state.getRepositoryTypes()) - { - appendTestParemeter(params, t.getName(), owner, write, read, noperm); - } + IntegrationTestUtil.createRepositoryTypeParameters().stream().map(array -> array[0]) + .forEach(t -> appendTestParameter(params, t, owner, write, read, noperm)); return params; } @@ -232,22 +218,15 @@ public class RepositoryITCaseBase * @param noperm * * @throws IOException - * @throws RepositoryClientException */ - private static void appendTestParemeter(Collection params, - String type, User owner, User write, User read, User noperm) throws IOException + private static void appendTestParameter(Collection params, + String type, User owner, User write, User read, User noperm) { - Repository repository = createTestRepository(null, type, owner, write, read); + RepositoryDto repository = createTestRepository(type, owner, write, read); params.add(new Object[] - { - repository, owner, write, read, noperm, "secret" - }); - - repository = createTestRepository("test", type, owner, write, read); - params.add(new Object[] - { - repository, owner, write, read, noperm, "secret" - }); + { + repository, owner, write, read, noperm, "secret", repository.getType() + "-" + owner.getId() + }); } /** @@ -255,7 +234,6 @@ public class RepositoryITCaseBase * * * - * @param prefix * @param type * @param owner * @param write @@ -264,29 +242,23 @@ public class RepositoryITCaseBase * @return * * @throws IOException - * @throws RepositoryClientException */ - private static Repository createTestRepository(String prefix, String type, - User owner, User write, User read) throws IOException + private static RepositoryDto createTestRepository(String type, + User owner, User write, User read) { - Client client = createAdminClient(); - Repository repository = RepositoryTestData.createHeartOfGold(type); + ScmClient client = createAdminClient(); - if (Util.isNotEmpty(prefix)) - { - repository.setName(prefix.concat("/").concat(repository.getName())); - } + // TODO Activate for tests when implemented +// repository.setPermissions(Arrays.asList( +// new Permission(owner.getName(), PermissionType.OWNER), +// new Permission(write.getName(), PermissionType.WRITE), +// new Permission(read.getName(), PermissionType.READ)) +// ); + String repositoryJson = readJson("repository-" + type + ".json"); + RepositoryDto repository = RepositoryITUtil.createRepository(client, repositoryJson); + + CREATED_REPOSITORIES.add(repository); - //J- - repository.setPermissions(Arrays.asList( - new Permission(owner.getName(), PermissionType.OWNER), - new Permission(write.getName(), PermissionType.WRITE), - new Permission(read.getName(), PermissionType.READ)) - ); - //J+ - repository = createRepository(client, repository); - client.destroy(); - addTestFiles(repository, ADMIN_USERNAME, ADMIN_PASSWORD); return repository; @@ -300,11 +272,11 @@ public class RepositoryITCaseBase */ private static void createUser(User user) { - Client client = createAdminClient(); + ScmClient client = createAdminClient(); user.setPassword("secret"); - createResource(client, "users").post(user); - client.destroy(); + + postUser(client, user); } /** @@ -314,7 +286,7 @@ public class RepositoryITCaseBase * @param client * @param user */ - private static void deleteUser(Client client, User user) + private static void deleteUser(ScmClient client, User user) { createResource(client, "users/".concat(user.getName())).delete(); } @@ -327,33 +299,13 @@ public class RepositoryITCaseBase * @param directory * * @return - * + * * @throws IOException */ protected RepositoryClient createRepositoryClient(User user, File directory) throws IOException { RepositoryClientFactory clientFactory = new RepositoryClientFactory(); - return clientFactory.create(repository.getType(), repository.createUrl(BASE_URL), - user.getName(), password, directory); + return clientFactory.create(repository.getType(), createUrl(repository), + user.getName(), password, directory); } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - protected User nopermUser; - - /** Field description */ - protected User ownerUser; - - /** Field description */ - protected String password; - - /** Field description */ - protected User readUser; - - /** Field description */ - protected Repository repository; - - /** Field description */ - protected User writeUser; } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java index e3111502cc..05915f3b67 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java @@ -35,119 +35,83 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- -import sonia.scm.repository.Repository; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; +import sonia.scm.api.rest.ObjectMapperProvider; +import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.web.VndMediaType; -import static org.junit.Assert.*; +import java.io.IOException; +import java.net.URI; -import static sonia.scm.it.IntegrationTestUtil.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static sonia.scm.it.IntegrationTestUtil.BASE_URL; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.getLink; //~--- JDK imports ------------------------------------------------------------ -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - -/** - * - * @author Sebastian Sdorra - */ public final class RepositoryITUtil { - /** - * Constructs ... - * - */ private RepositoryITUtil() {} - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * @param repository - * @param other - */ - public static void assertRepositoriesEquals(Repository repository, Repository other) - { - assertEquals(repository.getName(), other.getName()); - assertEquals(repository.getDescription(), other.getDescription()); - assertEquals(repository.getContact(), other.getContact()); - assertEquals(repository.getPermissions(), other.getPermissions()); - assertEquals(repository.getType(), other.getType()); - } - - /** - * Method description - * - * @param client - * @param repository - * - * @return - */ - public static Repository createRepository(Client client, - Repository repository) - { - WebResource wr = createResource(client, "repositories"); - ClientResponse response = wr.post(ClientResponse.class, repository); + public static RepositoryDto createRepository(ScmClient client, String repositoryJson) { + ClientResponse response = + createResource(client, "repositories") + .accept("*/*") + .type(VndMediaType.REPOSITORY) + .post(ClientResponse.class, repositoryJson); assertNotNull(response); assertEquals(201, response.getStatus()); - String url = response.getHeaders().get("Location").get(0); + URI url = URI.create(response.getHeaders().get("Location").get(0)); response.close(); - Repository other = getRepository(client, url); + RepositoryDto other = getRepository(client, url); assertNotNull(other); assertNotNull(other.getType()); - assertRepositoriesEquals(repository, other); - assertNotNull(other.getId()); assertNotNull(other.getCreationDate()); return other; } - /** - * Method description - * - * @param client - * @param id - */ - public static void deleteRepository(Client client, String id) + public static void deleteRepository(ScmClient client, RepositoryDto repository) { - WebResource wr = createResource(client, "repositories/".concat(id)); - ClientResponse response = wr.delete(ClientResponse.class); + URI deleteUrl = getLink(repository, "delete"); + ClientResponse response = createResource(client, deleteUrl).delete(ClientResponse.class); assertNotNull(response); assertEquals(204, response.getStatus()); response.close(); - wr = createResource(client, "repositories/".concat(id)); - response = wr.get(ClientResponse.class); + + URI selfUrl = getLink(repository, "self"); + response = createResource(client, selfUrl).get(ClientResponse.class); assertNotNull(response); assertEquals(404, response.getStatus()); response.close(); } - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * @param client - * @param url - * - * @return - */ - public static Repository getRepository(Client client, String url) + public static RepositoryDto getRepository(ScmClient client, URI url) { - WebResource wr = client.resource(url); + WebResource.Builder wr = createResource(client, url); ClientResponse response = wr.get(ClientResponse.class); assertNotNull(response); + assertEquals(200, response.getStatus()); - Repository repository = response.getEntity(Repository.class); + String json = response.getEntity(String.class); + RepositoryDto repository = null; + try { + repository = new ObjectMapperProvider().get().readerFor(RepositoryDto.class).readValue(json); + } catch (IOException e) { + fail("could not read json:\n" + json); + } response.close(); assertNotNull(repository); @@ -155,26 +119,7 @@ public final class RepositoryITUtil return repository; } - /** - * Method description - * - * @param client - * @param id - * - * @return - */ - public static Repository getRepositoryById(Client client, String id) - { - WebResource wr = createResource(client, "repositories/".concat(id)); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - - Repository repository = response.getEntity(Repository.class); - - response.close(); - assertNotNull(repository); - - return repository; + public static String createUrl(RepositoryDto repository) { + return BASE_URL + repository.getType() + "/" + repository.getNamespace() + "/" + repository.getName(); } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java index 4cc470da56..7900f11096 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java @@ -35,37 +35,39 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; +import de.otto.edison.hal.HalRepresentation; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import sonia.scm.api.rest.ObjectMapperProvider; +import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.web.VndMediaType; -import sonia.scm.repository.Repository; +import java.io.IOException; -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static sonia.scm.it.IntegrationTestUtil.createAdminClient; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.IntegrationTestUtil.serialize; //~--- 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; - -import java.util.Collection; - /** * * @author Sebastian Sdorra */ @RunWith(Parameterized.class) public class RepositorySimplePermissionITCase - extends AbstractPermissionITCaseBase + extends AbstractPermissionITCaseBase { /** Field description */ - private static String REPOSITORY_UUID; + private static String REPOSITORY_PATH; //~--- constructors --------------------------------------------------------- @@ -75,7 +77,7 @@ public class RepositorySimplePermissionITCase * * @param credentials */ - public RepositorySimplePermissionITCase(Credentials credentials) + public RepositorySimplePermissionITCase(Credentials credentials, String ignore_testCaseName) { super(credentials); } @@ -87,20 +89,17 @@ public class RepositorySimplePermissionITCase * */ @BeforeClass - public static void createTestRepository() - { - Repository repository = new Repository(); + public static void createTestRepository() throws IOException { + RepositoryDto repository = new RepositoryDto(); repository.setName("test-repo"); repository.setType("git"); - repository.setPublicReadable(false); +// repository.setPublicReadable(false); - Client client = createClient(); + ScmClient client = createAdminClient(); - authenticateAdmin(client); - - WebResource wr = createResource(client, "repositories"); - ClientResponse response = wr.post(ClientResponse.class, repository); + WebResource.Builder wr = createResource(client, "repositories"); + ClientResponse response = wr.type(VndMediaType.REPOSITORY).post(ClientResponse.class, serialize(repository)); assertNotNull(response); assertEquals(201, response.getStatus()); @@ -109,17 +108,13 @@ public class RepositorySimplePermissionITCase assertNotNull(repositoryUrl); response.close(); - wr = client.resource(repositoryUrl); - response = wr.get(ClientResponse.class); + response = client.resource(repositoryUrl).get(ClientResponse.class); assertNotNull(response); assertEquals(200, response.getStatus()); - repository = response.getEntity(Repository.class); - assertNotNull(repository); - REPOSITORY_UUID = repository.getId(); - assertNotNull(REPOSITORY_UUID); + repository = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), RepositoryDto.class); + REPOSITORY_PATH = repository.getNamespace() + "/" + repository.getName(); + assertNotNull(REPOSITORY_PATH); response.close(); - logoutClient(client); - client.destroy(); } /** @@ -127,13 +122,9 @@ public class RepositorySimplePermissionITCase * */ @AfterClass - public static void removeTestRepoistory() + public static void removeTestRepository() { - Client client = createClient(); - - authenticateAdmin(client); - createResource(client, "repositories/" + REPOSITORY_UUID).delete(); - client.destroy(); + createResource(createAdminClient(), "repositories/" + REPOSITORY_PATH).delete(); } /** @@ -150,12 +141,16 @@ public class RepositorySimplePermissionITCase assertNotNull(response); assertEquals(200, response.getStatus()); - Collection repositories = - response.getEntity(new GenericType>() {} - ); + HalRepresentation repositories = + null; + try { + repositories = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), HalRepresentation.class); + } catch (IOException e) { + throw new RuntimeException(e); + } assertNotNull(repositories); - assertTrue(repositories.isEmpty()); + assertTrue(repositories.getEmbedded().getItemsBy("repositories").isEmpty()); response.close(); } } @@ -198,9 +193,9 @@ public class RepositorySimplePermissionITCase * @return */ @Override - protected Repository getCreateItem() + protected RepositoryDto getCreateItem() { - Repository repository = new Repository(); + RepositoryDto repository = new RepositoryDto(); repository.setName("create-test-repo"); repository.setType("svn"); @@ -217,7 +212,7 @@ public class RepositorySimplePermissionITCase @Override protected String getDeletePath() { - return "repositories/".concat(REPOSITORY_UUID); + return "repositories/".concat(REPOSITORY_PATH); } /** @@ -229,7 +224,7 @@ public class RepositorySimplePermissionITCase @Override protected String getGetPath() { - return "repositories/".concat(REPOSITORY_UUID); + return "repositories/".concat(REPOSITORY_PATH); } /** @@ -239,11 +234,12 @@ public class RepositorySimplePermissionITCase * @return */ @Override - protected Repository getModifyItem() + protected RepositoryDto getModifyItem() { - Repository repository = new Repository(); + RepositoryDto repository = new RepositoryDto(); repository.setName("test-repo"); + repository.setNamespace("scmadmin"); repository.setType("git"); repository.setDescription("Test Repository"); @@ -259,6 +255,11 @@ public class RepositorySimplePermissionITCase @Override protected String getModifyPath() { - return "repositories/".concat(REPOSITORY_UUID); + return "repositories/".concat(REPOSITORY_PATH); + } + + @Override + protected String getMediaType() { + return VndMediaType.REPOSITORY; } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java index 8e356152be..80ee615fc5 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java @@ -36,39 +36,13 @@ package sonia.scm.it; import org.junit.runners.Parameterized.Parameters; -import sonia.scm.util.IOUtil; +import java.util.Collection; //~--- JDK imports ------------------------------------------------------------ -import java.util.ArrayList; -import java.util.Collection; - -/** - * - * @author Sebastian Sdorra - */ -public class RepositoryTypeITCaseBase -{ - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - Collection params = new ArrayList(); - - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); - - if (IOUtil.search("hg") != null) - { - params.add(new String[] { "hg" }); - } - - return params; +public class RepositoryTypeITCaseBase { + @Parameters(name = "{0}") + public static Collection createParameters() { + return IntegrationTestUtil.createRepositoryTypeParameters(); } } diff --git a/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java b/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java new file mode 100644 index 0000000000..a881ae2009 --- /dev/null +++ b/scm-webapp/src/test/java/sonia/scm/it/ScmClient.java @@ -0,0 +1,37 @@ +package sonia.scm.it; + +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.WebResource; + +import java.util.Base64; + +import static sonia.scm.it.IntegrationTestUtil.createClient; + +public class ScmClient { + private final String user; + private final String password; + + private final Client client; + + public static ScmClient anonymous() { + return new ScmClient(null, null); + } + + public ScmClient(String user, String password) { + this.user = user; + this.password = password; + this.client = createClient(); + } + + public WebResource.Builder resource(String url) { + if (user == null) { + return client.resource(url).getRequestBuilder(); + } else { + return client.resource(url).header("Authorization", createAuthHeaderValue()); + } + } + + public String createAuthHeaderValue() { + return "Basic " + Base64.getEncoder().encodeToString((user +":"+ password).getBytes()); + } +} diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java deleted file mode 100644 index 9a749c6456..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java +++ /dev/null @@ -1,297 +0,0 @@ -/** - * 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.AfterClass; -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; - -import java.util.Collection; - -import javax.ws.rs.core.MediaType; - -/** - * - * @author Sebastian Sdorra - */ -public class UserITCase extends AbstractAdminITCaseBase -{ - - /** - * Method description - * - */ - @AfterClass - public static void cleanup() - { - Client client = createClient(); - - authenticateAdmin(client); - createResource(client, "users/slarti").delete(); - client.destroy(); - } - - /** - * Method description - * - */ - @Test - public void create() - { - User slarti = UserTestData.createSlarti(); - - slarti.setPassword("slarti123"); - createUser(slarti); - } - - /** - * Method description - * - */ - @Test - public void delete() - { - User dent = UserTestData.createDent(); - - createUser(dent); - deleteUser(dent); - } - - /** - * Method description - * - */ - @Test - public void modify() - { - User marvin = UserTestData.createMarvin(); - - createUser(marvin); - marvin = getUser(marvin.getName()); - marvin.setDisplayName("Paranoid Android"); - - WebResource wr = createResource(client, "users/".concat(marvin.getName())); - ClientResponse response = - wr.type(MediaType.APPLICATION_XML).put(ClientResponse.class, marvin); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - - User other = getUser(marvin.getName()); - - assertEquals(marvin.getDisplayName(), other.getDisplayName()); - assertNotNull(other.getLastModified()); - deleteUser(marvin); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - */ - @Test - public void get() - { - User scmadmin = getUser("scmadmin"); - - testAdmin(scmadmin); - } - - /** - * Method description - * - */ - @Test - public void getAll() - { - WebResource wr = createResource(client, "users"); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - assertEquals(200, response.getStatus()); - - Collection users = - response.getEntity(new GenericType>() {} - ); - - response.close(); - assertNotNull(users); - assertFalse(users.isEmpty()); - - User admin = null; - - for (User user : users) - { - if (user.getName().equals("scmadmin")) - { - admin = user; - } - } - - testAdmin(admin); - } - - //~--- 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("scmadmin", user.getName()); - assertTrue(user.isAdmin()); - - Collection types = state.getRepositoryTypes(); - - assertNotNull(types); - assertFalse(types.isEmpty()); - } - - /** - * Method description - * - * - * @param user - */ - private void createUser(User user) - { - WebResource wr = createResource(client, "users"); - ClientResponse response = - wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, user); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - response.close(); - - User other = getUser(user.getName()); - - assertEquals(user.getName(), other.getName()); - assertEquals(user.getDisplayName(), other.getDisplayName()); - assertEquals(user.getMail(), other.getMail()); - assertNotNull(other.getType()); - assertNotNull(other.getCreationDate()); - } - - /** - * Method description - * - * - * @param user - */ - private void deleteUser(User user) - { - WebResource wr = createResource(client, "users/".concat(user.getName())); - ClientResponse response = wr.delete(ClientResponse.class); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - response.close(); - wr = createResource(client, "users/".concat(user.getName())); - response = wr.get(ClientResponse.class); - assertNotNull(response); - assertEquals(404, response.getStatus()); - response.close(); - } - - /** - * Method description - * - * - * @param user - */ - private void testAdmin(User user) - { - assertNotNull(user); - assertEquals(user.getName(), "scmadmin"); - assertTrue(user.isAdmin()); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param username - * - * @return - */ - private User getUser(String username) - { - WebResource wr = createResource(client, "users/".concat(username)); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - assertEquals(200, response.getStatus()); - - User user = response.getEntity(User.class); - - response.close(); - assertNotNull(user); - - return user; - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java new file mode 100644 index 0000000000..78667c516c --- /dev/null +++ b/scm-webapp/src/test/java/sonia/scm/it/UserITUtil.java @@ -0,0 +1,13 @@ +package sonia.scm.it; + +import com.sun.jersey.api.client.ClientResponse; +import sonia.scm.user.User; +import sonia.scm.web.VndMediaType; + +import static sonia.scm.it.IntegrationTestUtil.post; + +public class UserITUtil { + public static ClientResponse postUser(ScmClient client, User user) { + return post(client, "users", VndMediaType.USER, user); + } +} diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java index 45bd0ebd9d..dc960c1b42 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/UserPermissionITCase.java @@ -35,11 +35,20 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- +import com.sun.jersey.api.client.ClientResponse; +import de.otto.edison.hal.HalRepresentation; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - +import sonia.scm.api.rest.ObjectMapperProvider; import sonia.scm.user.User; import sonia.scm.user.UserTestData; +import sonia.scm.web.VndMediaType; + +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @@ -55,7 +64,7 @@ public class UserPermissionITCase extends AbstractPermissionITCaseBase * * @param credentials */ - public UserPermissionITCase(Credentials credentials) + public UserPermissionITCase(Credentials credentials, String ignore_testCaseName) { super(credentials); } @@ -140,4 +149,31 @@ public class UserPermissionITCase extends AbstractPermissionITCaseBase { return "users/scmadmin"; } + + @Override + protected String getMediaType() { + return VndMediaType.USER; + } + + @Override + protected void checkGetAllResponse(ClientResponse response) + { + if (!credentials.isAnonymous()) + { + assertNotNull(response); + assertEquals(200, response.getStatus()); + + HalRepresentation repositories = + null; + try { + repositories = new ObjectMapperProvider().get().readValue(response.getEntity(String.class), HalRepresentation.class); + } catch (IOException e) { + throw new RuntimeException(e); + } + + assertNotNull(repositories); + assertTrue(repositories.getEmbedded().getItemsBy("users").isEmpty()); + response.close(); + } + } } diff --git a/scm-webapp/src/test/resources/repository-git.json b/scm-webapp/src/test/resources/repository-git.json new file mode 100644 index 0000000000..3fc491ac01 --- /dev/null +++ b/scm-webapp/src/test/resources/repository-git.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-git", + "archived": false, + "type": "git" +} diff --git a/scm-webapp/src/test/resources/repository-hg.json b/scm-webapp/src/test/resources/repository-hg.json new file mode 100644 index 0000000000..cf1be4cc2e --- /dev/null +++ b/scm-webapp/src/test/resources/repository-hg.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-hg", + "archived": false, + "type": "hg" +} diff --git a/scm-webapp/src/test/resources/repository-svn.json b/scm-webapp/src/test/resources/repository-svn.json new file mode 100644 index 0000000000..97e2aa6074 --- /dev/null +++ b/scm-webapp/src/test/resources/repository-svn.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-svn", + "archived": false, + "type": "svn" +} From 62f8509e855dca933b73cd8d6e864c89dd973263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 Aug 2018 09:38:13 +0200 Subject: [PATCH 04/19] Introduce new integration test module --- pom.xml | 1 + scm-it/pom.xml | 173 ++++++++++++++++ scm-it/src/main/conf/jetty.xml | 72 +++++++ .../test/java/sonia/scm/it/RegExMatcher.java | 29 +++ .../java/sonia/scm/it/RepositoriesITCase.java | 153 ++++++++++++++ .../src/test/java/sonia/scm/it/RestUtil.java | 68 ++++++ .../src/test/java/sonia/scm/it/TestData.java | 74 +++++++ scm-it/src/test/resources/repository-git.json | 7 + scm-it/src/test/resources/repository-hg.json | 7 + scm-it/src/test/resources/repository-svn.json | 7 + .../sonia/scm/it/GetRepositoriesITCase.java | 196 ------------------ 11 files changed, 591 insertions(+), 196 deletions(-) create mode 100644 scm-it/pom.xml create mode 100644 scm-it/src/main/conf/jetty.xml create mode 100644 scm-it/src/test/java/sonia/scm/it/RegExMatcher.java create mode 100644 scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java create mode 100644 scm-it/src/test/java/sonia/scm/it/RestUtil.java create mode 100644 scm-it/src/test/java/sonia/scm/it/TestData.java create mode 100644 scm-it/src/test/resources/repository-git.json create mode 100644 scm-it/src/test/resources/repository-hg.json create mode 100644 scm-it/src/test/resources/repository-svn.json delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java diff --git a/pom.xml b/pom.xml index af38d5175a..788abaca36 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,7 @@ scm-ui scm-webapp scm-server + scm-it diff --git a/scm-it/pom.xml b/scm-it/pom.xml new file mode 100644 index 0000000000..ab68517a9d --- /dev/null +++ b/scm-it/pom.xml @@ -0,0 +1,173 @@ + + + + 4.0.0 + + + sonia.scm + scm + 2.0.0-SNAPSHOT + + + sonia.scm + scm-it + jar + 2.0.0-SNAPSHOT + scm-it + + + + sonia.scm + scm-core + 2.0.0-SNAPSHOT + + + io.rest-assured + rest-assured + 3.1.0 + test + + + + + + + + com.mycila.maven-license-plugin + maven-license-plugin + 1.9.0 + +
http://download.scm-manager.org/licenses/mvn-license.txt
+ + src/** + **/test/** + + + target/** + .hg/** + src/main/webapp/resources/extjs/** + src/main/webapp/resources/syntaxhighlighter/** + src/main/webapp/resources/moment/** + **/*.mustache + + true + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.maven.version} + + 8005 + STOP + + + scm.home + ${scm.home} + + + scm.stage + ${scm.stage} + + + java.awt.headless + true + + + + /scm + + ${project.basedir}/src/main/conf/jetty.xml + 0 + + + + + scm-it + + + + + + + + + it + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.12 + + + sonia/scm/it/*ITCase.java + + + + + integration-test + + integration-test + + + + verify + + verify + + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.maven.version} + + 8085 + STOP + + + scm.home + target/scm-it + + + scm.stage + ${scm.stage} + + + ${project.basedir}/src/main/conf/jetty.xml + ${project.basedir}/../scm-webapp/target/scm-webapp.war + 0 + true + + + + start-jetty + pre-integration-test + + deploy-war + + + + stop-jetty + post-integration-test + + stop + + + + + + + + + + + + + diff --git a/scm-it/src/main/conf/jetty.xml b/scm-it/src/main/conf/jetty.xml new file mode 100644 index 0000000000..ec7ac555c8 --- /dev/null +++ b/scm-it/src/main/conf/jetty.xml @@ -0,0 +1,72 @@ + + + + + + + + + 16384 + 16384 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java b/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java new file mode 100644 index 0000000000..e5dc7931d3 --- /dev/null +++ b/scm-it/src/test/java/sonia/scm/it/RegExMatcher.java @@ -0,0 +1,29 @@ +package sonia.scm.it; + +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; + +import java.util.regex.Pattern; + +class RegExMatcher extends BaseMatcher { + public static Matcher matchesPattern(String pattern) { + return new RegExMatcher(pattern); + } + + private final String pattern; + + private RegExMatcher(String pattern) { + this.pattern = pattern; + } + + @Override + public void describeTo(Description description) { + description.appendText("matching to regex pattern \"" + pattern + "\""); + } + + @Override + public boolean matches(Object o) { + return Pattern.compile(pattern).matcher(o.toString()).matches(); + } +} diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java new file mode 100644 index 0000000000..6e309e1ba6 --- /dev/null +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -0,0 +1,153 @@ +/** + * 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.apache.http.HttpStatus; +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import sonia.scm.util.IOUtil; +import sonia.scm.web.VndMediaType; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; + +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; +import static sonia.scm.it.RegExMatcher.matchesPattern; +import static sonia.scm.it.RestUtil.createResourceUrl; +import static sonia.scm.it.RestUtil.given; +import static sonia.scm.it.RestUtil.readJson; + +@RunWith(Parameterized.class) +public class RepositoriesITCase { + + private final String repositoryType; + + public RepositoriesITCase(String repositoryType) { + this.repositoryType = repositoryType; + } + + @Parameters(name = "{0}") + public static Collection createParameters() { + Collection params = new ArrayList<>(); + + params.add(new String[]{"git"}); + params.add(new String[]{"svn"}); + + if (IOUtil.search("hg") != null) { + params.add(new String[]{"hg"}); + } + + return params; + } + + @After + public void cleanup() { + TestData.cleanup(); + } + + @Test + public void shouldCreateSuccessfully() throws IOException { + String repositoryUrl = createRepository(); + + given(VndMediaType.REPOSITORY) + + .when() + .get(repositoryUrl) + + .then() + .statusCode(HttpStatus.SC_OK) + .body( + "name", equalTo("HeartOfGold-" + repositoryType), + "type", equalTo(repositoryType), + "creationDate", matchesPattern("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+Z"), + "lastModified", is(nullValue()), + "_links.self.href", equalTo(repositoryUrl) + ); + } + + @Test + public void shouldDeleteSuccessfully() throws IOException { + String repositoryUrl = createRepository(); + + given(VndMediaType.REPOSITORY) + + .when() + .delete(repositoryUrl) + + .then() + .statusCode(HttpStatus.SC_NO_CONTENT); + + given(VndMediaType.REPOSITORY) + + .when() + .get(repositoryUrl) + + .then() + .statusCode(HttpStatus.SC_NOT_FOUND); + } + + @Test + public void shouldRejectMultipleCreations() throws IOException { + String repositoryJson = readJson("repository-" + repositoryType + ".json"); + createRepository(); + + given(VndMediaType.REPOSITORY) + .body(repositoryJson) + + .when() + .post(createResourceUrl("repositories")) + + .then() + .statusCode(HttpStatus.SC_CONFLICT); + } + + private String createRepository() throws IOException { + return given(VndMediaType.REPOSITORY) + .body(readJson("repository-" + repositoryType + ".json")) + + .when() + .post(createResourceUrl("repositories")) + + .then() + .statusCode(HttpStatus.SC_CREATED) + .extract() + .header("location"); + } +} diff --git a/scm-it/src/test/java/sonia/scm/it/RestUtil.java b/scm-it/src/test/java/sonia/scm/it/RestUtil.java new file mode 100644 index 0000000000..a902c8985c --- /dev/null +++ b/scm-it/src/test/java/sonia/scm/it/RestUtil.java @@ -0,0 +1,68 @@ +package sonia.scm.it; + +import com.google.common.io.Resources; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; + +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URI; +import java.net.URL; +import java.nio.charset.Charset; + +import static java.util.Arrays.asList; + +public class RestUtil { + + public static final String BASE_URL = "http://localhost:8081/scm/"; + public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/"); + + public static Response lastResponse; + + public static URI createResourceUrl(String url) + { + return URI.create(REST_BASE_URL).resolve(url); + } + + public static String readJson(String jsonFileName) throws IOException { + URL url = Resources.getResource(jsonFileName); + return Resources.toString(url, Charset.forName("UTF-8")); + } + + public static RequestSpecification given(String mediaType) { + RequestSpecification requestSpecification = RestAssured.given() + .contentType(mediaType) + .accept(mediaType) + .auth().preemptive().basic("scmadmin", "scmadmin"); + return wrapRequestSpecification(requestSpecification); + } + + private static RequestSpecification wrapRequestSpecification(RequestSpecification requestSpecification) { + return (RequestSpecification) Proxy.newProxyInstance(RestUtil.class.getClassLoader(), new Class[]{RequestSpecification.class}, new RequestSpecificationWrapper(requestSpecification)); + } + + private static class RequestSpecificationWrapper implements InvocationHandler { + + private final RequestSpecification delegate; + + private RequestSpecificationWrapper(RequestSpecification delegate) { + this.delegate = delegate; + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws InvocationTargetException, IllegalAccessException { + if (asList("get", "put", "post", "delete").contains(method.getName())) { + lastResponse = (Response) method.invoke(delegate, args); + return lastResponse; + } else if (method.getReturnType().equals(RequestSpecification.class)) { + return wrapRequestSpecification((RequestSpecification) method.invoke(delegate, args)); + } else { + return method.invoke(delegate, args); + } + } + } +} diff --git a/scm-it/src/test/java/sonia/scm/it/TestData.java b/scm-it/src/test/java/sonia/scm/it/TestData.java new file mode 100644 index 0000000000..4127b74b9d --- /dev/null +++ b/scm-it/src/test/java/sonia/scm/it/TestData.java @@ -0,0 +1,74 @@ +package sonia.scm.it; + +import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import sonia.scm.web.VndMediaType; + +import java.util.List; + +import static java.util.Arrays.asList; +import static sonia.scm.it.RestUtil.createResourceUrl; +import static sonia.scm.it.RestUtil.given; + +public class TestData { + + private static final Logger LOG = LoggerFactory.getLogger(TestData.class); + + private static final List PROTECTED_USERS = asList("scmadmin", "anonymous"); + + public static void cleanup() { + cleanupRepositories(); + cleanupGroups(); + cleanupUsers(); + } + + public static void cleanupRepositories() { + List repositories = given(VndMediaType.REPOSITORY_COLLECTION) + .when() + .get(createResourceUrl("repositories")) + .then() + .statusCode(HttpStatus.SC_OK) + .extract() + .body().jsonPath().getList("_embedded.repositories._links.self.href"); + LOG.info("about to delete {} repositories", repositories.size()); + repositories.forEach(TestData::delete); + } + + public static void cleanupGroups() { + List groups = given(VndMediaType.GROUP_COLLECTION) + .when() + .get(createResourceUrl("groups")) + .then() + .statusCode(HttpStatus.SC_OK) + .extract() + .body().jsonPath().getList("_embedded.groups._links.self.href"); + LOG.info("about to delete {} groups", groups.size()); + groups.forEach(TestData::delete); + } + + public static void cleanupUsers() { + List users = given(VndMediaType.USER_COLLECTION) + .when() + .get(createResourceUrl("users")) + .then() + .statusCode(HttpStatus.SC_OK) + .extract() + .body().jsonPath().getList("_embedded.users._links.self.href"); + LOG.info("about to delete {} users", users.size()); + users.stream().filter(url -> PROTECTED_USERS.stream().noneMatch(url::contains)).forEach(TestData::delete); + } + + public static void delete(String url) { + given(VndMediaType.REPOSITORY) + .when() + .delete(url) + .then() + .statusCode(HttpStatus.SC_NO_CONTENT); + LOG.info("deleted {}", url); + } + + public static void main(String[] args) { + cleanup(); + } +} diff --git a/scm-it/src/test/resources/repository-git.json b/scm-it/src/test/resources/repository-git.json new file mode 100644 index 0000000000..3fc491ac01 --- /dev/null +++ b/scm-it/src/test/resources/repository-git.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-git", + "archived": false, + "type": "git" +} diff --git a/scm-it/src/test/resources/repository-hg.json b/scm-it/src/test/resources/repository-hg.json new file mode 100644 index 0000000000..cf1be4cc2e --- /dev/null +++ b/scm-it/src/test/resources/repository-hg.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-hg", + "archived": false, + "type": "hg" +} diff --git a/scm-it/src/test/resources/repository-svn.json b/scm-it/src/test/resources/repository-svn.json new file mode 100644 index 0000000000..97e2aa6074 --- /dev/null +++ b/scm-it/src/test/resources/repository-svn.json @@ -0,0 +1,7 @@ +{ + "contact": "zaphod.beeblebrox@hitchhiker.com", + "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", + "name": "HeartOfGold-svn", + "archived": false, + "type": "svn" +} diff --git a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java deleted file mode 100644 index 6978c897f8..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/GetRepositoriesITCase.java +++ /dev/null @@ -1,196 +0,0 @@ -/** - * 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.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; -import sonia.scm.util.IOUtil; - -import static org.junit.Assert.*; - -import static sonia.scm.it.IntegrationTestUtil.*; -import static sonia.scm.it.RepositoryITUtil.*; - -//~--- JDK imports ------------------------------------------------------------ - -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; - -import java.io.IOException; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -public class GetRepositoriesITCase extends AbstractAdminITCaseBase -{ - - /** - * Constructs ... - * - * - * @param repositoryType - */ - public GetRepositoriesITCase(String repositoryType) - { - this.repositoryType = repositoryType; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Parameters - public static Collection createParameters() - { - Collection params = new ArrayList(); - - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); - - if (IOUtil.search("hg") != null) - { - params.add(new String[] { "hg" }); - } - - return params; - } - - /** - * Method description - * - * - * @throws IOException - */ - @After - public void cleanup() throws IOException - { - deleteRepository(client, repository.getId()); - } - - /** - * Method description - * - */ - @Test - public void testGetById() - { - repository = RepositoryTestData.createHeartOfGold(repositoryType); - repository = createRepository(client, repository); - - String id = repository.getId(); - - assertNotNull(id); - - Repository r = getRepositoryById(client, id); - - assertEquals(id, r.getId()); - } - - /** - * Method description - * - */ - @Test - public void testGetByTypeAndName() - { - repository = RepositoryTestData.create42Puzzle(repositoryType); - testGetByTypeAndName(repository); - } - - /** - * Method description - * - */ - @Test - public void testGetByTypeAndNameWithDirectoryStructure() - { - repository = - RepositoryTestData.createRestaurantAtTheEndOfTheUniverse(repositoryType); - repository.setName("test/".concat(repository.getName())); - testGetByTypeAndName(repository); - } - - /** - * Method description - * - * - * @param repository - */ - private void testGetByTypeAndName(Repository repo) - { - repository = createRepository(client, repo); - - String name = repository.getName(); - WebResource wr = createResource( - client, - "repositories/".concat(repositoryType).concat( - "/").concat(name)); - ClientResponse response = wr.get(ClientResponse.class); - - assertNotNull(response); - - Repository r = response.getEntity(Repository.class); - - response.close(); - assertNotNull(r); - assertEquals(repository.getId(), r.getId()); - assertEquals(repository.getName(), r.getName()); - assertEquals(repository.getType(), r.getType()); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private Repository repository; - - /** Field description */ - private String repositoryType; -} From e60bea5f08212287b69e41e9f2da9f72b77e904a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 Aug 2018 10:42:47 +0200 Subject: [PATCH 05/19] Simplify scm test parameters --- .../java/sonia/scm/it/RepositoriesITCase.java | 15 ++----------- .../ScmParameterizedIntegrationTestUtil.java | 21 +++++++++++++++++++ .../sonia/scm/it/IntegrationTestUtil.java | 17 +++++---------- .../sonia/scm/it/RepositoryHookITCase.java | 2 +- .../sonia/scm/it/RepositoryITCaseBase.java | 4 ++-- .../scm/it/RepositoryTypeITCaseBase.java | 2 +- 6 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index 6e309e1ba6..f4d0b7586b 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -39,11 +39,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import sonia.scm.util.IOUtil; import sonia.scm.web.VndMediaType; import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; import static org.hamcrest.Matchers.equalTo; @@ -64,17 +62,8 @@ public class RepositoriesITCase { } @Parameters(name = "{0}") - public static Collection createParameters() { - Collection params = new ArrayList<>(); - - params.add(new String[]{"git"}); - params.add(new String[]{"svn"}); - - if (IOUtil.search("hg") != null) { - params.add(new String[]{"hg"}); - } - - return params; + public static Collection createParameters() { + return ScmParameterizedIntegrationTestUtil.createParameters(); } @After diff --git a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java b/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java new file mode 100644 index 0000000000..d8b43aef30 --- /dev/null +++ b/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java @@ -0,0 +1,21 @@ +package sonia.scm.it; + +import sonia.scm.util.IOUtil; + +import java.util.ArrayList; +import java.util.Collection; + +class ScmParameterizedIntegrationTestUtil { + static Collection createParameters() { + Collection params = new ArrayList<>(); + + params.add("git"); + params.add("svn"); + + if (IOUtil.search("hg") != null) { + params.add("hg"); + } + + return params; + } +} diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java index 4db5896598..1f75f93d48 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java @@ -162,22 +162,15 @@ public final class IntegrationTestUtil client.getAddCommand().add(name); } - /** - * Method description - * - * - * @return - */ - public static Collection createRepositoryTypeParameters() - { - Collection params = new ArrayList<>(); + public static Collection createRepositoryTypeParameters() { + Collection params = new ArrayList<>(); - params.add(new String[] { "git" }); - params.add(new String[] { "svn" }); + params.add("git"); + params.add("svn" ); if (IOUtil.search("hg") != null) { - params.add(new String[] { "hg" }); + params.add("hg"); } return params; diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java index 6ba4d572b2..d6e8a0d2fe 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java @@ -200,7 +200,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase * @return repository types test parameter */ @Parameters(name = "{0}") - public static Collection createParameters() + public static Collection createParameters() { return IntegrationTestUtil.createRepositoryTypeParameters(); } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java index c227fb5e4b..06d1f1be8e 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java @@ -54,6 +54,7 @@ import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME; import static sonia.scm.it.IntegrationTestUtil.commit; import static sonia.scm.it.IntegrationTestUtil.createAdminClient; import static sonia.scm.it.IntegrationTestUtil.createRandomFile; +import static sonia.scm.it.IntegrationTestUtil.createRepositoryTypeParameters; import static sonia.scm.it.IntegrationTestUtil.createResource; import static sonia.scm.it.IntegrationTestUtil.createTempDirectory; import static sonia.scm.it.IntegrationTestUtil.readJson; @@ -200,8 +201,7 @@ public class RepositoryITCaseBase User noperm = UserTestData.createPerfect(); createUser(noperm); - IntegrationTestUtil.createRepositoryTypeParameters().stream().map(array -> array[0]) - .forEach(t -> appendTestParameter(params, t, owner, write, read, noperm)); + createRepositoryTypeParameters().forEach(t -> appendTestParameter(params, t, owner, write, read, noperm)); return params; } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java index 80ee615fc5..ab86edafd0 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java @@ -42,7 +42,7 @@ import java.util.Collection; public class RepositoryTypeITCaseBase { @Parameters(name = "{0}") - public static Collection createParameters() { + public static Collection createParameters() { return IntegrationTestUtil.createRepositoryTypeParameters(); } } From 83005bebf4ff0a6b7e2483c9e45062ebbfc12614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 11:11:44 +0200 Subject: [PATCH 06/19] Use namespace and name instead of id in repository hooks --- .../main/java/sonia/scm/debug/DebugHook.java | 5 +- .../java/sonia/scm/debug/DebugResource.java | 24 ++-- .../java/sonia/scm/debug/DebugService.java | 30 ++--- .../sonia/scm/it/RepositoryHookITCase.java | 34 +++-- .../scm/it/RepositoryHttpCacheITCase.java | 119 ------------------ .../java/sonia/scm/it/RepositoryITUtil.java | 1 + 6 files changed, 49 insertions(+), 164 deletions(-) delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java index d75b455a95..7fe813159a 100644 --- a/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java +++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugHook.java @@ -34,13 +34,14 @@ import com.github.legman.ReferenceType; import com.github.legman.Subscribe; import com.google.common.base.Function; import com.google.common.collect.Collections2; -import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.EagerSingleton; import sonia.scm.repository.Changeset; import sonia.scm.repository.PostReceiveRepositoryHookEvent; +import javax.inject.Inject; + /** * {@link PostReceiveRepositoryHookEvent} which stores receives data and passes it to the {@link DebugService}. * @@ -78,7 +79,7 @@ public final class DebugHook LOG.trace("store changeset ids from repository", event.getRepository().getId()); debugService.put( - event.getRepository().getId(), + event.getRepository().getNamespaceAndName(), new DebugHookData(Collections2.transform( event.getContext().getChangesetProvider().getChangesetList(), IDEXTRACTOR) )); diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java index 0933242b49..6ee035bf01 100644 --- a/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java +++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugResource.java @@ -30,20 +30,22 @@ */ package sonia.scm.debug; -import java.util.Collection; +import sonia.scm.repository.NamespaceAndName; + import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.util.Collection; /** * Rest api resource for the {@link DebugService}. * * @author Sebastian Sdorra */ -@Path("debug/{repository}/post-receive") +@Path("debug/{namespace}/{name}/post-receive") public final class DebugResource { private final DebugService debugService; @@ -62,28 +64,30 @@ public final class DebugResource /** * Returns all received hook data for the given repository. * - * @param repository repository id - * + * @param namespace repository namespace + * @param name repository name + * * @return all received hook data for the given repository */ @GET @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) - public Collection getAll(@PathParam("repository") String repository){ - return debugService.getAll(repository); + public Collection getAll(@PathParam("namespace") String namespace, @PathParam("name") String name){ + return debugService.getAll(new NamespaceAndName(namespace, name)); } /** * Returns the last received hook data for the given repository. - * - * @param repository repository id + * + * @param namespace repository namespace + * @param name repository name * * @return the last received hook data for the given repository */ @GET @Path("last") @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) - public DebugHookData getLast(@PathParam("repository") String repository){ - return debugService.getLast(repository); + public DebugHookData getLast(@PathParam("namespace") String namespace, @PathParam("name") String name){ + return debugService.getLast(new NamespaceAndName(namespace, name)); } } diff --git a/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java b/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java index 31282b6b08..8e2475d802 100644 --- a/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java +++ b/scm-webapp/src/main/java/sonia/scm/debug/DebugService.java @@ -34,10 +34,12 @@ import com.google.common.collect.Iterables; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; import com.google.inject.Singleton; -import java.util.Collection; import org.apache.shiro.SecurityUtils; +import sonia.scm.repository.NamespaceAndName; import sonia.scm.security.Role; +import java.util.Collection; + /** * The DebugService stores and returns received data from repository hook events. * @@ -47,30 +49,23 @@ import sonia.scm.security.Role; public final class DebugService { - private final Multimap receivedHooks = LinkedListMultimap.create(); + private final Multimap receivedHooks = LinkedListMultimap.create(); /** * Stores {@link DebugHookData} for the given repository. - * - * @param repository repository id - * @param hookData received hook data */ - void put(String repository, DebugHookData hookData) + void put(NamespaceAndName namespaceAndName, DebugHookData hookData) { - receivedHooks.put(repository, hookData); + receivedHooks.put(namespaceAndName, hookData); } /** * Returns the last received hook data for the given repository. - * - * @param repository repository id - * - * @return the last received hook data for the given repository */ - public DebugHookData getLast(String repository){ + public DebugHookData getLast(NamespaceAndName namespaceAndName){ SecurityUtils.getSubject().checkRole(Role.ADMIN); DebugHookData hookData = null; - Collection receivedHookData = receivedHooks.get(repository); + Collection receivedHookData = receivedHooks.get(namespaceAndName); if (receivedHookData != null && ! receivedHookData.isEmpty()){ hookData = Iterables.getLast(receivedHookData); } @@ -79,14 +74,9 @@ public final class DebugService /** * Returns all received hook data for the given repository. - * - * @param repository repository id - * - * @return all received hook data for the given repository */ - public Collection getAll(String repository){ + public Collection getAll(NamespaceAndName namespaceAndName){ SecurityUtils.getSubject().checkRole(Role.ADMIN); - return receivedHooks.get(repository); + return receivedHooks.get(namespaceAndName); } - } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java index d6e8a0d2fe..2be3bfd81b 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java @@ -32,6 +32,7 @@ package sonia.scm.it; import com.google.common.base.Charsets; import com.google.common.io.Files; +import com.sun.jersey.api.client.WebResource; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -42,6 +43,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import sonia.scm.api.v2.resources.RepositoryDto; +import sonia.scm.debug.DebugHookData; import sonia.scm.repository.Changeset; import sonia.scm.repository.Person; import sonia.scm.repository.client.api.ClientCommand; @@ -52,6 +54,12 @@ import java.io.File; import java.io.IOException; import java.util.Collection; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.core.AllOf.allOf; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static sonia.scm.it.IntegrationTestUtil.createResource; import static sonia.scm.it.IntegrationTestUtil.readJson; import static sonia.scm.it.RepositoryITUtil.createRepository; import static sonia.scm.it.RepositoryITUtil.deleteRepository; @@ -129,10 +137,10 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase Thread.sleep(WAIT_TIME); // check debug servlet for pushed commit -// WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); -// DebugHookData data = wr.get(DebugHookData.class); -// assertNotNull(data); -// assertThat(data.getChangesets(), contains(changeset.getId())); + WebResource.Builder wr = createResource(client, "../debug/" + repository.getNamespace() + "/" + repository.getName() + "/post-receive/last"); + DebugHookData data = wr.get(DebugHookData.class); + assertNotNull(data); + assertThat(data.getChangesets(), contains(changeset.getId())); } /** @@ -164,15 +172,15 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase Thread.sleep(WAIT_TIME); // check debug servlet that only one commit is present -// WebResource wr = createResource(client, "debug/" + repository.getId() + "/post-receive/last"); -// DebugHookData data = wr.get(DebugHookData.class); -// assertNotNull(data); -// assertThat(data.getChangesets(), allOf( -// contains(b.getId()), -// not( -// contains(a.getId()) -// ) -// )); + WebResource.Builder wr = createResource(client, "../debug/" + repository.getNamespace() + "/" + repository.getName() + "/post-receive/last"); + DebugHookData data = wr.get(DebugHookData.class); + assertNotNull(data); + assertThat(data.getChangesets(), allOf( + contains(b.getId()), + not( + contains(a.getId()) + ) + )); } private Changeset commit(String message) throws IOException { diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java deleted file mode 100644 index 7f22366ecb..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHttpCacheITCase.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * 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 com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; -import org.junit.Ignore; -import sonia.scm.repository.Repository; -import sonia.scm.repository.RepositoryTestData; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static sonia.scm.it.IntegrationTestUtil.createAdminClient; -import static sonia.scm.it.IntegrationTestUtil.createResource; - -//~--- JDK imports ------------------------------------------------------------ - -/** - * - * @author Sebastian Sdorra - */ -@Ignore() -public class RepositoryHttpCacheITCase extends HttpCacheITCaseBase -{ - - /** - * Method description - * - * - * @return - */ - @Override - protected Repository createSampleItem() - { - Repository repository = RepositoryTestData.createHeartOfGold("git"); - ScmClient client = createAdminClient(); - WebResource.Builder resource = createResource(client, "repositories"); - ClientResponse response = resource.post(ClientResponse.class, repository); - - assertNotNull(response); - assertEquals(201, response.getStatus()); - - String location = response.getHeaders().get("Location").get(0); - - assertNotNull(location); - response = client.resource(location).get(ClientResponse.class); - assertNotNull(response); - assertEquals(200, response.getStatus()); - repository = response.getEntity(Repository.class); - assertNotNull(repository); - assertNotNull(repository.getId()); - - return repository; - } - - /** - * Method description - * - * - * @param item - */ - @Override - protected void destroy(Repository item) - { - ScmClient client = createAdminClient(); - WebResource.Builder resource = createResource(client, - "repositories/".concat(item.getId())); - ClientResponse response = resource.delete(ClientResponse.class); - - assertNotNull(response); - assertEquals(204, response.getStatus()); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - @Override - protected String getCollectionUrlPart() - { - return "repositories"; - } -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java index 05915f3b67..9284beebd0 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java @@ -76,6 +76,7 @@ public final class RepositoryITUtil assertNotNull(other); assertNotNull(other.getType()); + assertNotNull(other.getNamespace()); assertNotNull(other.getCreationDate()); return other; From 1f1ecb6f9b167788fd08e5376205d29fde84c7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 11:27:56 +0200 Subject: [PATCH 07/19] Delete cache integration tests --- .../sonia/scm/it/HttpCacheITCaseBase.java | 244 ------------------ .../scm/it/RepositoryExtendedITCase.java | 183 ------------- 2 files changed, 427 deletions(-) delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java diff --git a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java deleted file mode 100644 index c2b43465c3..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/HttpCacheITCaseBase.java +++ /dev/null @@ -1,244 +0,0 @@ -/** - * 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 com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; -import org.junit.After; -import org.junit.Test; - -import javax.ws.rs.core.EntityTag; -import java.util.Date; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static sonia.scm.it.IntegrationTestUtil.createAdminClient; -import static sonia.scm.it.IntegrationTestUtil.createResource; - -//~--- JDK imports ------------------------------------------------------------ - -/** - * - * @author Sebastian Sdorra - * - * @param - */ -public abstract class HttpCacheITCaseBase -{ - - /** - * Method description - * - * - * @return - */ - protected abstract T createSampleItem(); - - /** - * Method description - * - * - * @param item - */ - protected abstract void destroy(T item); - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - protected abstract String getCollectionUrlPart(); - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - */ - @Test - public void changingCollectionETagTest() - { - ClientResponse response = getCollectionResponse(); - String etag = getETag(response); - - item = createSampleItem(); - response = getCollectionResponse(); - - String otherEtag = getETag(response); - - assertThat(etag, not(equalTo(otherEtag))); - } - - /** - * Method description - * - * - * @throws InterruptedException - */ - @Test - public void changingCollectionLastModifiedTest() throws InterruptedException - { - ClientResponse response = getCollectionResponse(); - long lastModified = getLastModified(response); - - // wait 1 second because http date is not millisecond precision - Thread.sleep(1000l); - item = createSampleItem(); - response = getCollectionResponse(); - - long otherLastModified = getLastModified(response); - - assertNotEquals(lastModified, otherLastModified); - } - - /** - * Method description - * - */ - @After - public void cleanup() - { - if (item != null) - { - destroy(item); - } - } - - /** - * Method description - * - */ - @Test - public void simpleCollectionETagTest() - { - ClientResponse response = getCollectionResponse(); - String etag = getETag(response); - - response = getCollectionResponse(); - - String otherEtag = getETag(response); - - assertEquals(etag, otherEtag); - } - - /** - * Method description - * - */ - @Test - public void simpleCollectionLastModifiedTest() - { - ClientResponse response = getCollectionResponse(); - long lastModified = getLastModified(response); - - response = getCollectionResponse(); - - long otherLastModified = getLastModified(response); - - assertEquals(lastModified, otherLastModified); - } - - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - private ClientResponse getCollectionResponse() - { - ScmClient client = createAdminClient(); - WebResource.Builder resource = createResource(client, getCollectionUrlPart()); - ClientResponse response = resource.get(ClientResponse.class); - - assertEquals(200, response.getStatus()); - - return response; - } - - /** - * Method description - * - * - * @param response - * - * @return - */ - private String getETag(ClientResponse response) - { - EntityTag e = response.getEntityTag(); - - assertNotNull(e); - - String value = e.getValue(); - - assertNotNull(value); - assertTrue(value.length() > 0); - - return value; - } - - /** - * Method description - * - * - * @param response - * - * @return - */ - private long getLastModified(ClientResponse response) - { - Date lastModified = response.getLastModified(); - - assertNotNull(lastModified); - - return lastModified.getTime(); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private T item; -} diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java deleted file mode 100644 index 7ddaf8d7b1..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryExtendedITCase.java +++ /dev/null @@ -1,183 +0,0 @@ -/** - * 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.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import sonia.scm.api.v2.resources.RepositoryDto; -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientException; -import sonia.scm.user.User; -import sonia.scm.util.IOUtil; - -import java.io.File; -import java.io.IOException; - -import static org.junit.Assert.fail; -import static sonia.scm.it.IntegrationTestUtil.createTempDirectory; - -//~--- JDK imports ------------------------------------------------------------ - -/** - * - * @author Sebastian Sdorra - */ -@RunWith(Parameterized.class) -@Ignore("permissions not yet implemented -- see RepositoryITCaseBase#createTestRepository") -public class RepositoryExtendedITCase extends RepositoryITCaseBase -{ - - /** - * Constructs ... - * - * - * @param repository - * @param owner - * @param write - * @param read - * @param noperm - * @param password - */ - public RepositoryExtendedITCase(RepositoryDto repository, User owner, - User write, User read, User noperm, - String password, String ignore_testCaseName) - { - super(repository, owner, write, read, noperm, password); - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @throws IOException - */ - @After - public void cleanupTest() throws IOException - { - IOUtil.delete(directory); - } - - /** - * Method description - * - * - * @throws IOException - */ - @Test(expected = RepositoryClientException.class) - public void readFailed() throws IOException - { - RepositoryClient rc = createRepositoryClient(nopermUser, directory); - - // rc.checkout(); - - // ugly workaround - if (repository.getType().equals("git")) - { - for (File f : directory.listFiles()) - { - if (!".git".equals(f.getName())) - { - fail("checkout works"); - } - } - - throw new IOException("checkout failed"); - } - } - - /** - * Method description - * - */ - @Before - public void setupTest() - { - directory = createTempDirectory(); - } - - /** - * Method description - * - * - * @throws IOException - */ - @Test - public void simpleRead() throws IOException - { - RepositoryClient rc = createRepositoryClient(readUser, directory); - - // rc.checkout(); - } - - /** - * Method description - * - * @throws IOException - */ - @Test - public void simpleWrite() throws IOException - { - RepositoryClient rc = createRepositoryClient(writeUser, directory); - - // rc.checkout(); - addTestFiles(rc); - } - - /** - * Method description - * - * @throws IOException - */ - @Test(expected = IOException.class) - public void writeFailed() throws IOException - { - RepositoryClient rc = createRepositoryClient(readUser, directory); - - // rc.checkout(); - addTestFiles(rc); - } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private File directory; -} From 2316e5ea7e5fe229c315ed96d69518eb21f07ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 11:28:12 +0200 Subject: [PATCH 08/19] Cleanup repository archive integration test --- .../sonia/scm/it/RepositoryArchiveITCase.java | 16 +++---- .../scm/it/RepositoryTypeITCaseBase.java | 48 ------------------- 2 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java index 9539be674f..4cf7cd6571 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java @@ -33,7 +33,6 @@ package sonia.scm.it; -//~--- non-JDK imports -------------------------------------------------------- import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -48,6 +47,7 @@ import sonia.scm.web.VndMediaType; import javax.ws.rs.core.MediaType; import java.net.URI; +import java.util.Collection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -59,15 +59,12 @@ import static sonia.scm.it.IntegrationTestUtil.serialize; import static sonia.scm.it.RepositoryITUtil.createRepository; import static sonia.scm.it.RepositoryITUtil.deleteRepository; -//~--- JDK imports ------------------------------------------------------------ - - /** * * @author Sebastian Sdorra */ @RunWith(Parameterized.class) -public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase +public class RepositoryArchiveITCase { /** @@ -83,6 +80,11 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase //~--- methods -------------------------------------------------------------- + @Parameterized.Parameters(name = "{0}") + public static Collection createParameters() { + return IntegrationTestUtil.createRepositoryTypeParameters(); + } + /** * Method description * @@ -148,8 +150,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase response.close(); } - //~--- set methods ---------------------------------------------------------- - /** * Method description * @@ -170,8 +170,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase assertEquals(204, resp.getStatus()); } - //~--- fields --------------------------------------------------------------- - /** Field description */ private ScmClient client; diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java deleted file mode 100644 index ab86edafd0..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * 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.runners.Parameterized.Parameters; - -import java.util.Collection; - -//~--- JDK imports ------------------------------------------------------------ - -public class RepositoryTypeITCaseBase { - @Parameters(name = "{0}") - public static Collection createParameters() { - return IntegrationTestUtil.createRepositoryTypeParameters(); - } -} From c87179e68665902a865964462f7f0ff0305eef86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 11:53:45 +0200 Subject: [PATCH 09/19] Build json in integration test via java ee builder --- scm-it/pom.xml | 11 ++++ .../java/sonia/scm/it/RepositoriesITCase.java | 50 ++++++++++------- .../src/test/java/sonia/scm/it/RestUtil.java | 55 ++----------------- scm-it/src/test/resources/repository-git.json | 7 --- scm-it/src/test/resources/repository-hg.json | 7 --- scm-it/src/test/resources/repository-svn.json | 7 --- 6 files changed, 46 insertions(+), 91 deletions(-) delete mode 100644 scm-it/src/test/resources/repository-git.json delete mode 100644 scm-it/src/test/resources/repository-hg.json delete mode 100644 scm-it/src/test/resources/repository-svn.json diff --git a/scm-it/pom.xml b/scm-it/pom.xml index ab68517a9d..fa4c0b1295 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -27,6 +27,17 @@ 3.1.0 test + + javax + javaee-api + 7.0 + + + org.glassfish + javax.json + 1.0.4 + runtime + diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index f4d0b7586b..4b8d3924a3 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -35,12 +35,14 @@ package sonia.scm.it; import org.apache.http.HttpStatus; 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.web.VndMediaType; +import javax.json.Json; import java.io.IOException; import java.util.Collection; @@ -50,13 +52,14 @@ import static org.hamcrest.Matchers.nullValue; import static sonia.scm.it.RegExMatcher.matchesPattern; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; -import static sonia.scm.it.RestUtil.readJson; @RunWith(Parameterized.class) public class RepositoriesITCase { private final String repositoryType; + private String repositoryUrl; + public RepositoriesITCase(String repositoryType) { this.repositoryType = repositoryType; } @@ -66,6 +69,20 @@ public class RepositoriesITCase { return ScmParameterizedIntegrationTestUtil.createParameters(); } + @Before + public void createRepository() { + this.repositoryUrl = given(VndMediaType.REPOSITORY) + .body(repositoryJson()) + + .when() + .post(createResourceUrl("repositories")) + + .then() + .statusCode(HttpStatus.SC_CREATED) + .extract() + .header("location"); + } + @After public void cleanup() { TestData.cleanup(); @@ -73,8 +90,6 @@ public class RepositoriesITCase { @Test public void shouldCreateSuccessfully() throws IOException { - String repositoryUrl = createRepository(); - given(VndMediaType.REPOSITORY) .when() @@ -92,9 +107,7 @@ public class RepositoriesITCase { } @Test - public void shouldDeleteSuccessfully() throws IOException { - String repositoryUrl = createRepository(); - + public void shouldDeleteSuccessfully() { given(VndMediaType.REPOSITORY) .when() @@ -113,10 +126,8 @@ public class RepositoriesITCase { } @Test - public void shouldRejectMultipleCreations() throws IOException { - String repositoryJson = readJson("repository-" + repositoryType + ".json"); - createRepository(); - + public void shouldRejectMultipleCreations() { + String repositoryJson = repositoryJson(); given(VndMediaType.REPOSITORY) .body(repositoryJson) @@ -127,16 +138,13 @@ public class RepositoriesITCase { .statusCode(HttpStatus.SC_CONFLICT); } - private String createRepository() throws IOException { - return given(VndMediaType.REPOSITORY) - .body(readJson("repository-" + repositoryType + ".json")) - - .when() - .post(createResourceUrl("repositories")) - - .then() - .statusCode(HttpStatus.SC_CREATED) - .extract() - .header("location"); + private String repositoryJson() { + return Json.createObjectBuilder() + .add("contact", "zaphod.beeblebrox@hitchhiker.com") + .add("description", "Heart of Gold") + .add("name", "HeartOfGold-" + repositoryType) + .add("archived", false) + .add("type", repositoryType) + .build().toString(); } } diff --git a/scm-it/src/test/java/sonia/scm/it/RestUtil.java b/scm-it/src/test/java/sonia/scm/it/RestUtil.java index a902c8985c..1458ab6d0b 100644 --- a/scm-it/src/test/java/sonia/scm/it/RestUtil.java +++ b/scm-it/src/test/java/sonia/scm/it/RestUtil.java @@ -1,68 +1,25 @@ package sonia.scm.it; -import com.google.common.io.Resources; import io.restassured.RestAssured; -import io.restassured.response.Response; import io.restassured.specification.RequestSpecification; -import java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.net.URI; -import java.net.URL; -import java.nio.charset.Charset; -import static java.util.Arrays.asList; +import static java.net.URI.create; public class RestUtil { - public static final String BASE_URL = "http://localhost:8081/scm/"; - public static final String REST_BASE_URL = BASE_URL.concat("api/rest/v2/"); + public static final URI BASE_URL = create("http://localhost:8081/scm/"); + public static final URI REST_BASE_URL = BASE_URL.resolve("api/rest/v2/"); - public static Response lastResponse; - - public static URI createResourceUrl(String url) - { - return URI.create(REST_BASE_URL).resolve(url); - } - - public static String readJson(String jsonFileName) throws IOException { - URL url = Resources.getResource(jsonFileName); - return Resources.toString(url, Charset.forName("UTF-8")); + public static URI createResourceUrl(String path) { + return REST_BASE_URL.resolve(path); } public static RequestSpecification given(String mediaType) { - RequestSpecification requestSpecification = RestAssured.given() + return RestAssured.given() .contentType(mediaType) .accept(mediaType) .auth().preemptive().basic("scmadmin", "scmadmin"); - return wrapRequestSpecification(requestSpecification); - } - - private static RequestSpecification wrapRequestSpecification(RequestSpecification requestSpecification) { - return (RequestSpecification) Proxy.newProxyInstance(RestUtil.class.getClassLoader(), new Class[]{RequestSpecification.class}, new RequestSpecificationWrapper(requestSpecification)); - } - - private static class RequestSpecificationWrapper implements InvocationHandler { - - private final RequestSpecification delegate; - - private RequestSpecificationWrapper(RequestSpecification delegate) { - this.delegate = delegate; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws InvocationTargetException, IllegalAccessException { - if (asList("get", "put", "post", "delete").contains(method.getName())) { - lastResponse = (Response) method.invoke(delegate, args); - return lastResponse; - } else if (method.getReturnType().equals(RequestSpecification.class)) { - return wrapRequestSpecification((RequestSpecification) method.invoke(delegate, args)); - } else { - return method.invoke(delegate, args); - } - } } } diff --git a/scm-it/src/test/resources/repository-git.json b/scm-it/src/test/resources/repository-git.json deleted file mode 100644 index 3fc491ac01..0000000000 --- a/scm-it/src/test/resources/repository-git.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "contact": "zaphod.beeblebrox@hitchhiker.com", - "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", - "name": "HeartOfGold-git", - "archived": false, - "type": "git" -} diff --git a/scm-it/src/test/resources/repository-hg.json b/scm-it/src/test/resources/repository-hg.json deleted file mode 100644 index cf1be4cc2e..0000000000 --- a/scm-it/src/test/resources/repository-hg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "contact": "zaphod.beeblebrox@hitchhiker.com", - "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", - "name": "HeartOfGold-hg", - "archived": false, - "type": "hg" -} diff --git a/scm-it/src/test/resources/repository-svn.json b/scm-it/src/test/resources/repository-svn.json deleted file mode 100644 index 97e2aa6074..0000000000 --- a/scm-it/src/test/resources/repository-svn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "contact": "zaphod.beeblebrox@hitchhiker.com", - "description": "Heart of Gold is the first prototype ship to successfully utilise the revolutionary Infinite Improbability Drive", - "name": "HeartOfGold-svn", - "archived": false, - "type": "svn" -} From e3d2997e7147ce614c8d161819f5a8c2cac841f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 13:48:06 +0200 Subject: [PATCH 10/19] Migrate IT for read and commit from/to repository to new module --- scm-it/pom.xml | 46 +++ .../java/sonia/scm/it/RepositoriesITCase.java | 56 ++++ .../sonia/scm/it/IntegrationTestUtil.java | 56 ---- .../sonia/scm/it/RepositoryITCaseBase.java | 311 ------------------ 4 files changed, 102 insertions(+), 367 deletions(-) delete mode 100644 scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java diff --git a/scm-it/pom.xml b/scm-it/pom.xml index fa4c0b1295..7fe464ccf5 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -21,6 +21,52 @@ scm-core 2.0.0-SNAPSHOT + + sonia.scm + scm-test + 2.0.0-SNAPSHOT + + + + sonia.scm.plugins + scm-git-plugin + 2.0.0-SNAPSHOT + test + + + sonia.scm.plugins + scm-git-plugin + 2.0.0-SNAPSHOT + tests + test + + + sonia.scm.plugins + scm-hg-plugin + 2.0.0-SNAPSHOT + test + + + sonia.scm.plugins + scm-hg-plugin + 2.0.0-SNAPSHOT + tests + test + + + sonia.scm.plugins + scm-svn-plugin + 2.0.0-SNAPSHOT + test + + + sonia.scm.plugins + scm-svn-plugin + 2.0.0-SNAPSHOT + tests + test + + io.rest-assured rest-assured diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index 4b8d3924a3..a6efc64c3f 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -36,19 +36,29 @@ package sonia.scm.it; import org.apache.http.HttpStatus; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import sonia.scm.repository.Person; +import sonia.scm.repository.client.api.ClientCommand; +import sonia.scm.repository.client.api.RepositoryClient; +import sonia.scm.repository.client.api.RepositoryClientFactory; import sonia.scm.web.VndMediaType; import javax.json.Json; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.util.Collection; +import java.util.UUID; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; import static sonia.scm.it.RegExMatcher.matchesPattern; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; @@ -56,6 +66,11 @@ import static sonia.scm.it.RestUtil.given; @RunWith(Parameterized.class) public class RepositoriesITCase { + public static final Person AUTHOR = new Person("SCM Administrator", "scmadmin@scm-manager.org"); + + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + private final String repositoryType; private String repositoryUrl; @@ -138,6 +153,47 @@ public class RepositoriesITCase { .statusCode(HttpStatus.SC_CONFLICT); } + @Test + public void shouldCloneRepository() throws IOException { + RepositoryClient rc = createRepositoryClient(); + assertEquals(1, rc.getWorkingCopy().list().length); + } + + @Test + public void shouldCommitFiles() throws IOException { + RepositoryClient rc = createRepositoryClient(); + + for (int i = 0; i < 5; i++) { + createRandomFile(rc); + } + + commit(rc, "added some test files"); + } + + public static void createRandomFile(RepositoryClient client) throws IOException { + String uuid = UUID.randomUUID().toString(); + String name = "file-" + uuid + ".uuid"; + + File file = new File(client.getWorkingCopy(), name); + try (FileOutputStream out = new FileOutputStream(file)) { + out.write(uuid.getBytes()); + } + + client.getAddCommand().add(name); + } + + public static void commit(RepositoryClient repositoryClient, String message) throws IOException { + repositoryClient.getCommitCommand().commit(AUTHOR, message); + if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) { + repositoryClient.getPushCommand().push(); + } + } + + private RepositoryClient createRepositoryClient() throws IOException { + RepositoryClientFactory clientFactory = new RepositoryClientFactory(); + return clientFactory.create(repositoryType, "http://localhost:8081/scm/" + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder()); + } + private String repositoryJson() { return Json.createObjectBuilder() .add("contact", "zaphod.beeblebrox@hitchhiker.com") diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java index 1f75f93d48..98e2e7db04 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java @@ -48,19 +48,14 @@ import de.otto.edison.hal.HalRepresentation; import sonia.scm.api.rest.JSONContextResolver; import sonia.scm.api.rest.ObjectMapperProvider; import sonia.scm.repository.Person; -import sonia.scm.repository.client.api.ClientCommand; -import sonia.scm.repository.client.api.RepositoryClient; import sonia.scm.util.IOUtil; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.net.URI; import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; -import java.util.UUID; //~--- JDK imports ------------------------------------------------------------ @@ -125,43 +120,6 @@ public final class IntegrationTestUtil } } - /** - * Commit and push changes. - * - * @param repositoryClient repository client - * @param message commit message - * - * @throws IOException - * - * @since 1.51 - */ - public static void commit(RepositoryClient repositoryClient, String message) throws IOException { - repositoryClient.getCommitCommand().commit(IntegrationTestUtil.AUTHOR, message); - if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) { - repositoryClient.getPushCommand().push(); - } - } - - /** - * Method description - * - * @param client - * - * @throws IOException - */ - public static void createRandomFile(RepositoryClient client) throws IOException - { - String uuid = UUID.randomUUID().toString(); - String name = "file-" + uuid + ".uuid"; - - File file = new File(client.getWorkingCopy(), name); - try (FileOutputStream out = new FileOutputStream(file)) { - out.write(uuid.getBytes()); - } - - client.getAddCommand().add(name); - } - public static Collection createRepositoryTypeParameters() { Collection params = new ArrayList<>(); @@ -206,20 +164,6 @@ public final class IntegrationTestUtil return URI.create(REST_BASE_URL).resolve(url); } - /** - * Method description - * - * - * @return - */ - public static File createTempDirectory() { - File directory = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); - - IOUtil.mkdirs(directory); - - return directory; - } - public static String readJson(String jsonFileName) { URL url = Resources.getResource(jsonFileName); try { diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java deleted file mode 100644 index 06d1f1be8e..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java +++ /dev/null @@ -1,311 +0,0 @@ -/** - * 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.AfterClass; -import org.junit.runners.Parameterized.Parameters; -import sonia.scm.api.v2.resources.RepositoryDto; -import sonia.scm.repository.client.api.RepositoryClient; -import sonia.scm.repository.client.api.RepositoryClientFactory; -import sonia.scm.user.User; -import sonia.scm.user.UserTestData; -import sonia.scm.util.IOUtil; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; - -import static sonia.scm.it.IntegrationTestUtil.ADMIN_PASSWORD; -import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME; -import static sonia.scm.it.IntegrationTestUtil.commit; -import static sonia.scm.it.IntegrationTestUtil.createAdminClient; -import static sonia.scm.it.IntegrationTestUtil.createRandomFile; -import static sonia.scm.it.IntegrationTestUtil.createRepositoryTypeParameters; -import static sonia.scm.it.IntegrationTestUtil.createResource; -import static sonia.scm.it.IntegrationTestUtil.createTempDirectory; -import static sonia.scm.it.IntegrationTestUtil.readJson; -import static sonia.scm.it.RepositoryITUtil.createUrl; -import static sonia.scm.it.UserITUtil.postUser; - -//~--- JDK imports ------------------------------------------------------------ - -/** - * - * @author Sebastian Sdorra - */ -public class RepositoryITCaseBase -{ - - private static final Collection CREATED_REPOSITORIES = new ArrayList<>(); - - protected User nopermUser; - protected User ownerUser; - protected String password; - protected User readUser; - protected RepositoryDto repository; - protected User writeUser; - - /** - * Constructs ... - * - * - * @param repository - * @param owner - * @param write - * @param read - * @param noperm - * @param password - */ - public RepositoryITCaseBase(RepositoryDto repository, User owner, User write, - User read, User noperm, String password) - { - this.repository = repository; - this.ownerUser = owner; - this.writeUser = write; - this.readUser = read; - this.nopermUser = noperm; - this.password = password; - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @param client - * - * @throws IOException - */ - public static void addTestFiles(RepositoryClient client) throws IOException - { - for (int i = 0; i < 5; i++) - { - createRandomFile(client); - } - - commit(client, "added some test files"); - } - - /** - * Method description - * - * @param repository - * @param username - * @param password - * - * @throws IOException - */ - public static void addTestFiles(RepositoryDto repository, String username, - String password) - { - File directory = createTempDirectory(); - - try { - RepositoryClientFactory clientFactory = new RepositoryClientFactory(); - RepositoryClient client = clientFactory.create( - repository.getType(), createUrl(repository), - username, password, directory - ); - - addTestFiles(client); - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - try { - IOUtil.delete(directory); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - /** - * Method description - * - */ - @AfterClass - public static void cleanup() - { - ScmClient client = createAdminClient(); - - deleteUser(client, UserTestData.createTrillian()); - deleteUser(client, UserTestData.createZaphod()); - deleteUser(client, UserTestData.createMarvin()); - deleteUser(client, UserTestData.createPerfect()); - - for (RepositoryDto r : CREATED_REPOSITORIES) - { - createResource(client, "repositories/" + r.getNamespace() + "/" + r.getName()).delete(); - } - } - - /** - * Method description - * - * - * @return - * - * @throws IOException - */ - @Parameters(name = "{6}") - public static Collection createParameters() throws IOException - { - Collection params = new ArrayList<>(); - User owner = UserTestData.createTrillian(); - - createUser(owner); - - User write = UserTestData.createZaphod(); - - createUser(write); - - User read = UserTestData.createMarvin(); - - createUser(read); - - User noperm = UserTestData.createPerfect(); - - createUser(noperm); - createRepositoryTypeParameters().forEach(t -> appendTestParameter(params, t, owner, write, read, noperm)); - - return params; - } - - /** - * Method description - * - * - * @param params - * @param type - * @param owner - * @param write - * @param read - * @param noperm - * - * @throws IOException - */ - private static void appendTestParameter(Collection params, - String type, User owner, User write, User read, User noperm) - { - RepositoryDto repository = createTestRepository(type, owner, write, read); - params.add(new Object[] - { - repository, owner, write, read, noperm, "secret", repository.getType() + "-" + owner.getId() - }); - } - - /** - * Method description - * - * - * - * @param type - * @param owner - * @param write - * @param read - * - * @return - * - * @throws IOException - */ - private static RepositoryDto createTestRepository(String type, - User owner, User write, User read) - { - ScmClient client = createAdminClient(); - - // TODO Activate for tests when implemented -// repository.setPermissions(Arrays.asList( -// new Permission(owner.getName(), PermissionType.OWNER), -// new Permission(write.getName(), PermissionType.WRITE), -// new Permission(read.getName(), PermissionType.READ)) -// ); - String repositoryJson = readJson("repository-" + type + ".json"); - RepositoryDto repository = RepositoryITUtil.createRepository(client, repositoryJson); - - CREATED_REPOSITORIES.add(repository); - - addTestFiles(repository, ADMIN_USERNAME, ADMIN_PASSWORD); - - return repository; - } - - /** - * Method description - * - * - * @param user - */ - private static void createUser(User user) - { - ScmClient client = createAdminClient(); - - user.setPassword("secret"); - - postUser(client, user); - } - - /** - * Method description - * - * - * @param client - * @param user - */ - private static void deleteUser(ScmClient client, User user) - { - createResource(client, "users/".concat(user.getName())).delete(); - } - - /** - * Method description - * - * - * @param user - * @param directory - * - * @return - * - * @throws IOException - */ - protected RepositoryClient createRepositoryClient(User user, File directory) throws IOException - { - RepositoryClientFactory clientFactory = new RepositoryClientFactory(); - return clientFactory.create(repository.getType(), createUrl(repository), - user.getName(), password, directory); - } -} From 62f0e3f50596588f57f98f5239fc207d7dfe72e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 14:06:36 +0200 Subject: [PATCH 11/19] Add checks to repository tests --- .../java/sonia/scm/it/RepositoriesITCase.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index a6efc64c3f..749875f122 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -155,22 +155,25 @@ public class RepositoriesITCase { @Test public void shouldCloneRepository() throws IOException { - RepositoryClient rc = createRepositoryClient(); - assertEquals(1, rc.getWorkingCopy().list().length); + RepositoryClient client = createRepositoryClient(); + assertEquals("expected metadata dir", 1, client.getWorkingCopy().list().length); } @Test public void shouldCommitFiles() throws IOException { - RepositoryClient rc = createRepositoryClient(); + RepositoryClient client = createRepositoryClient(); for (int i = 0; i < 5; i++) { - createRandomFile(rc); + createRandomFile(client); } - commit(rc, "added some test files"); + commit(client); + + RepositoryClient checkClient = createRepositoryClient(); + assertEquals("expected 5 files and metadata dir", 6, checkClient.getWorkingCopy().list().length); } - public static void createRandomFile(RepositoryClient client) throws IOException { + private static void createRandomFile(RepositoryClient client) throws IOException { String uuid = UUID.randomUUID().toString(); String name = "file-" + uuid + ".uuid"; @@ -182,8 +185,8 @@ public class RepositoriesITCase { client.getAddCommand().add(name); } - public static void commit(RepositoryClient repositoryClient, String message) throws IOException { - repositoryClient.getCommitCommand().commit(AUTHOR, message); + private static void commit(RepositoryClient repositoryClient) throws IOException { + repositoryClient.getCommitCommand().commit(AUTHOR, "commit"); if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) { repositoryClient.getPushCommand().push(); } From 07e7fd91aa7331a68ddde1955d7f28155f8664c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 14:22:07 +0200 Subject: [PATCH 12/19] Use existing constants --- scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index 749875f122..eaab0f29b7 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -60,6 +60,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; import static sonia.scm.it.RegExMatcher.matchesPattern; +import static sonia.scm.it.RestUtil.BASE_URL; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; @@ -194,7 +195,7 @@ public class RepositoriesITCase { private RepositoryClient createRepositoryClient() throws IOException { RepositoryClientFactory clientFactory = new RepositoryClientFactory(); - return clientFactory.create(repositoryType, "http://localhost:8081/scm/" + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder()); + return clientFactory.create(repositoryType, BASE_URL + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder()); } private String repositoryJson() { From 6fff26eb7647e7501983290c6d504143d932e648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 15:34:31 +0200 Subject: [PATCH 13/19] Add http protocol link to repository object response --- .../java/sonia/scm/it/RepositoriesITCase.java | 15 +++++++++++++-- .../RepositoryToRepositoryDtoMapper.java | 1 + .../sonia/scm/api/v2/resources/ResourceLinks.java | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index eaab0f29b7..44cbb9dac6 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -60,7 +60,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; import static sonia.scm.it.RegExMatcher.matchesPattern; -import static sonia.scm.it.RestUtil.BASE_URL; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; @@ -195,7 +194,19 @@ public class RepositoriesITCase { private RepositoryClient createRepositoryClient() throws IOException { RepositoryClientFactory clientFactory = new RepositoryClientFactory(); - return clientFactory.create(repositoryType, BASE_URL + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder()); + String cloneUrl = readCloneUrl(); + return clientFactory.create(repositoryType, cloneUrl, "scmadmin", "scmadmin", temporaryFolder.newFolder()); + } + + private String readCloneUrl() { + return given(VndMediaType.REPOSITORY) + + .when() + .get(repositoryUrl) + + .then() + .extract() + .path("_links.httpProtocol.href"); } private String repositoryJson() { diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java index 2f13723d39..cb89f0ea63 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java @@ -25,6 +25,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper Date: Mon, 6 Aug 2018 16:16:19 +0200 Subject: [PATCH 14/19] Move test data creation to class TestData --- .../java/sonia/scm/it/RepositoriesITCase.java | 37 +++----------- ...IntegrationTestUtil.java => ScmTypes.java} | 4 +- .../src/test/java/sonia/scm/it/TestData.java | 50 +++++++++++++++++-- 3 files changed, 55 insertions(+), 36 deletions(-) rename scm-it/src/test/java/sonia/scm/it/{ScmParameterizedIntegrationTestUtil.java => ScmTypes.java} (76%) diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java index 44cbb9dac6..cd791cb013 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java @@ -34,7 +34,6 @@ package sonia.scm.it; //~--- non-JDK imports -------------------------------------------------------- import org.apache.http.HttpStatus; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -48,7 +47,6 @@ import sonia.scm.repository.client.api.RepositoryClient; import sonia.scm.repository.client.api.RepositoryClientFactory; import sonia.scm.web.VndMediaType; -import javax.json.Json; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -62,6 +60,8 @@ import static org.junit.Assert.assertEquals; import static sonia.scm.it.RegExMatcher.matchesPattern; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; +import static sonia.scm.it.ScmTypes.availableScmTypes; +import static sonia.scm.it.TestData.repositoryJson; @RunWith(Parameterized.class) public class RepositoriesITCase { @@ -77,34 +77,21 @@ public class RepositoriesITCase { public RepositoriesITCase(String repositoryType) { this.repositoryType = repositoryType; + this.repositoryUrl = TestData.getDefaultRepositoryUrl(repositoryType); } @Parameters(name = "{0}") public static Collection createParameters() { - return ScmParameterizedIntegrationTestUtil.createParameters(); + return availableScmTypes(); } @Before public void createRepository() { - this.repositoryUrl = given(VndMediaType.REPOSITORY) - .body(repositoryJson()) - - .when() - .post(createResourceUrl("repositories")) - - .then() - .statusCode(HttpStatus.SC_CREATED) - .extract() - .header("location"); - } - - @After - public void cleanup() { - TestData.cleanup(); + TestData.createDefault(); } @Test - public void shouldCreateSuccessfully() throws IOException { + public void shouldCreateSuccessfully() { given(VndMediaType.REPOSITORY) .when() @@ -142,7 +129,7 @@ public class RepositoriesITCase { @Test public void shouldRejectMultipleCreations() { - String repositoryJson = repositoryJson(); + String repositoryJson = repositoryJson(repositoryType); given(VndMediaType.REPOSITORY) .body(repositoryJson) @@ -208,14 +195,4 @@ public class RepositoriesITCase { .extract() .path("_links.httpProtocol.href"); } - - private String repositoryJson() { - return Json.createObjectBuilder() - .add("contact", "zaphod.beeblebrox@hitchhiker.com") - .add("description", "Heart of Gold") - .add("name", "HeartOfGold-" + repositoryType) - .add("archived", false) - .add("type", repositoryType) - .build().toString(); - } } diff --git a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java b/scm-it/src/test/java/sonia/scm/it/ScmTypes.java similarity index 76% rename from scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java rename to scm-it/src/test/java/sonia/scm/it/ScmTypes.java index d8b43aef30..e8ba67e561 100644 --- a/scm-it/src/test/java/sonia/scm/it/ScmParameterizedIntegrationTestUtil.java +++ b/scm-it/src/test/java/sonia/scm/it/ScmTypes.java @@ -5,8 +5,8 @@ import sonia.scm.util.IOUtil; import java.util.ArrayList; import java.util.Collection; -class ScmParameterizedIntegrationTestUtil { - static Collection createParameters() { +class ScmTypes { + static Collection availableScmTypes() { Collection params = new ArrayList<>(); params.add("git"); diff --git a/scm-it/src/test/java/sonia/scm/it/TestData.java b/scm-it/src/test/java/sonia/scm/it/TestData.java index 4127b74b9d..b2785b2051 100644 --- a/scm-it/src/test/java/sonia/scm/it/TestData.java +++ b/scm-it/src/test/java/sonia/scm/it/TestData.java @@ -5,11 +5,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.web.VndMediaType; +import javax.json.Json; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static java.util.Arrays.asList; import static sonia.scm.it.RestUtil.createResourceUrl; import static sonia.scm.it.RestUtil.given; +import static sonia.scm.it.ScmTypes.availableScmTypes; public class TestData { @@ -17,13 +21,24 @@ public class TestData { private static final List PROTECTED_USERS = asList("scmadmin", "anonymous"); + private static Map DEFAULT_REPOSITORIES = new HashMap<>(); + + public static void createDefault() { + cleanup(); + createDefaultRepositories(); + } + public static void cleanup() { cleanupRepositories(); cleanupGroups(); cleanupUsers(); } - public static void cleanupRepositories() { + public static String getDefaultRepositoryUrl(String repositoryType) { + return DEFAULT_REPOSITORIES.get(repositoryType); + } + + private static void cleanupRepositories() { List repositories = given(VndMediaType.REPOSITORY_COLLECTION) .when() .get(createResourceUrl("repositories")) @@ -33,9 +48,10 @@ public class TestData { .body().jsonPath().getList("_embedded.repositories._links.self.href"); LOG.info("about to delete {} repositories", repositories.size()); repositories.forEach(TestData::delete); + DEFAULT_REPOSITORIES.clear(); } - public static void cleanupGroups() { + private static void cleanupGroups() { List groups = given(VndMediaType.GROUP_COLLECTION) .when() .get(createResourceUrl("groups")) @@ -47,7 +63,7 @@ public class TestData { groups.forEach(TestData::delete); } - public static void cleanupUsers() { + private static void cleanupUsers() { List users = given(VndMediaType.USER_COLLECTION) .when() .get(createResourceUrl("users")) @@ -59,7 +75,7 @@ public class TestData { users.stream().filter(url -> PROTECTED_USERS.stream().noneMatch(url::contains)).forEach(TestData::delete); } - public static void delete(String url) { + private static void delete(String url) { given(VndMediaType.REPOSITORY) .when() .delete(url) @@ -68,6 +84,32 @@ public class TestData { LOG.info("deleted {}", url); } + private static void createDefaultRepositories() { + for (String repositoryType : availableScmTypes()) { + String url = given(VndMediaType.REPOSITORY) + .body(repositoryJson(repositoryType)) + + .when() + .post(createResourceUrl("repositories")) + + .then() + .statusCode(HttpStatus.SC_CREATED) + .extract() + .header("location"); + DEFAULT_REPOSITORIES.put(repositoryType, url); + } + } + + public static String repositoryJson(String repositoryType) { + return Json.createObjectBuilder() + .add("contact", "zaphod.beeblebrox@hitchhiker.com") + .add("description", "Heart of Gold") + .add("name", "HeartOfGold-" + repositoryType) + .add("archived", false) + .add("type", repositoryType) + .build().toString(); + } + public static void main(String[] args) { cleanup(); } From a33c5246117255bb3d6a8837a707aa585cf195c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Aug 2018 16:37:22 +0200 Subject: [PATCH 15/19] Add integration test stage in CI build --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index aa6cd6b33b..558fb8aeda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,6 +34,10 @@ node() { // No specific label mvn 'test -Dsonia.scm.test.skip.hg=true -Dmaven.test.failure.ignore=true' } + stage('Integration Test') { + mvn 'verify -Pit -pl :scm-webapp,:scm-it' + } + stage('SonarQube') { analyzeWith(mvn) From 0a887be34926b236f36776a68b7085347072f6ee Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 7 Aug 2018 15:39:39 +0200 Subject: [PATCH 16/19] cleanup pom of scm-it module --- scm-it/pom.xml | 52 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 7fe464ccf5..3753f06d4d 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -21,6 +21,7 @@ scm-core 2.0.0-SNAPSHOT + sonia.scm scm-test @@ -33,6 +34,7 @@ 2.0.0-SNAPSHOT test + sonia.scm.plugins scm-git-plugin @@ -40,12 +42,14 @@ tests test + sonia.scm.plugins scm-hg-plugin 2.0.0-SNAPSHOT test + sonia.scm.plugins scm-hg-plugin @@ -53,12 +57,14 @@ tests test + sonia.scm.plugins scm-svn-plugin 2.0.0-SNAPSHOT test + sonia.scm.plugins scm-svn-plugin @@ -73,11 +79,14 @@ 3.1.0 test + javax javaee-api 7.0 + test + org.glassfish javax.json @@ -102,51 +111,13 @@ target/** .hg/** - src/main/webapp/resources/extjs/** - src/main/webapp/resources/syntaxhighlighter/** - src/main/webapp/resources/moment/** - **/*.mustache true - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.maven.version} - - 8005 - STOP - - - scm.home - ${scm.home} - - - scm.stage - ${scm.stage} - - - java.awt.headless - true - - - - /scm - - ${project.basedir}/src/main/conf/jetty.xml - 0 - - - - scm-it - - - @@ -223,6 +194,11 @@ + + DEVELOPMENT + target/scm-it + + From 77edb49f2a4f91f152a1cf5b1246770f391ebf3b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 7 Aug 2018 15:50:38 +0200 Subject: [PATCH 17/19] use scm-webapp from local repository and not from target directory --- scm-it/pom.xml | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/scm-it/pom.xml b/scm-it/pom.xml index 3753f06d4d..251fe4d957 100644 --- a/scm-it/pom.xml +++ b/scm-it/pom.xml @@ -151,6 +151,33 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + sonia.scm + scm-webapp + ${project.version} + war + ${project.build.outputDirectory} + scm-webapp.war + + + + + + copy-war + pre-integration-test + + copy + + + + + org.eclipse.jetty jetty-maven-plugin @@ -161,15 +188,22 @@ scm.home - target/scm-it + ${scm.home} scm.stage ${scm.stage} + + java.awt.headless + true + + + /scm + ${project.basedir}/src/main/conf/jetty.xml - ${project.basedir}/../scm-webapp/target/scm-webapp.war + ${project.build.outputDirectory}/scm-webapp.war 0 true From eaa99bf4458b0a4967f9f32c1b1435ef2a6a7f8b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 7 Aug 2018 16:05:44 +0200 Subject: [PATCH 18/19] mark build as unstable, if an integration test fails --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 558fb8aeda..6694b2eb7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ node() { // No specific label } stage('Integration Test') { - mvn 'verify -Pit -pl :scm-webapp,:scm-it' + mvn 'verify -Pit -pl :scm-webapp,:scm-it -Dmaven.test.failure.ignore=true' } stage('SonarQube') { From 75933c4f8221957ac5b21c311836ebc38f862574 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 7 Aug 2018 14:14:43 +0000 Subject: [PATCH 19/19] Close branch feature/integration_test_v2