Fix Unit tests

Author: abh1sar

server/src/test/java/com/cloud/user/AccountManagerImplTest.java

@@ -167,7 +167,6 @@ public void disableAccount() throws ConcurrentOperationException, ResourceUnavai
     public void deleteUserAccount() {
         AccountVO account = new AccountVO();
         account.setId(42l);
-        account.setState(State.DISABLED);
         DomainVO domain = new DomainVO();
         Mockito.when(_accountDao.findById(42l)).thenReturn(account);
         Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.anyBoolean(), Mockito.any(Account.class));
@@ -196,7 +195,6 @@ public void deleteUserAccount() {
     public void deleteUserAccountCleanup() {
         AccountVO account = new AccountVO();
         account.setId(42l);
-        account.setState(State.DISABLED);
         DomainVO domain = new DomainVO();
         Mockito.when(_accountDao.findById(42l)).thenReturn(account);
         Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.anyBoolean(), Mockito.any(Account.class));
@@ -213,16 +211,6 @@ public void deleteUserAccountCleanup() {
         Mockito.verify(_accountDao, Mockito.atLeastOnce()).markForCleanup(Mockito.eq(42l));
     }
 
-    @Test (expected = CloudRuntimeException.class)
-    public void deleteUserAccountEnabled() {
-        AccountVO account = new AccountVO();
-        account.setId(42l);
-        account.setState(State.ENABLED);
-        Mockito.when(_accountDao.findById(42l)).thenReturn(account);
-        Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.anyBoolean(), Mockito.any(Account.class));
-        accountManagerImpl.deleteUserAccount(42l);
-    }
-
     @Test (expected = InvalidParameterValueException.class)
     public void deleteUserAccountTestIfAccountIdIsEqualToCallerIdShouldThrowException() {
         try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
@@ -246,11 +234,7 @@ public void deleteUserAccountTestIfAccountIdIsNotEqualToCallerAccountIdShouldNot
             callContextMocked.when(CallContext::current).thenReturn(callContextMock);
             long accountId = 1L;
 
-            AccountVO account = new AccountVO();
-            account.setId(accountId);
-            account.setState(State.DISABLED);
             Mockito.doReturn(accountVoMock).when(callContextMock).getCallingAccount();
-            Mockito.doReturn(account).when(_accountDao).findById(accountId);
             Mockito.doReturn(2L).when(accountVoMock).getId();
             Mockito.doReturn(true).when(accountManagerImpl).isDeleteNeeded(Mockito.any(), Mockito.anyLong(), Mockito.any());
             Mockito.doReturn(new ArrayList<Long>()).when(_projectAccountDao).listAdministratedProjectIds(Mockito.anyLong());

server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java

@@ -118,7 +118,6 @@ protected void defineMocksBehavior() throws AgentUnavailableException, Concurren
 
         AccountVO account = new AccountVO();
         account.setId(ACCOUNT_ID);
-        account.setState(Account.State.DISABLED);
         when(_accountDao.remove(ACCOUNT_ID)).thenReturn(true);
         when(_accountDao.findById(ACCOUNT_ID)).thenReturn(account);