Merge pull request #75 from thefake/master

James Moger

2013-02-25 9effe1630d97039b3e01cd9b58ed07e75be1d63c

 tests/com/gitblit/tests/RpcTests.java

@@ -35,6 +35,7 @@
import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlitException.UnauthorizedException;

import com.gitblit.Keys;

@@ -166,7 +167,7 @@
      RepositoryModel model = new RepositoryModel();

      model.name = "garbagerepo.git";

      model.description = "created by RpcUtils";

      model.owner = "garbage";

      model.addOwner("garbage");

      model.accessRestriction = AccessRestrictionType.VIEW;

      model.authorizationControl = AuthorizationControl.AUTHENTICATED;



@@ -199,7 +200,7 @@
      List<RegistrantAccessPermission> permissions = RpcUtils.getRepositoryMemberPermissions(retrievedRepository, url, account,

            password.toCharArray());

      assertEquals("Membership permissions is not empty!", 0, permissions.size());

      permissions.add(new RegistrantAccessPermission(testMember.username, AccessPermission.PUSH, RegistrantType.USER));

      permissions.add(new RegistrantAccessPermission(testMember.username, AccessPermission.PUSH, PermissionType.EXPLICIT, RegistrantType.USER, null, true));

      assertTrue(

            "Failed to set member permissions!",

            RpcUtils.setRepositoryMemberPermissions(retrievedRepository, permissions, url, account,

@@ -288,7 +289,7 @@
      // set no teams

      List<RegistrantAccessPermission> permissions = new ArrayList<RegistrantAccessPermission>();

      for (String team : helloworldTeams) {

         permissions.add(new RegistrantAccessPermission(team, AccessPermission.NONE, RegistrantType.TEAM));

         permissions.add(new RegistrantAccessPermission(team, AccessPermission.NONE, PermissionType.EXPLICIT, RegistrantType.TEAM, null, true));

      }

      assertTrue(RpcUtils.setRepositoryTeamPermissions(helloworld, permissions, url, account,

            password.toCharArray()));