You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/03/30 10:58:47 UTC
[18/52] [abbrv] git commit: updated refs/heads/qemu-img to 44197a0
Fixed createNetworkOfferingUnittest
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34a59fc3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34a59fc3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34a59fc3
Branch: refs/heads/qemu-img
Commit: 34a59fc3a7cbd8d1d261dc3fca10cbc6a02f0ec9
Parents: 0f3b7ef
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Mar 28 12:16:05 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Mar 28 12:16:05 2013 -0700
----------------------------------------------------------------------
.../networkoffering/CreateNetworkOfferingTest.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34a59fc3/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 bb82991..1353959 100644
--- a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
+++ b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
@@ -46,7 +46,6 @@ import com.cloud.offerings.NetworkOfferingServiceMapVO;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
-import com.cloud.user.UserContext;
import com.cloud.user.UserContextInitializer;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -64,9 +63,6 @@ public class CreateNetworkOfferingTest extends TestCase{
NetworkOfferingDao offDao;
@Inject
- UserContext usrCtx;
-
- @Inject
UserContextInitializer usrCtxInit;
@Inject
@@ -79,7 +75,6 @@ public class CreateNetworkOfferingTest extends TestCase{
Mockito.when(offDao.persist(Mockito.any(NetworkOfferingVO.class))).thenReturn(new NetworkOfferingVO());
Mockito.when(mapDao.persist(Mockito.any(NetworkOfferingServiceMapVO.class))).thenReturn(new NetworkOfferingServiceMapVO());
- Mockito.when(usrCtx.current()).thenReturn(new UserContext());
}
//Test Shared network offerings
@@ -88,7 +83,6 @@ public class CreateNetworkOfferingTest extends TestCase{
NetworkOfferingVO off = configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true,
Availability.Optional, 200, null, false, Network.GuestType.Shared, false,
null, false, null, true, false);
-
assertNotNull("Shared network offering with specifyVlan=true failed to create ", off);
}