Skip to content

Commit b4db390

Browse files
author
Julien Hervot de Mattos Vaz
committed
Refactor test
1 parent 34fb78b commit b4db390

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ public void setup() {
198198
@Mock
199199
JsInterpreterHelper jsInterpreterHelperMock = Mockito.mock(JsInterpreterHelper.class);
200200

201-
@Mock
202-
QuotaSummaryCmd quotaSummaryCmdMock = Mockito.mock(QuotaSummaryCmd.class);
203-
204201
private QuotaTariffVO makeTariffTestData() {
205202
QuotaTariffVO tariffVO = new QuotaTariffVO();
206203
tariffVO.setUsageType(QuotaTypes.IP_ADDRESS);
@@ -769,15 +766,16 @@ public void getQuotaSummaryResponseWithListAllTestAccountNameIsNullAndDomainIdIs
769766
public void getQuotaSummaryResponseWithListAllTestAccountNameAndDomainIdAreNotNullPassDomainId() {
770767
Long expectedDomainId = 9837l;
771768

772-
Mockito.lenient().doReturn("test").when(quotaSummaryCmdMock).getAccountName();
773-
Mockito.doReturn(expectedDomainId).when(quotaSummaryCmdMock).getDomainId();
769+
QuotaSummaryCmd cmd = Mockito.mock(QuotaSummaryCmd.class);
770+
Mockito.lenient().doReturn("test").when(cmd).getAccountName();
771+
Mockito.doReturn(expectedDomainId).when(cmd).getDomainId();
774772

775773
Mockito.doReturn(domainVoMock).when(domainDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
776774

777775
Mockito.doReturn(null).when(quotaResponseBuilderSpy).getDomainPathByDomainIdForDomainAdmin(Mockito.any());
778776
Mockito.doReturn(quotaSummaryResponseMock1).when(quotaResponseBuilderSpy).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
779777

780-
Pair<List<QuotaSummaryResponse>, Integer> result = quotaResponseBuilderSpy.getQuotaSummaryResponseWithListAll(quotaSummaryCmdMock, accountMock);
778+
Pair<List<QuotaSummaryResponse>, Integer> result = quotaResponseBuilderSpy.getQuotaSummaryResponseWithListAll(cmd, accountMock);
781779

782780
Assert.assertEquals(quotaSummaryResponseMock1, result);
783781
Mockito.verify(quotaResponseBuilderSpy).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.eq(expectedDomainId), Mockito.any(), Mockito.any());

0 commit comments

Comments
 (0)