[cloudstack] branch main updated: Remove powermock from database/quota plugin (#7795)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 0d9292c9ea1 Remove powermock from database/quota plugin (#7795)
0d9292c9ea1 is described below

commit 0d9292c9ea168c358210796c4ec876438119cda0
Author: Vishesh <vishes...@gmail.com>
AuthorDate: Tue Aug 1 12:25:29 2023 +0530

    Remove powermock from database/quota plugin (#7795)
---
 .../api/response/QuotaResponseBuilderImplTest.java  | 21 +++++++++------------
 .../org.mockito.plugins.MockMaker                   |  1 +
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
 
b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
index a02afdaf45e..b960a1be569 100644
--- 
a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
+++ 
b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
@@ -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));
diff --git 
a/plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
 
b/plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ 
b/plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline