From a03a6fc8ac01d1cf8d1a2482d7c004ffd2009409 Mon Sep 17 00:00:00 2001 From: Mohamed Karray Date: Wed, 5 Sep 2018 10:44:03 +0200 Subject: [PATCH] add logs --- scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java | 5 +++++ scm-it/src/test/java/sonia/scm/it/TestData.java | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java b/scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java index ef2332074b..e49927b1b9 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java @@ -3,6 +3,8 @@ package sonia.scm.it; import com.google.common.base.Charsets; import com.google.common.io.Files; import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import sonia.scm.repository.Changeset; import sonia.scm.repository.Person; import sonia.scm.repository.client.api.ClientCommand; @@ -15,6 +17,8 @@ import java.util.UUID; public class RepositoryUtil { + private static final Logger LOG = LoggerFactory.getLogger(RepositoryUtil.class); + private static final RepositoryClientFactory REPOSITORY_CLIENT_FACTORY = new RepositoryClientFactory(); static RepositoryClient createRepositoryClient(String repositoryType, File folder) throws IOException { @@ -58,6 +62,7 @@ public class RepositoryUtil { } static Changeset commit(RepositoryClient repositoryClient, String username, String message) throws IOException { + LOG.info("user: {} try to commit with message: {}", username, message); Changeset changeset = repositoryClient.getCommitCommand().commit(new Person(username, username + "@scm-manager.org"), message); if (repositoryClient.isCommandSupported(ClientCommand.PUSH)) { repositoryClient.getPushCommand().push(); 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 ada67d588c..ae0e35004d 100644 --- a/scm-it/src/test/java/sonia/scm/it/TestData.java +++ b/scm-it/src/test/java/sonia/scm/it/TestData.java @@ -33,6 +33,7 @@ public class TestData { } public static void cleanup() { + LOG.info("start to clean up to integration tests"); cleanupRepositories(); cleanupGroups(); cleanupUsers(); @@ -43,6 +44,7 @@ public class TestData { } public static void createUser(String username, String password) { + LOG.info("create user with username: {}", username); given(VndMediaType.USER) .when() .content(" {\n" + @@ -64,6 +66,8 @@ public class TestData { public static void createUserPermission(String name, PermissionType permissionType, String repositoryType) { + String defaultPermissionUrl = TestData.getDefaultPermissionUrl(USER_SCM_ADMIN, USER_SCM_ADMIN, repositoryType); + LOG.info("create permission with name {} and type: {} using the endpoint: {}", name, permissionType, defaultPermissionUrl); given(VndMediaType.PERMISSION) .when() .content("{\n" + @@ -72,7 +76,7 @@ public class TestData { "\t\"groupPermission\": false\n" + "\t\n" + "}") - .post(TestData.getDefaultPermissionUrl(USER_SCM_ADMIN, USER_SCM_ADMIN, repositoryType)) + .post(defaultPermissionUrl) .then() .statusCode(HttpStatus.SC_CREATED) ; @@ -114,6 +118,7 @@ public class TestData { private static void cleanupRepositories() { + LOG.info("clean up repository"); List repositories = given(VndMediaType.REPOSITORY_COLLECTION) .when() .get(createResourceUrl("repositories")) @@ -160,6 +165,7 @@ public class TestData { } private static void createDefaultRepositories() { + LOG.info("create default repositories"); for (String repositoryType : availableScmTypes()) { String url = given(VndMediaType.REPOSITORY) .body(repositoryJson(repositoryType)) @@ -171,6 +177,7 @@ public class TestData { .statusCode(HttpStatus.SC_CREATED) .extract() .header("location"); + LOG.info("a {} repository is created: {}", repositoryType, url); DEFAULT_REPOSITORIES.put(repositoryType, url); } }