added GroupPermissionITCase

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

@@ -0,0 +1,330 @@
+/**
+ * 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 org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runners.Parameterized.Parameters;
+
+import sonia.scm.user.User;
+import sonia.scm.user.UserTestData;
+
+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;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ *
+ * @param <T>
+ */
+public abstract class AbstractPermissionITCaseBase<T>
+{
+
+  /** Field description */
+  public static User TESTUSER = null;
+
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   *
+   * @param credentials
+   */
+  public AbstractPermissionITCaseBase(Credentials credentials)
+  {
+    this.credentials = credentials;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Parameters
+  public static Collection<Credentials[]> createParameters()
+  {
+    Collection<Credentials[]> params = new ArrayList<Credentials[]>();
+
+    params.add(new Credentials[] { new Credentials() });
+
+    User dent = getTestUser();
+
+    params.add(new Credentials[] {
+      new Credentials(dent.getName(), dent.getPassword()) });
+
+    return params;
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private static User getTestUser()
+  {
+    if (TESTUSER == null)
+    {
+      TESTUSER = UserTestData.createTrillian();
+      TESTUSER.setPassword("a.trillian124");
+
+      Client client = createClient();
+
+      authenticateAdmin(client);
+
+      WebResource wr = createResource(client, "users");
+      ClientResponse response = wr.post(ClientResponse.class, TESTUSER);
+
+      assertNotNull(response);
+      assertTrue(response.getStatus() == 201);
+      response.close();
+      logoutClient(client);
+      client.destroy();
+    }
+
+    return TESTUSER;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String getBasePath();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract T getCreateItem();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String getDeletePath();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String getGetPath();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract T getModifyItem();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected abstract String getModifyPath();
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @After
+  public void after()
+  {
+    client = createClient();
+    logout();
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Before
+  public void before()
+  {
+    client = createClient();
+    login();
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void create()
+  {
+    WebResource wr = createResource(client, getBasePath());
+
+    checkResponse(wr.post(ClientResponse.class, getCreateItem()));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void delete()
+  {
+    WebResource wr = createResource(client, getDeletePath());
+
+    checkResponse(wr.delete(ClientResponse.class));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void modify()
+  {
+    WebResource wr = createResource(client, getModifyPath());
+
+    checkResponse(wr.put(ClientResponse.class, getModifyItem()));
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void get()
+  {
+    WebResource wr = createResource(client, getBasePath());
+
+    checkResponse(wr.get(ClientResponse.class));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void getAll()
+  {
+    WebResource wr = createResource(client, getBasePath());
+
+    checkResponse(wr.get(ClientResponse.class));
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param response
+   */
+  private void checkResponse(ClientResponse response)
+  {
+    assertNotNull(response);
+
+    if (credentials.isAnonymous())
+    {
+      assertTrue(response.getStatus() == 401);
+    }
+    else
+    {
+      assertTrue(response.getStatus() == 403);
+    }
+
+    response.close();
+  }
+
+  /**
+   * Method description
+   *
+   */
+  private void login()
+  {
+    if (!credentials.isAnonymous())
+    {
+      authenticate(client, credentials.getUsername(),
+                   credentials.getPassword());
+    }
+  }
+
+  /**
+   * Method description
+   *
+   */
+  private void logout()
+  {
+    if (!credentials.isAnonymous())
+    {
+      logoutClient(client);
+    }
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  protected Client client;
+
+  /** Field description */
+  private Credentials credentials;
+}

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

@@ -0,0 +1,108 @@
+/**
+ * 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.util.Util;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class Credentials
+{
+
+  /**
+   * Constructs ...
+   *
+   */
+  public Credentials() {}
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param username
+   * @param password
+   */
+  public Credentials(String username, String password)
+  {
+    this.password = password;
+    this.username = username;
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getPassword()
+  {
+    return password;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getUsername()
+  {
+    return username;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public boolean isAnonymous()
+  {
+    return Util.isEmpty(username) && Util.isEmpty(password);
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private String password;
+
+  /** Field description */
+  private String username;
+}

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

@@ -0,0 +1,170 @@
+/**
+ * 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 org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import sonia.scm.group.Group;
+
+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
+ */
+@RunWith(Parameterized.class)
+public class GroupPermissionITCase extends AbstractPermissionITCaseBase<Group>
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param credentials
+   */
+  public GroupPermissionITCase(Credentials credentials)
+  {
+    super(credentials);
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @BeforeClass
+  public static void createTestGroup()
+  {
+    Group testGroup = new Group("xml", "test-group");
+    Client client = createClient();
+
+    authenticateAdmin(client);
+
+    WebResource wr = createResource(client, "groups");
+    ClientResponse response = wr.post(ClientResponse.class, testGroup);
+
+    assertNotNull(response);
+    assertTrue(response.getStatus() == 201);
+    response.close();
+    logoutClient(client);
+    client.destroy();
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getBasePath()
+  {
+    return "groups";
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected Group getCreateItem()
+  {
+    return new Group("xml", "create-test-group");
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getDeletePath()
+  {
+    return "groups/test-group";
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getGetPath()
+  {
+    return "groups/test-group";
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected Group getModifyItem()
+  {
+    return new Group("xml", "test-group", "dent", "zaphod", "trillian");
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getModifyPath()
+  {
+    return "groups/test-group";
+  }
+}

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

@@ -35,283 +35,43 @@ package sonia.scm.it;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
-import sonia.scm.util.Util;
-
-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;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 /**
  *
  * @author Sebastian Sdorra
  */
 @RunWith(Parameterized.class)
-public class UserPermissionITCase
+public class UserPermissionITCase extends AbstractPermissionITCaseBase<User>
 {
 
   /**
    * Constructs ...
    *
    *
-   *
    * @param credentials
    */
   public UserPermissionITCase(Credentials credentials)
   {
-    this.credentials = credentials;
+    super(credentials);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Parameters
-  public static Collection<Credentials[]> createParameters()
-  {
-    Collection<Credentials[]> params = new ArrayList<Credentials[]>();
-
-    params.add(new Credentials[] { new Credentials() });
-
-    User dent = createTestUser();
-
-    params.add(new Credentials[] {
-      new Credentials(dent.getName(), dent.getPassword()) });
-
-    return params;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  private static User createTestUser()
-  {
-    User dent = UserTestData.createDent();
-
-    dent.setPassword("a.dent124");
-
-    Client client = createClient();
-
-    authenticateAdmin(client);
-
-    WebResource wr = createResource(client, "users");
-    ClientResponse response = wr.post(ClientResponse.class, dent);
-
-    assertNotNull(response);
-    assertTrue(response.getStatus() == 201);
-    response.close();
-    logoutClient(client);
-    client.destroy();
-
-    return dent;
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @After
-  public void after()
-  {
-    client = createClient();
-    logout();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Before
-  public void before()
-  {
-    client = createClient();
-    login();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void create()
-  {
-    WebResource wr = createResource(client, "users");
-    User zaphod = UserTestData.createZaphod();
-
-    checkResponse(wr.post(ClientResponse.class, zaphod));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void delete()
-  {
-    WebResource wr = createResource(client, "users/scmadmin");
-
-    checkResponse(wr.delete(ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void modify()
-  {
-    WebResource wr = createResource(client, "users/scmadmin");
-    User user = new User("scmadmin", "SCM Administrator",
-                         "scm-admin@scm-manager.org");
-
-    user.setPassword("hallo123");
-    user.setAdmin(true);
-    user.setType("xml");
-    checkResponse(wr.put(ClientResponse.class, user));
   }
 
   //~--- get methods ----------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void get()
-  {
-    WebResource wr = createResource(client, "users/scmadmin");
-
-    checkResponse(wr.get(ClientResponse.class));
-  }
-
-  /**
-   * Method description
-   *
-   */
-  @Test
-  public void getAll()
-  {
-    WebResource wr = createResource(client, "users");
-
-    checkResponse(wr.get(ClientResponse.class));
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param response
-   */
-  private void checkResponse(ClientResponse response)
-  {
-    assertNotNull(response);
-    System.out.append("STATUS: ").println(response.getStatus());
-
-    if (credentials.isAnonymous())
-    {
-      assertTrue(response.getStatus() == 401);
-    }
-    else
-    {
-      assertTrue(response.getStatus() == 403);
-    }
-
-    response.close();
-  }
-
-  /**
-   * Method description
-   *
-   */
-  private void login()
-  {
-    if (!credentials.isAnonymous())
-    {
-      authenticate(client, credentials.getUsername(),
-                   credentials.getPassword());
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  private void logout()
-  {
-    if (!credentials.isAnonymous())
-    {
-      logoutClient(client);
-    }
-  }
-
-  //~--- inner classes --------------------------------------------------------
-
-  /**
-   * Class description
-   *
-   *
-   * @version        Enter version here..., 2011-02-19
-   * @author         Sebastian Sdorra
-   */
-  public static class Credentials
-  {
-
-    /**
-     * Constructs ...
-     *
-     */
-    public Credentials() {}
-
-    /**
-     * Constructs ...
-     *
-     *
-     * @param username
-     * @param password
-     */
-    public Credentials(String username, String password)
-    {
-      this.password = password;
-      this.username = username;
-    }
-
-    //~--- get methods --------------------------------------------------------
-
   /**
    * Method description
    *
    *
    * @return
    */
-    public String getPassword()
+  @Override
+  protected String getBasePath()
   {
-      return password;
+    return "users";
   }
 
   /**
@@ -320,9 +80,10 @@ public class UserPermissionITCase
    *
    * @return
    */
-    public String getUsername()
+  @Override
+  protected User getCreateItem()
   {
-      return username;
+    return UserTestData.createZaphod();
   }
 
   /**
@@ -331,26 +92,52 @@ public class UserPermissionITCase
    *
    * @return
    */
-    public boolean isAnonymous()
+  @Override
+  protected String getDeletePath()
   {
-      return Util.isEmpty(username) && Util.isEmpty(password);
+    return "users/scmadmin";
   }
 
-    //~--- fields -------------------------------------------------------------
+  /**
-
+   * Method description
-    /** Field description */
+   *
-    private String password;
+   *
-
+   * @return
-    /** Field description */
+   */
-    private String username;
+  @Override
+  protected String getGetPath()
+  {
+    return "users/scmadmin";
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected User getModifyItem()
+  {
+    User user = new User("scmadmin", "SCM Administrator",
+                         "scm-admin@scm-manager.org");
 
-  //~--- fields ---------------------------------------------------------------
+    user.setPassword("hallo123");
+    user.setAdmin(true);
+    user.setType("xml");
 
-  /** Field description */
+    return user;
-  protected Client client;
+  }
 
-  /** Field description */
+  /**
-  private Credentials credentials;
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getModifyPath()
+  {
+    return "users/scmadmin";
+  }
 }