You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/31 09:49:01 UTC
[03/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to
6a8c2bd
fix networkAclServiceTest failure
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3a104aa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3a104aa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3a104aa
Branch: refs/heads/vmware-datamodel
Commit: e3a104aa58082521dac2a92a9cc1c5b23494f29b
Parents: 84d904a
Author: Kishan Kavala <ki...@cloud.com>
Authored: Wed May 29 17:14:36 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Wed May 29 17:14:36 2013 +0530
----------------------------------------------------------------------
.../test/com/cloud/vpc/NetworkACLServiceTest.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3a104aa/server/test/com/cloud/vpc/NetworkACLServiceTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
index 9a368b9..e71fabf 100644
--- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
@@ -138,6 +138,7 @@ public class NetworkACLServiceTest extends TestCase{
Mockito.when(_networkAclMgr.getNetworkACL(Mockito.anyLong())).thenReturn(acl);
Mockito.when(_networkAclMgr.createNetworkACLItem(Mockito.anyInt(), Mockito.anyInt(), Mockito.anyString(), Mockito.anyList(), Mockito.anyInt(), Mockito.anyInt(),
Mockito.any(NetworkACLItem.TrafficType.class), Mockito.anyLong(), Mockito.anyString(), Mockito.anyInt())).thenReturn(new NetworkACLItemVO());
+ Mockito.when(_networkACLItemDao.findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt())).thenReturn(null);
assertNotNull(_aclService.createNetworkACLItem(createACLItemCmd));
}