Updated Branches: refs/heads/rbac 5854c0bbe -> 5bfc75cac
Fix test build failure. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bfc75ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bfc75ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bfc75ca Branch: refs/heads/rbac Commit: 5bfc75cac9adce1f3c7e9a0ffcb088fb1bb8f9a6 Parents: 5854c0b Author: Min Chen <[email protected]> Authored: Thu Feb 13 11:21:07 2014 -0800 Committer: Min Chen <[email protected]> Committed: Thu Feb 13 11:21:07 2014 -0800 ---------------------------------------------------------------------- .../test/org/apache/cloudstack/acl/AclApiServiceTest.java | 7 ++++--- .../test/org/apache/cloudstack/iam/IAMServiceUnitTest.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bfc75ca/services/iam/plugin/test/org/apache/cloudstack/acl/AclApiServiceTest.java ---------------------------------------------------------------------- diff --git a/services/iam/plugin/test/org/apache/cloudstack/acl/AclApiServiceTest.java b/services/iam/plugin/test/org/apache/cloudstack/acl/AclApiServiceTest.java index 4d418e5..e4457f5 100644 --- a/services/iam/plugin/test/org/apache/cloudstack/acl/AclApiServiceTest.java +++ b/services/iam/plugin/test/org/apache/cloudstack/acl/AclApiServiceTest.java @@ -43,6 +43,7 @@ import org.apache.cloudstack.acl.api.response.AclPolicyResponse; import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.iam.api.AclGroup; import org.apache.cloudstack.iam.api.AclPolicy; import org.apache.cloudstack.iam.api.AclPolicyPermission; @@ -52,10 +53,11 @@ import org.apache.cloudstack.iam.server.AclGroupVO; import org.apache.cloudstack.iam.server.AclPolicyPermissionVO; import org.apache.cloudstack.iam.server.AclPolicyVO; import org.apache.cloudstack.test.utils.SpringUtils; -import org.apache.cloudstack.framework.messagebus.MessageBus; + import com.cloud.api.ApiServerService; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; +import com.cloud.network.dao.NetworkDomainDao; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; @@ -63,7 +65,6 @@ import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; import com.cloud.utils.Pair; import com.cloud.utils.component.ComponentContext; -import com.cloud.network.dao.NetworkDomainDao; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) @@ -194,7 +195,7 @@ public class AclApiServiceTest { List<AclPolicy> policies = new ArrayList<AclPolicy>(); policies.add(policy); Pair<List<AclPolicy>, Integer> policyList = new Pair<List<AclPolicy>, Integer>(policies, 1); - when(_iamSrv.createAclPolicy("policy1", "tester policy1", null)).thenReturn(policy); + when(_iamSrv.createAclPolicy("policy1", "tester policy1", null, callerDomainPath)).thenReturn(policy); when(_iamSrv.listAclPolicies(null, null, callerDomainPath, 0L, 20L)).thenReturn(policyList); AclPolicy createdPolicy = _aclSrv.createAclPolicy(caller, "policy1", "tester policy1", null); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bfc75ca/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java ---------------------------------------------------------------------- diff --git a/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java b/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java index 03973e2..01eab61 100644 --- a/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java +++ b/services/iam/server/test/org/apache/cloudstack/iam/IAMServiceUnitTest.java @@ -145,13 +145,13 @@ public class IAMServiceUnitTest { @Test(expected = InvalidParameterValueException.class) public void createAclPolicyTest() { - AclPolicy policy = _iamService.createAclPolicy("policy1", "my first policy", null); + AclPolicy policy = _iamService.createAclPolicy("policy1", "my first policy", null, "/root/mydomain"); assertNotNull("Acl policy 'policy1' failed to create ", policy); AclPolicyVO rvo = new AclPolicyVO("policy2", "second policy"); when(_aclPolicyDao.findByName(eq("policy2"))).thenReturn(rvo); - _iamService.createAclPolicy("policy2", "second policy", null); + _iamService.createAclPolicy("policy2", "second policy", null, "/root/mydomain"); } @Test(expected = InvalidParameterValueException.class)
