Skip to content

Commit 6897eeb

Browse files
author
Julien Hervot de Mattos Vaz
committed
Fix QuotaServiceImplTest
1 parent 36fe76e commit 6897eeb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

plugins/database/quota/src/test/java/org/apache/cloudstack/quota/QuotaServiceImplTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
import org.junit.Before;
3636
import org.junit.Test;
3737
import org.junit.runner.RunWith;
38+
import org.mockito.InjectMocks;
3839
import org.mockito.Mock;
3940
import org.mockito.Mockito;
41+
import org.mockito.Spy;
4042
import org.mockito.junit.MockitoJUnitRunner;
4143

4244
import javax.naming.ConfigurationException;
@@ -66,7 +68,10 @@ public class QuotaServiceImplTest extends TestCase {
6668
@Mock
6769
private AccountVO accountVoMock;
6870

69-
QuotaServiceImpl quotaServiceImplSpy = new QuotaServiceImpl();
71+
@Spy
72+
@InjectMocks
73+
QuotaServiceImpl quotaServiceImplSpy;
74+
7075

7176
@Before
7277
public void setup() throws IllegalAccessException, NoSuchFieldException, ConfigurationException {
@@ -137,7 +142,7 @@ public void testGetQuotaUsage() {
137142
final Date startDate = new DateTime().minusDays(2).toDate();
138143
final Date endDate = new Date();
139144

140-
Mockito.doReturn(accountId).when(quotaServiceImplSpy).getAccountToWhomQuotaBalancesWillBeListed(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong());
145+
Mockito.lenient().doReturn(accountId).when(quotaServiceImplSpy).getAccountToWhomQuotaBalancesWillBeListed(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong());
141146

142147
quotaServiceImplSpy.getQuotaUsage(accountId, accountName, domainId, QuotaTypes.IP_ADDRESS, startDate, endDate);
143148
Mockito.verify(quotaUsageDao, Mockito.times(1)).findQuotaUsage(Mockito.eq(accountId), Mockito.eq(domainId), Mockito.eq(QuotaTypes.IP_ADDRESS), Mockito.any(Date.class), Mockito.any(Date.class));

0 commit comments

Comments
 (0)