You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/12/11 09:50:52 UTC
[2/2] git commit: updated refs/heads/master to b385cb4
Fixed test case failures in network acl
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b385cb4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b385cb4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b385cb4f
Branch: refs/heads/master
Commit: b385cb4f7ac206e70dafefc273aee46bafb1d569
Parents: 36cbc2d
Author: Jayapal <ja...@apache.org>
Authored: Wed Dec 11 14:20:11 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Wed Dec 11 14:20:11 2013 +0530
----------------------------------------------------------------------
.../com/cloud/vpc/NetworkACLManagerTest.java | 16 +++++++++-------
.../com/cloud/vpc/NetworkACLServiceTest.java | 20 ++++++++++----------
2 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b385cb4f/server/test/com/cloud/vpc/NetworkACLManagerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
index 3e1220d..303da59 100644
--- a/server/test/com/cloud/vpc/NetworkACLManagerTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
@@ -22,6 +22,7 @@ import java.util.UUID;
import javax.inject.Inject;
+import com.cloud.network.vpc.*;
import junit.framework.TestCase;
import org.apache.log4j.Logger;
@@ -52,13 +53,6 @@ import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.NetworkACLServiceProvider;
-import com.cloud.network.vpc.NetworkACLItem;
-import com.cloud.network.vpc.NetworkACLItemDao;
-import com.cloud.network.vpc.NetworkACLItemVO;
-import com.cloud.network.vpc.NetworkACLManager;
-import com.cloud.network.vpc.NetworkACLManagerImpl;
-import com.cloud.network.vpc.NetworkACLVO;
-import com.cloud.network.vpc.VpcManager;
import com.cloud.network.vpc.dao.NetworkACLDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao;
@@ -94,6 +88,8 @@ public class NetworkACLManagerTest extends TestCase {
NetworkModel _networkModel;
@Inject
List<NetworkACLServiceProvider> _networkAclElements;
+ @Inject
+ VpcService _vpcSrv;
private NetworkACLVO acl;
private NetworkACLItemVO aclItem;
@@ -220,6 +216,12 @@ public class NetworkACLManagerTest extends TestCase {
return Mockito.mock(VpcGatewayDao.class);
}
+ @Bean
+ public VpcService vpcService() {
+ return Mockito.mock(VpcService.class);
+ }
+
+
public static class Library implements TypeFilter {
@Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b385cb4f/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 aeed99b..079cd5e 100644
--- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
@@ -20,6 +20,7 @@ import java.util.UUID;
import javax.inject.Inject;
+import com.cloud.network.vpc.*;
import com.cloud.network.vpc.dao.VpcDao;
import junit.framework.TestCase;
@@ -49,16 +50,6 @@ import org.apache.cloudstack.test.utils.SpringUtils;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.vpc.NetworkACLItem;
-import com.cloud.network.vpc.NetworkACLItemDao;
-import com.cloud.network.vpc.NetworkACLItemVO;
-import com.cloud.network.vpc.NetworkACLManager;
-import com.cloud.network.vpc.NetworkACLService;
-import com.cloud.network.vpc.NetworkACLServiceImpl;
-import com.cloud.network.vpc.NetworkACLVO;
-import com.cloud.network.vpc.Vpc;
-import com.cloud.network.vpc.VpcManager;
-import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.NetworkACLDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao;
@@ -89,6 +80,9 @@ public class NetworkACLServiceTest extends TestCase {
EntityManager _entityMgr;
@Inject
VpcDao _vpcDao;
+ @Inject
+ VpcService _vpcSrv;
+
private CreateNetworkACLCmd createACLItemCmd;
private NetworkACLVO acl;
@@ -254,6 +248,12 @@ public class NetworkACLServiceTest extends TestCase {
return Mockito.mock(VpcDao.class);
}
+ @Bean
+ public VpcService vpcService() {
+ return Mockito.mock(VpcService.class);
+ }
+
+
public static class Library implements TypeFilter {
@Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {