re enable repository it cases

This commit is contained in:
Sebastian Sdorra
2016-07-25 18:49:57 +02:00
parent 37228c329c
commit 5340bea7f1

View File

@@ -35,8 +35,7 @@ package sonia.scm.it;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import org.junit.AfterClass; import com.google.common.collect.Lists;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@@ -48,13 +47,13 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryTestData; import sonia.scm.repository.RepositoryTestData;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.hamcrest.Matchers.*;
import static sonia.scm.it.IntegrationTestUtil.*; import static sonia.scm.it.IntegrationTestUtil.*;
import static sonia.scm.it.RepositoryITUtil.*; import static sonia.scm.it.RepositoryITUtil.*;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.GenericType; import com.sun.jersey.api.client.GenericType;
import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource;
@@ -62,6 +61,8 @@ import com.sun.jersey.api.client.WebResource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.After;
import sonia.scm.util.IOUtil;
/** /**
* *
@@ -88,13 +89,9 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
* Method description * Method description
* *
*/ */
@AfterClass @After
public static void cleanup() public void cleanup()
{ {
Client client = createClient();
authenticateAdmin(client);
Collection<Repository> repositories = Collection<Repository> repositories =
createResource(client, createResource(client,
"repositories").get(new GenericType<Collection<Repository>>() {} "repositories").get(new GenericType<Collection<Repository>>() {}
@@ -120,18 +117,15 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
@Parameters @Parameters
public static Collection<String[]> createParameters() public static Collection<String[]> createParameters()
{ {
Collection<String[]> params = new ArrayList<String[]>(); Collection<String[]> params = Lists.newArrayList();
params.add(new String[] { "git" }); params.add(new String[] { "git" });
params.add(new String[] { "svn" });
/* if (IOUtil.search("hg") != null)
* params.add(new String[] { "svn" }); {
* params.add(new String[] { "hg" });
* if (IOUtil.search("hg") != null) }
* {
* params.add(new String[] { "hg" });
* }
*/
return params; return params;
} }
@@ -141,7 +135,6 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
* *
*/ */
@Test @Test
@Ignore
public void create() public void create()
{ {
Repository repository = Repository repository =
@@ -155,7 +148,6 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
* *
*/ */
@Test @Test
@Ignore
public void delete() public void delete()
{ {
Repository repository = Repository repository =
@@ -169,15 +161,18 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
* Method description * Method description
* *
*/ */
@Test
// @Test
public void doubleCreate() public void doubleCreate()
{ {
Repository repository = RepositoryTestData.create42Puzzle(repositoryType); Repository repository = RepositoryTestData.create42Puzzle(repositoryType);
repository = createRepository(client, repository); repository = createRepository(client, repository);
// repository = createRepository(repository); WebResource wr = createResource(client, "repositories");
ClientResponse response = wr.post(ClientResponse.class, repository);
assertNotNull(response);
assertThat(response.getStatus(), not(lessThanOrEqualTo(400)));
} }
/** /**
@@ -185,7 +180,6 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
* *
*/ */
@Test @Test
@Ignore
public void modify() public void modify()
{ {
Repository repository = Repository repository =
@@ -259,5 +253,5 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------
/** Field description */ /** Field description */
private String repositoryType; private final String repositoryType;
} }