From cb6d8d01901c00134d63d4a39172128582d378fc Mon Sep 17 00:00:00 2001 From: Prachi Damle Date: Thu, 7 Nov 2013 21:22:03 -0800 Subject: [PATCH] CLOUDSTACK-5045 [Automation][BVT] Affinity group type is missing "create affinity group page" and failed to create Affinity group Changes: - Changes to Unit tests needed after this fix. --- .../apache/cloudstack/affinity/AffinityApiUnitTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java index 97e093ff415..91d6958ff61 100644 --- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java @@ -63,6 +63,7 @@ import org.apache.cloudstack.test.utils.SpringUtils; import com.cloud.dc.dao.DedicatedResourceDao; import com.cloud.event.ActionEventUtils; import com.cloud.dc.dao.DedicatedResourceDao; +import com.cloud.deploy.DeploymentPlanner; import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEventUtils; import com.cloud.event.EventVO; @@ -88,7 +89,7 @@ import com.cloud.vm.dao.UserVmDao; public class AffinityApiUnitTest { @Inject - AffinityGroupService _affinityService; + AffinityGroupServiceImpl _affinityService; @Inject AccountManager _acctMgr; @@ -144,6 +145,10 @@ public class AffinityApiUnitTest { when(_processor.getType()).thenReturn("mock"); when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct); + List affinityProcessors = new ArrayList(); + affinityProcessors.add(_processor); + _affinityService.setAffinityGroupProcessors(affinityProcessors); + AffinityGroupVO group = new AffinityGroupVO("group1", "mock", "mock group", domainId, 200L, ControlledEntity.ACLType.Account); Mockito.when(_affinityGroupDao.persist(Mockito.any(AffinityGroupVO.class))).thenReturn(group);