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 14D3311600 for ; Fri, 6 Jun 2014 11:44:24 +0000 (UTC) Received: (qmail 8247 invoked by uid 500); 6 Jun 2014 11:44:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 8199 invoked by uid 500); 6 Jun 2014 11:44:23 -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 8112 invoked by uid 99); 6 Jun 2014 11:44:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2014 11:44:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8525F1DD2; Fri, 6 Jun 2014 11:44:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Fri, 06 Jun 2014 11:44:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/4.4 to 0b08d53 Fixed unittest (cherry picked from commit 96bfa8a73f0054db42beaff6a8ba3af058d3d915) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b08d531 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b08d531 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b08d531 Branch: refs/heads/4.4 Commit: 0b08d5319cc1cc1a3c8f0d41be5f9fc9c063f893 Parents: e6c37ff Author: Alena Prokharchyk Authored: Thu Jun 5 18:20:33 2014 -0700 Committer: Daan Hoogland Committed: Fri Jun 6 13:43:56 2014 +0200 ---------------------------------------------------------------------- .../networkoffering/CreateNetworkOfferingTest.java | 11 +++++++---- server/test/resources/createNetworkOffering.xml | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b08d531/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java ---------------------------------------------------------------------- diff --git a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java index ccebb95..466adb5 100644 --- a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java +++ b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java @@ -26,6 +26,10 @@ import javax.inject.Inject; import junit.framework.TestCase; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.framework.config.impl.ConfigurationVO; +import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,10 +39,6 @@ import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.framework.config.impl.ConfigurationVO; - import com.cloud.configuration.ConfigurationManager; import com.cloud.event.dao.UsageEventDao; import com.cloud.event.dao.UsageEventDetailsDao; @@ -90,6 +90,9 @@ public class CreateNetworkOfferingTest extends TestCase { @Inject UsageEventDetailsDao usageEventDetailsDao; + @Inject + UserIpAddressDetailsDao userIpAddressDetailsDao; + @Override @Before public void setUp() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b08d531/server/test/resources/createNetworkOffering.xml ---------------------------------------------------------------------- diff --git a/server/test/resources/createNetworkOffering.xml b/server/test/resources/createNetworkOffering.xml index 887a8af..1336367 100644 --- a/server/test/resources/createNetworkOffering.xml +++ b/server/test/resources/createNetworkOffering.xml @@ -49,5 +49,7 @@ - + + +