Repository: cloudstack Updated Branches: refs/heads/4.4-forward 66df43572 -> 96bfa8a73
Fixed unittest Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96bfa8a7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96bfa8a7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96bfa8a7 Branch: refs/heads/4.4-forward Commit: 96bfa8a73f0054db42beaff6a8ba3af058d3d915 Parents: 66df435 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Thu Jun 5 18:20:33 2014 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Thu Jun 5 18:20:33 2014 -0700 ---------------------------------------------------------------------- .../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/96bfa8a7/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/96bfa8a7/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 @@ <bean id="usageEventDaoImpl" class="com.cloud.event.dao.UsageEventDaoImpl" /> <bean id="usageEventDetailsDaoImpl" class="com.cloud.event.dao.UsageEventDetailsDaoImpl" /> <bean id="storagePoolHostDaoImpl" class="com.cloud.storage.dao.StoragePoolHostDaoImpl" /> - <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" /> + <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" /> + <bean id="userIpAddressDetailsDao" class="org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDaoImpl" /> + </beans>
