added RepositoryITUtil

scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java

@@ -63,8 +63,7 @@ public class IntegrationTestUtil
 {
 
   /** Field description */
-  public static final String BASE_URL =
+  public static final String BASE_URL = "http://localhost:8081/scm/api/rest/";
-    "http://localhost:8081/scm/api/rest/";
 
   /** Field description */
   public static final String EXTENSION = ".xml";
@@ -99,6 +98,8 @@ public class IntegrationTestUtil
    *
    *
    * @param client
+   *
+   * @return
    */
   public static ScmState authenticateAdmin(Client client)
   {

scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java

@@ -50,6 +50,7 @@ import sonia.scm.util.IOUtil;
 import static org.junit.Assert.*;
 
 import static sonia.scm.it.IntegrationTestUtil.*;
+import static sonia.scm.it.RepositoryITUtil.*;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -142,7 +143,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     Repository repository =
       RepositoryTestData.createHeartOfGold(repositoryType);
 
-    createRepository(repository);
+    createRepository(client, repository);
   }
 
   /**
@@ -155,8 +156,8 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     Repository repository =
       RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
 
-    repository = createRepository(repository);
+    repository = createRepository(client, repository);
-    deleteRepository(repository.getId());
+    deleteRepository(client, repository.getId());
   }
 
   /**
@@ -169,7 +170,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
   {
     Repository repository = RepositoryTestData.create42Puzzle(repositoryType);
 
-    repository = createRepository(repository);
+    repository = createRepository(client, repository);
 
     // repository = createRepository(repository);
   }
@@ -184,7 +185,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     Repository repository =
       RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
 
-    repository = createRepository(repository);
+    repository = createRepository(client, repository);
     repository.setPermissions(Arrays.asList(new Permission("dent",
             PermissionType.READ), new Permission("slarti",
               PermissionType.WRITE)));
@@ -197,10 +198,10 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     assertTrue(response.getStatus() == 204);
     response.close();
 
-    Repository other = getRepositoryById(repository.getId());
+    Repository other = getRepositoryById(client, repository.getId());
 
     assertRepositoriesEquals(repository, other);
-    deleteRepository(repository.getId());
+    deleteRepository(client, repository.getId());
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -215,7 +216,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     Repository repository =
       RepositoryTestData.createHappyVerticalPeopleTransporter(repositoryType);
 
-    repository = createRepository(repository);
+    repository = createRepository(client, repository);
 
     WebResource wr = createResource(client, "repositories");
     ClientResponse response = wr.get(ClientResponse.class);
@@ -246,129 +247,6 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
     assertNotNull(hvpt);
   }
 
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   * @param other
-   */
-  private 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 repository
-   *
-   * @return
-   */
-  private Repository createRepository(Repository repository)
-  {
-    WebResource wr = createResource(client, "repositories");
-    ClientResponse response = wr.post(ClientResponse.class, repository);
-
-    assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
-
-    String url = response.getHeaders().get("Location").get(0);
-
-    response.close();
-
-    Repository other = getRepository(url);
-
-    assertNotNull(other);
-    assertNotNull(other.getType());
-    assertRepositoriesEquals(repository, other);
-    assertNotNull(other.getId());
-    assertNotNull(other.getCreationDate());
-
-    return other;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param id
-   */
-  private void deleteRepository(String id)
-  {
-    WebResource wr = createResource(client, "repositories/".concat(id));
-    ClientResponse response = wr.delete(ClientResponse.class);
-
-    assertNotNull(response);
-    assertTrue(response.getStatus() == 204);
-    response.close();
-    wr = createResource(client, "repositories/".concat(id));
-    response = wr.get(ClientResponse.class);
-    assertNotNull(response);
-    assertTrue(response.getStatus() == 404);
-    response.close();
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   *
-   *
-   * @param url
-   *
-   * @return
-   */
-  private Repository getRepository(String url)
-  {
-    WebResource wr = client.resource(url);
-    ClientResponse response = wr.get(ClientResponse.class);
-
-    assertNotNull(response);
-
-    Repository repository = response.getEntity(Repository.class);
-
-    response.close();
-    assertNotNull(repository);
-
-    return repository;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   *
-   *
-   *
-   * @param id
-   *
-   * @return
-   */
-  private Repository getRepositoryById(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;
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */

scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java

@@ -0,0 +1,187 @@
+/**
+ * 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 sonia.scm.repository.Repository;
+
+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
+ */
+public class RepositoryITUtil
+{
+
+  /**
+   * 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);
+
+    assertNotNull(response);
+    assertTrue(response.getStatus() == 201);
+
+    String url = response.getHeaders().get("Location").get(0);
+
+    response.close();
+
+    Repository 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)
+  {
+    WebResource wr = createResource(client, "repositories/".concat(id));
+    ClientResponse response = wr.delete(ClientResponse.class);
+
+    assertNotNull(response);
+    assertTrue(response.getStatus() == 204);
+    response.close();
+    wr = createResource(client, "repositories/".concat(id));
+    response = wr.get(ClientResponse.class);
+    assertNotNull(response);
+    assertTrue(response.getStatus() == 404);
+    response.close();
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   *
+   *
+   *
+   * @param client
+   * @param url
+   *
+   * @return
+   */
+  public static Repository getRepository(Client client, String url)
+  {
+    WebResource wr = client.resource(url);
+    ClientResponse response = wr.get(ClientResponse.class);
+
+    assertNotNull(response);
+
+    Repository repository = response.getEntity(Repository.class);
+
+    response.close();
+    assertNotNull(repository);
+
+    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;
+  }
+}