Skip to content

Commit d221efc

Browse files
author
Jayapal
committed
Fixed the tests related to network acl
1 parent 903af43 commit d221efc

2 files changed

Lines changed: 15 additions & 17 deletions

File tree

‎server/test/com/cloud/vpc/NetworkACLManagerTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import javax.inject.Inject;
2424

25+
import com.cloud.network.vpc.*;
2526
import junit.framework.TestCase;
2627

2728
import org.apache.log4j.Logger;
@@ -51,13 +52,6 @@
5152
import com.cloud.network.dao.NetworkDao;
5253
import com.cloud.network.dao.NetworkVO;
5354
import com.cloud.network.element.NetworkACLServiceProvider;
54-
import com.cloud.network.vpc.NetworkACLItem;
55-
import com.cloud.network.vpc.NetworkACLItemDao;
56-
import com.cloud.network.vpc.NetworkACLItemVO;
57-
import com.cloud.network.vpc.NetworkACLManager;
58-
import com.cloud.network.vpc.NetworkACLManagerImpl;
59-
import com.cloud.network.vpc.NetworkACLVO;
60-
import com.cloud.network.vpc.VpcManager;
6155
import com.cloud.network.vpc.dao.NetworkACLDao;
6256
import com.cloud.network.vpc.dao.VpcGatewayDao;
6357
import com.cloud.tags.dao.ResourceTagDao;
@@ -93,6 +87,8 @@ public class NetworkACLManagerTest extends TestCase{
9387
NetworkModel _networkModel;
9488
@Inject
9589
List<NetworkACLServiceProvider> _networkAclElements;
90+
@Inject
91+
VpcService _vpcSvc;
9692

9793
private NetworkACLVO acl;
9894
private NetworkACLItemVO aclItem;
@@ -219,6 +215,11 @@ public VpcGatewayDao vpcGatewayDao () {
219215
return Mockito.mock(VpcGatewayDao.class);
220216
}
221217

218+
@Bean
219+
public VpcService vpcService() {
220+
return Mockito.mock(VpcService.class);
221+
}
222+
222223
public static class Library implements TypeFilter {
223224
@Override
224225
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {

‎server/test/com/cloud/vpc/NetworkACLServiceTest.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import javax.inject.Inject;
2222

23+
import com.cloud.network.vpc.*;
2324
import com.cloud.network.vpc.dao.VpcDao;
2425
import junit.framework.TestCase;
2526

@@ -48,16 +49,6 @@
4849
import com.cloud.exception.InvalidParameterValueException;
4950
import com.cloud.network.NetworkModel;
5051
import com.cloud.network.dao.NetworkDao;
51-
import com.cloud.network.vpc.NetworkACLItem;
52-
import com.cloud.network.vpc.NetworkACLItemDao;
53-
import com.cloud.network.vpc.NetworkACLItemVO;
54-
import com.cloud.network.vpc.NetworkACLManager;
55-
import com.cloud.network.vpc.NetworkACLService;
56-
import com.cloud.network.vpc.NetworkACLServiceImpl;
57-
import com.cloud.network.vpc.NetworkACLVO;
58-
import com.cloud.network.vpc.Vpc;
59-
import com.cloud.network.vpc.VpcManager;
60-
import com.cloud.network.vpc.VpcVO;
6152
import com.cloud.network.vpc.dao.NetworkACLDao;
6253
import com.cloud.network.vpc.dao.VpcGatewayDao;
6354
import com.cloud.tags.dao.ResourceTagDao;
@@ -88,6 +79,8 @@ public class NetworkACLServiceTest extends TestCase{
8879
EntityManager _entityMgr;
8980
@Inject
9081
VpcDao _vpcDao;
82+
@Inject
83+
VpcService _vpcSvc;
9184

9285
private CreateNetworkACLCmd createACLItemCmd;
9386
private NetworkACLVO acl;
@@ -253,6 +246,10 @@ public VpcDao vpcDao () {
253246
return Mockito.mock(VpcDao.class);
254247
}
255248

249+
@Bean
250+
public VpcService vpcService() {
251+
return Mockito.mock(VpcService.class);
252+
}
256253

257254
public static class Library implements TypeFilter {
258255
@Override

0 commit comments

Comments
 (0)