@@ -198,9 +198,6 @@ public void setup() {
198
198
@ Mock
199
199
JsInterpreterHelper jsInterpreterHelperMock = Mockito .mock (JsInterpreterHelper .class );
200
200
201
- @ Mock
202
- QuotaSummaryCmd quotaSummaryCmdMock = Mockito .mock (QuotaSummaryCmd .class );
203
-
204
201
private QuotaTariffVO makeTariffTestData () {
205
202
QuotaTariffVO tariffVO = new QuotaTariffVO ();
206
203
tariffVO .setUsageType (QuotaTypes .IP_ADDRESS );
@@ -769,15 +766,16 @@ public void getQuotaSummaryResponseWithListAllTestAccountNameIsNullAndDomainIdIs
769
766
public void getQuotaSummaryResponseWithListAllTestAccountNameAndDomainIdAreNotNullPassDomainId () {
770
767
Long expectedDomainId = 9837l ;
771
768
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 ();
774
772
775
773
Mockito .doReturn (domainVoMock ).when (domainDaoMock ).findByIdIncludingRemoved (Mockito .anyLong ());
776
774
777
775
Mockito .doReturn (null ).when (quotaResponseBuilderSpy ).getDomainPathByDomainIdForDomainAdmin (Mockito .any ());
778
776
Mockito .doReturn (quotaSummaryResponseMock1 ).when (quotaResponseBuilderSpy ).getQuotaSummaryResponse (Mockito .any (), Mockito .any (), Mockito .any (), Mockito .any (), Mockito .any ());
779
777
780
- Pair <List <QuotaSummaryResponse >, Integer > result = quotaResponseBuilderSpy .getQuotaSummaryResponseWithListAll (quotaSummaryCmdMock , accountMock );
778
+ Pair <List <QuotaSummaryResponse >, Integer > result = quotaResponseBuilderSpy .getQuotaSummaryResponseWithListAll (cmd , accountMock );
781
779
782
780
Assert .assertEquals (quotaSummaryResponseMock1 , result );
783
781
Mockito .verify (quotaResponseBuilderSpy ).getQuotaSummaryResponse (Mockito .any (), Mockito .any (), Mockito .eq (expectedDomainId ), Mockito .any (), Mockito .any ());
0 commit comments