apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test case failures in network acl

Browse Source
This commit is contained in:
Jayapal 2013-12-11 14:20:11 +05:30
parent 36cbc2dfbf
commit b385cb4f7a
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/test/com/cloud/vpc/NetworkACLManagerTest.java
View File

@ -22,6 +22,7 @@ import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import com.cloud.network.vpc.*;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.log4j.Logger; 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.NetworkDao;
import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.NetworkACLServiceProvider; 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.NetworkACLDao;
import com.cloud.network.vpc.dao.VpcGatewayDao; import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao; import com.cloud.tags.dao.ResourceTagDao;
@ -94,6 +88,8 @@ public class NetworkACLManagerTest extends TestCase {
NetworkModel _networkModel; NetworkModel _networkModel;
@Inject @Inject
List<NetworkACLServiceProvider> _networkAclElements; List<NetworkACLServiceProvider> _networkAclElements;
@Inject
VpcService _vpcSrv;
private NetworkACLVO acl; private NetworkACLVO acl;
private NetworkACLItemVO aclItem; private NetworkACLItemVO aclItem;
@ -220,6 +216,12 @@ public class NetworkACLManagerTest extends TestCase {
return Mockito.mock(VpcGatewayDao.class); return Mockito.mock(VpcGatewayDao.class);
} }
@Bean
public VpcService vpcService() {
return Mockito.mock(VpcService.class);
}
public static class Library implements TypeFilter { public static class Library implements TypeFilter {
@Override @Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {

20
server/test/com/cloud/vpc/NetworkACLServiceTest.java
View File

@ -20,6 +20,7 @@ import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import com.cloud.network.vpc.*;
import com.cloud.network.vpc.dao.VpcDao; import com.cloud.network.vpc.dao.VpcDao;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -49,16 +50,6 @@ import org.apache.cloudstack.test.utils.SpringUtils;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.NetworkModel; import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao; 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.NetworkACLDao;
import com.cloud.network.vpc.dao.VpcGatewayDao; import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao; import com.cloud.tags.dao.ResourceTagDao;
@ -89,6 +80,9 @@ public class NetworkACLServiceTest extends TestCase {
EntityManager _entityMgr; EntityManager _entityMgr;
@Inject @Inject
VpcDao _vpcDao; VpcDao _vpcDao;
@Inject
VpcService _vpcSrv;
private CreateNetworkACLCmd createACLItemCmd; private CreateNetworkACLCmd createACLItemCmd;
private NetworkACLVO acl; private NetworkACLVO acl;
@ -254,6 +248,12 @@ public class NetworkACLServiceTest extends TestCase {
return Mockito.mock(VpcDao.class); return Mockito.mock(VpcDao.class);
} }
@Bean
public VpcService vpcService() {
return Mockito.mock(VpcService.class);
}
public static class Library implements TypeFilter { public static class Library implements TypeFilter {
@Override @Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {