Clean up before running old it cases from webapp

This commit is contained in:
René Pfeuffer
2021-01-14 08:59:15 +01:00
parent 0ccbc34ccb
commit e9410c6c3f
4 changed files with 26 additions and 0 deletions

View File

@@ -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 --------------------------------------------------------------
/**

View File

@@ -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

View File

@@ -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();

View File

@@ -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.
*