Replace spy for mock

Author: Henrique Sato

server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java

@@ -73,9 +73,9 @@ public class ConfigurationManagerImplTest {
     @Mock
     DiskOfferingDetailsDao diskOfferingDetailsDao;
     @Spy
-    DiskOfferingVO diskOfferingVOSpy = new DiskOfferingVO();
-    @Spy
-    UpdateDiskOfferingCmd updateDiskOfferingCmdSpy = new UpdateDiskOfferingCmd();
+    DiskOfferingVO diskOfferingVOMock;
+    @Mock
+    UpdateDiskOfferingCmd updateDiskOfferingCmdSpy;
 
     Long validId = 1L;
     Long invalidId = 100L;
@@ -319,27 +319,27 @@ public void updateDiskOfferingIfCmdAttributeNotNullTestNotNullValueUpdateOfferin
         Mockito.doReturn(1).when(updateDiskOfferingCmdSpy).getSortKey();
         Mockito.doReturn(false).when(updateDiskOfferingCmdSpy).getDisplayOffering();
 
-        configurationManagerImplSpy.updateDiskOfferingIfCmdAttributeNotNull(this.diskOfferingVOSpy, updateDiskOfferingCmdSpy);
+        configurationManagerImplSpy.updateDiskOfferingIfCmdAttributeNotNull(diskOfferingVOMock, updateDiskOfferingCmdSpy);
 
-        Assert.assertEquals(updateDiskOfferingCmdSpy.getDiskOfferingName(), diskOfferingVOSpy.getName());
-        Assert.assertEquals(updateDiskOfferingCmdSpy.getDisplayText(), diskOfferingVOSpy.getDisplayText());
-        Assert.assertEquals(updateDiskOfferingCmdSpy.getSortKey(), (Integer) diskOfferingVOSpy.getSortKey());
-        Assert.assertEquals(updateDiskOfferingCmdSpy.getDisplayOffering(), diskOfferingVOSpy.getDisplayOffering());
+        Assert.assertEquals(updateDiskOfferingCmdSpy.getDiskOfferingName(), diskOfferingVOMock.getName());
+        Assert.assertEquals(updateDiskOfferingCmdSpy.getDisplayText(), diskOfferingVOMock.getDisplayText());
+        Assert.assertEquals(updateDiskOfferingCmdSpy.getSortKey(), (Integer) diskOfferingVOMock.getSortKey());
+        Assert.assertEquals(updateDiskOfferingCmdSpy.getDisplayOffering(), diskOfferingVOMock.getDisplayOffering());
     }
 
     @Test
     public void updateDiskOfferingIfCmdAttributeNotNullTestNullValueDoesntUpdateOfferingAttribute() {
-        diskOfferingVOSpy.setName("Name");
-        diskOfferingVOSpy.setDisplayText("DisplayText");
-        diskOfferingVOSpy.setSortKey(1);
-        diskOfferingVOSpy.setDisplayOffering(true);
+        Mockito.doReturn("Name").when(diskOfferingVOMock).getName();
+        Mockito.doReturn("DisplayText").when(diskOfferingVOMock).getDisplayText();
+        Mockito.doReturn(1).when(diskOfferingVOMock).getSortKey();
+        Mockito.doReturn(true).when(diskOfferingVOMock).getDisplayOffering();
 
-        configurationManagerImplSpy.updateDiskOfferingIfCmdAttributeNotNull(diskOfferingVOSpy, updateDiskOfferingCmdSpy);
+        configurationManagerImplSpy.updateDiskOfferingIfCmdAttributeNotNull(diskOfferingVOMock, updateDiskOfferingCmdSpy);
 
-        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDiskOfferingName(), diskOfferingVOSpy.getName());
-        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDisplayText(), diskOfferingVOSpy.getDisplayText());
-        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getSortKey(), (Integer) diskOfferingVOSpy.getSortKey());
-        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDisplayOffering(), diskOfferingVOSpy.getDisplayOffering());
+        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDiskOfferingName(), diskOfferingVOMock.getName());
+        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDisplayText(), diskOfferingVOMock.getDisplayText());
+        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getSortKey(), (Integer) diskOfferingVOMock.getSortKey());
+        Assert.assertNotEquals(updateDiskOfferingCmdSpy.getDisplayOffering(), diskOfferingVOMock.getDisplayOffering());
     }
 
     @Test
@@ -374,6 +374,7 @@ public void checkDomainAdminUpdateOfferingRestrictionsTestEmptyFilteredDomainIds
 
     @Test
     public void getAccountNonChildDomainsTestValidValuesReturnChildDomains() {
+        Mockito.doReturn(null).when(updateDiskOfferingCmdSpy).getSortKey();
         List<Long> nonChildDomains = configurationManagerImplSpy.getAccountNonChildDomains(diskOfferingMock, accountMock, userMock, updateDiskOfferingCmdSpy, existingDomainIds);
 
         for (int i = 0; i < existingDomainIds.size(); i++) {
@@ -383,8 +384,8 @@ public void getAccountNonChildDomainsTestValidValuesReturnChildDomains() {
 
     @Test
     public void getAccountNonChildDomainsTestAllDomainsAreChildDomainsReturnEmptyList() {
-        for (int i = 0; i < existingDomainIds.size(); i++) {
-            Mockito.when(domainDaoMock.isChildDomain(accountMock.getDomainId(), existingDomainIds.get(i))).thenReturn(true);
+        for (Long existingDomainId : existingDomainIds) {
+            Mockito.when(domainDaoMock.isChildDomain(accountMock.getDomainId(), existingDomainId)).thenReturn(true);
         }
 
         List<Long> nonChildDomains = configurationManagerImplSpy.getAccountNonChildDomains(diskOfferingMock, accountMock, userMock, updateDiskOfferingCmdSpy, existingDomainIds);