etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the tests related to network acl

This commit is contained in:
Jayapal 2013-12-11 13:07:06 +05:30
parent 903af43be4
commit d221efcf81
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

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

@ -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