From e9410c6c3f7e6ac58e2a8a2e9780a6898bed114e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 14 Jan 2021 08:59:15 +0100
Subject: [PATCH] Clean up before running old it cases from webapp

---
 .../sonia/scm/it/webapp/AbstractPermissionITCaseBase.java  | 5 +++++
 scm-it/src/test/java/sonia/scm/it/webapp/GitLfsITCase.java | 7 +++++++
 .../scm/it/webapp/GitRepositoryPathMatcherITCase.java      | 7 +++++++
 .../java/sonia/scm/it/webapp/RepositoryHookITCase.java     | 7 +++++++
 4 files changed, 26 insertions(+)

diff --git a/scm-it/src/test/java/sonia/scm/it/webapp/AbstractPermissionITCaseBase.java b/scm-it/src/test/java/sonia/scm/it/webapp/AbstractPermissionITCaseBase.java
index e7186a194f..0454fdc835 100644
--- a/scm-it/src/test/java/sonia/scm/it/webapp/AbstractPermissionITCaseBase.java
+++ b/scm-it/src/test/java/sonia/scm/it/webapp/AbstractPermissionITCaseBase.java
@@ -33,6 +33,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runners.Parameterized.Parameters;
+import sonia.scm.it.utils.TestData;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 
@@ -69,6 +70,10 @@ public abstract class AbstractPermissionITCaseBase<T>
     this.client = credentials.isAnonymous()? ScmClient.anonymous(): new ScmClient(credentials.getUsername(), credentials.getPassword());
   }
 
+  @BeforeClass
+  public static void cleanup() {
+    TestData.cleanup();
+  }
 
   //~--- methods --------------------------------------------------------------
   /**
diff --git a/scm-it/src/test/java/sonia/scm/it/webapp/GitLfsITCase.java b/scm-it/src/test/java/sonia/scm/it/webapp/GitLfsITCase.java
index 9e26d4b927..c2bce30af4 100644
--- a/scm-it/src/test/java/sonia/scm/it/webapp/GitLfsITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/webapp/GitLfsITCase.java
@@ -34,6 +34,7 @@ import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -42,6 +43,7 @@ import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.api.v2.resources.RepositoryDto;
 import sonia.scm.api.v2.resources.UserDto;
 import sonia.scm.api.v2.resources.UserToUserDtoMapperImpl;
+import sonia.scm.it.utils.TestData;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 import sonia.scm.util.HttpUtil;
@@ -86,6 +88,11 @@ public class GitLfsITCase {
     mapper.setAnnotationIntrospector(new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()));
   }
 
+  @BeforeClass
+  public static void cleanup() {
+    TestData.cleanup();
+  }
+
   // lifecycle methods
 
   @Before
diff --git a/scm-it/src/test/java/sonia/scm/it/webapp/GitRepositoryPathMatcherITCase.java b/scm-it/src/test/java/sonia/scm/it/webapp/GitRepositoryPathMatcherITCase.java
index 682e558ab9..5fe017ca86 100644
--- a/scm-it/src/test/java/sonia/scm/it/webapp/GitRepositoryPathMatcherITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/webapp/GitRepositoryPathMatcherITCase.java
@@ -28,10 +28,12 @@ import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import sonia.scm.api.v2.resources.RepositoryDto;
+import sonia.scm.it.utils.TestData;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.client.api.ClientCommand;
 import sonia.scm.repository.client.api.RepositoryClient;
@@ -66,6 +68,11 @@ public class GitRepositoryPathMatcherITCase {
   private ScmClient apiClient;
   private RepositoryDto repository;
 
+  @BeforeClass
+  public static void cleanup() {
+    TestData.cleanup();
+  }
+
   @Before
   public void setUp() {
     apiClient = createAdminClient();
diff --git a/scm-it/src/test/java/sonia/scm/it/webapp/RepositoryHookITCase.java b/scm-it/src/test/java/sonia/scm/it/webapp/RepositoryHookITCase.java
index 5d50c438ac..22c1d0b825 100644
--- a/scm-it/src/test/java/sonia/scm/it/webapp/RepositoryHookITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/webapp/RepositoryHookITCase.java
@@ -30,6 +30,7 @@ import com.sun.jersey.api.client.WebResource;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -38,6 +39,7 @@ 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.it.utils.TestData;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.client.api.ClientCommand;
@@ -89,6 +91,11 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
     this.repositoryType = repositoryType;
   }
 
+  @BeforeClass
+  public static void cleanup() {
+    TestData.cleanup();
+  }
+
   /**
    * Creates a test repository.
    *