apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove powermock from database/quota plugin (#7795)

Browse Source
This commit is contained in:
Vishesh 2023-08-01 12:25:29 +05:30 committed by GitHub
parent d51d8a4a13
commit 0d9292c9ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,10 +52,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockedConstruction;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@ -64,8 +62,9 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import junit.framework.TestCase;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(PowerMockRunner.class)
@RunWith(MockitoJUnitRunner.class)
public class QuotaResponseBuilderImplTest extends TestCase {
@Mock
@ -322,12 +321,13 @@ public class QuotaResponseBuilderImplTest extends TestCase {
}
@Test
@PrepareForTest(QuotaResponseBuilderImpl.class)
public void getNewQuotaTariffObjectTestCreateFromCurrentQuotaTariff() throws Exception {
PowerMockito.whenNew(QuotaTariffVO.class).withArguments(Mockito.any(QuotaTariffVO.class)).thenReturn(quotaTariffVoMock);
quotaResponseBuilderSpy.getNewQuotaTariffObject(quotaTariffVoMock, "", 0);
PowerMockito.verifyNew(QuotaTariffVO.class).withArguments(Mockito.any(QuotaTariffVO.class));
try (MockedConstruction<QuotaTariffVO> quotaTariffVOMockedConstruction = Mockito.mockConstruction(QuotaTariffVO.class, (mock,
context) -> {
})) {
QuotaTariffVO result = quotaResponseBuilderSpy.getNewQuotaTariffObject(quotaTariffVoMock, "", 0);
Assert.assertEquals(quotaTariffVOMockedConstruction.constructed().get(0), result);
}
}
@Test (expected = InvalidParameterValueException.class)
@ -360,7 +360,6 @@ public class QuotaResponseBuilderImplTest extends TestCase {
@Test (expected = ServerApiException.class)
public void deleteQuotaTariffTestQuotaDoesNotExistThrowsServerApiException() {
Mockito.doReturn(null).when(quotaTariffDaoMock).findById(Mockito.anyLong());
quotaResponseBuilderSpy.deleteQuotaTariff("");
}
@ -380,7 +379,6 @@ public class QuotaResponseBuilderImplTest extends TestCase {
Calendar[] period = createPeriodForQuotaSummary();
overrideDefaultQuotaEnabledConfigValue("false");
Mockito.doReturn(accountMock).when(accountDaoMock).findActiveAccount(Mockito.anyString(), Mockito.anyLong());
Mockito.doReturn(period).when(quotaStatementMock).getCurrentStatementTime();
Mockito.doReturn(domainVOMock).when(domainDaoMock).findById(Mockito.anyLong());
Mockito.doReturn(BigDecimal.ZERO).when(quotaBalanceDaoMock).lastQuotaBalance(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(Date.class));
@ -396,7 +394,6 @@ public class QuotaResponseBuilderImplTest extends TestCase {
Calendar[] period = createPeriodForQuotaSummary();
overrideDefaultQuotaEnabledConfigValue("true");
Mockito.doReturn(accountMock).when(accountDaoMock).findActiveAccount(Mockito.anyString(), Mockito.anyLong());
Mockito.doReturn(period).when(quotaStatementMock).getCurrentStatementTime();
Mockito.doReturn(domainVOMock).when(domainDaoMock).findById(Mockito.anyLong());
Mockito.doReturn(BigDecimal.ZERO).when(quotaBalanceDaoMock).lastQuotaBalance(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(Date.class));

1
plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker Normal file
View File

@ -0,0 +1 @@
mock-maker-inline