diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java index 3e1220d4f97..303da59b07e 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 _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 { diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java index aeed99b5092..079cd5e341b 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 {