Skip to content

Commit 370a7fd

Browse files
kelvenykelveny
committed
CLOUDSTACK-1884: fix the unit test issue
1 parent 4958070 commit 370a7fd

5 files changed

Lines changed: 27 additions & 12 deletions

File tree

‎server/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@
158158
<exclude>com/cloud/network/vpn/RemoteAccessVpnTest.java</exclude>
159159
<exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
160160
<exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
161-
<!-- see CLOUDSTACK-1884 -->
162-
<exclude>org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java</exclude>
163-
<exclude>org/apache/cloudstack/affinity/AffinityApiUnitTest.java</exclude>
164161
</excludes>
165162
</configuration>
166163
</plugin>

‎server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import com.cloud.dc.dao.ClusterDaoImpl;
4343
import com.cloud.dc.dao.DataCenterDaoImpl;
4444
import com.cloud.dc.dao.DataCenterIpAddressDaoImpl;
45+
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao;
4546
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
4647
import com.cloud.dc.dao.DataCenterVnetDaoImpl;
4748
import com.cloud.dc.dao.DcDetailsDaoImpl;
@@ -51,6 +52,7 @@
5152
import com.cloud.dc.dao.VlanDaoImpl;
5253
import com.cloud.domain.dao.DomainDaoImpl;
5354
import com.cloud.event.EventUtils;
55+
import com.cloud.event.dao.EventDao;
5456
import com.cloud.event.dao.EventDaoImpl;
5557
import com.cloud.event.dao.UsageEventDaoImpl;
5658
import com.cloud.host.dao.HostDaoImpl;
@@ -122,15 +124,15 @@
122124
UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class,
123125
VMInstanceDaoImpl.class, HostTransferMapDaoImpl.class, PortForwardingRulesDaoImpl.class,
124126
PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class, DiskOfferingDaoImpl.class,
125-
DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
127+
DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class,
126128
DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DcDetailsDaoImpl.class, NicSecondaryIpDaoImpl.class,
127129
UserIpv6AddressDaoImpl.class, S3DaoImpl.class, UserDaoImpl.class, NicDaoImpl.class, NetworkDomainDaoImpl.class,
128130
HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class,
129131
FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class,
130132
PhysicalNetworkServiceProviderDaoImpl.class, LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class,
131133
PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class, AffinityGroupServiceImpl.class,
132-
ComponentContext.class, AffinityGroupProcessor.class, UserVmVO.class, EventUtils.class, UserVmVO.class,
133-
EventDaoImpl.class }, includeFilters = { @Filter(value = AffinityApiTestConfiguration.Library.class, type = FilterType.CUSTOM) }, useDefaultFilters = false)
134+
ComponentContext.class, AffinityGroupProcessor.class, UserVmVO.class, EventUtils.class, UserVmVO.class
135+
}, includeFilters = { @Filter(value = AffinityApiTestConfiguration.Library.class, type = FilterType.CUSTOM) }, useDefaultFilters = false)
134136
public class AffinityApiTestConfiguration {
135137

136138
@Bean
@@ -308,6 +310,11 @@ public NetworkManager networkManager() {
308310
public NetworkOfferingDao networkOfferingDao() {
309311
return Mockito.mock(NetworkOfferingDao.class);
310312
}
313+
314+
@Bean
315+
public EventDao eventDao() {
316+
return Mockito.mock(EventDao.class);
317+
}
311318

312319
@Bean
313320
public NetworkDao networkDao() {
@@ -319,6 +326,11 @@ public NetworkOfferingServiceMapDao networkOfferingServiceMapDao() {
319326
return Mockito.mock(NetworkOfferingServiceMapDao.class);
320327
}
321328

329+
@Bean
330+
public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() {
331+
return Mockito.mock(DataCenterLinkLocalIpAddressDao.class);
332+
}
333+
322334
public static class Library implements TypeFilter {
323335

324336
@Override

‎server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import static org.mockito.Mockito.*;
2222

2323
import java.util.ArrayList;
24-
import java.util.HashMap;
2524
import java.util.List;
26-
import java.util.Map;
2725

2826
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
2927
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
@@ -36,15 +34,15 @@
3634
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3735

3836
import com.cloud.event.EventUtils;
37+
import com.cloud.event.EventVO;
38+
import com.cloud.event.dao.EventDao;
3939
import com.cloud.exception.InvalidParameterValueException;
4040
import com.cloud.exception.ResourceInUseException;
4141
import com.cloud.hypervisor.Hypervisor.HypervisorType;
4242
import com.cloud.user.Account;
4343
import com.cloud.user.AccountManager;
44-
import com.cloud.user.AccountManagerImpl;
4544
import com.cloud.user.AccountVO;
4645
import com.cloud.user.UserContext;
47-
import com.cloud.user.UserContextInitializer;
4846
import com.cloud.user.dao.AccountDao;
4947
import com.cloud.utils.component.ComponentContext;
5048
import com.cloud.vm.UserVmVO;
@@ -84,6 +82,9 @@ public class AffinityApiUnitTest {
8482

8583
@Inject
8684
AccountDao _accountDao;
85+
86+
@Inject
87+
EventDao _eventDao;
8788

8889
private static long domainId = 5L;
8990

@@ -113,6 +114,7 @@ public void testSetUp() {
113114
Mockito.when(_affinityGroupDao.findByAccountAndName(Mockito.anyLong(), Mockito.anyString())).thenReturn(group);
114115
Mockito.when(_affinityGroupDao.lockRow(Mockito.anyLong(), anyBoolean())).thenReturn(group);
115116
Mockito.when(_affinityGroupDao.expunge(Mockito.anyLong())).thenReturn(true);
117+
Mockito.when(_eventDao.persist(Mockito.any(EventVO.class))).thenReturn(new EventVO());
116118
}
117119

118120
@Test

‎server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import com.cloud.dc.dao.ClusterDaoImpl;
4242
import com.cloud.dc.dao.DataCenterDaoImpl;
4343
import com.cloud.dc.dao.DataCenterIpAddressDaoImpl;
44+
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao;
4445
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
4546
import com.cloud.dc.dao.DataCenterVnetDaoImpl;
4647
import com.cloud.dc.dao.DcDetailsDaoImpl;
@@ -135,7 +136,6 @@
135136
DiskOfferingDaoImpl.class,
136137
DataCenterDaoImpl.class,
137138
DataCenterIpAddressDaoImpl.class,
138-
DataCenterLinkLocalIpAddressDaoImpl.class,
139139
DataCenterVnetDaoImpl.class,
140140
PodVlanDaoImpl.class,
141141
DcDetailsDaoImpl.class,
@@ -319,6 +319,11 @@ public NetworkOfferingServiceMapDao networkOfferingServiceMapDao() {
319319
return Mockito.mock(NetworkOfferingServiceMapDao.class);
320320
}
321321

322+
@Bean
323+
public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() {
324+
return Mockito.mock(DataCenterLinkLocalIpAddressDao.class);
325+
}
326+
322327
public static class Library implements TypeFilter {
323328

324329
@Override

‎server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import com.cloud.user.AccountManager;
5050
import com.cloud.user.AccountVO;
5151
import com.cloud.user.UserContext;
52-
import com.cloud.user.UserContextInitializer;
5352
import com.cloud.user.UserVO;
5453
import com.cloud.utils.component.ComponentContext;
5554

0 commit comments

Comments
 (0)