From d221efcf812d609cd8e85eaad0938c8d07540c61 Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Wed, 11 Dec 2013 13:07:06 +0530
Subject: [PATCH] Fixed the tests related to network acl

---
 .../com/cloud/vpc/NetworkACLManagerTest.java    | 15 ++++++++-------
 .../com/cloud/vpc/NetworkACLServiceTest.java    | 17 +++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
index d09ce3aa37c..42619b2a250 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;
@@ -51,13 +52,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;
@@ -93,6 +87,8 @@ public class NetworkACLManagerTest extends TestCase{
     NetworkModel _networkModel;
     @Inject
     List<NetworkACLServiceProvider> _networkAclElements;
+    @Inject
+    VpcService _vpcSvc;
 
     private NetworkACLVO acl;
     private NetworkACLItemVO aclItem;
@@ -219,6 +215,11 @@ 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 {
diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
index 41a7e3202bc..bcc06c6375a 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;
 
@@ -48,16 +49,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;
@@ -88,6 +79,8 @@ public class NetworkACLServiceTest extends TestCase{
     EntityManager _entityMgr;
     @Inject
     VpcDao _vpcDao;
+    @Inject
+    VpcService _vpcSvc;
 
     private CreateNetworkACLCmd createACLItemCmd;
     private NetworkACLVO acl;
@@ -253,6 +246,10 @@ 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