Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF28410467 for ; Tue, 11 Mar 2014 14:27:34 +0000 (UTC) Received: (qmail 65408 invoked by uid 500); 11 Mar 2014 14:27:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 64761 invoked by uid 500); 11 Mar 2014 14:26:49 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 63628 invoked by uid 99); 11 Mar 2014 14:26:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 14:26:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 17F7A93EDBB; Tue, 11 Mar 2014 14:26:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Tue, 11 Mar 2014 14:26:44 -0000 Message-Id: <48032527a32a40e18ab530f234b30a13@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] git commit: updated refs/heads/regionvpc to edf12eb findbugs: String for Service type mismatch (plus test for dummy data) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1075bed0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1075bed0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1075bed0 Branch: refs/heads/regionvpc Commit: 1075bed06c32f14152a8c5c7e534955392e5f662 Parents: 07102b4 Author: Daan Hoogland Authored: Mon Mar 10 10:44:10 2014 +0100 Committer: Daan Hoogland Committed: Mon Mar 10 10:44:10 2014 +0100 ---------------------------------------------------------------------- .../com/cloud/network/vpc/VpcManagerImpl.java | 4 +- .../cloud/network/vpc/VpcManagerImplTest.java | 53 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1075bed0/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 403b95e..762cc6f 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -424,14 +424,14 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis List map = _vpcOffSvcMapDao.listByVpcOffId(vpcOffId); for (VpcOfferingServiceMapVO instance : map) { - String service = instance.getService(); + Service service = Service.getService(instance.getService()); Set providers; providers = serviceProviderMap.get(service); if (providers == null) { providers = new HashSet(); } providers.add(Provider.getProvider(instance.getProvider())); - serviceProviderMap.put(Service.getService(service), providers); + serviceProviderMap.put(service, providers); } return serviceProviderMap; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1075bed0/server/test/com/cloud/network/vpc/VpcManagerImplTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/network/vpc/VpcManagerImplTest.java b/server/test/com/cloud/network/vpc/VpcManagerImplTest.java new file mode 100644 index 0000000..a0237b4 --- /dev/null +++ b/server/test/com/cloud/network/vpc/VpcManagerImplTest.java @@ -0,0 +1,53 @@ +package com.cloud.network.vpc; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.cloudstack.context.CallContext; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +import static org.mockito.Mockito.when; + +import com.cloud.network.Network.Provider; +import com.cloud.network.Network.Service; +import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao; +import com.cloud.user.Account; +import com.cloud.user.User; + +public class VpcManagerImplTest { + + @Mock + VpcOfferingServiceMapDao vpcOffSvcMapDao; + VpcManagerImpl manager; + + @Before + public void setup() + { + MockitoAnnotations.initMocks(this); + manager = new VpcManagerImpl(); + manager._vpcOffSvcMapDao = vpcOffSvcMapDao; + } + @Test + public void getVpcOffSvcProvidersMapForEmptyServiceTest() { + long vpcOffId = 1L; + List list = new ArrayList(); + list.add(Mockito.mock(VpcOfferingServiceMapVO.class)); + when(manager._vpcOffSvcMapDao.listByVpcOffId(vpcOffId)).thenReturn(list); + + Map> map = manager.getVpcOffSvcProvidersMap(vpcOffId); + + assertNotNull(map); + assertEquals(map.size(),1); + } + +}