You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/14 01:30:04 UTC

[2/2] git commit: Fixed unitest

Fixed unitest


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/62526a71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/62526a71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/62526a71

Branch: refs/heads/master
Commit: 62526a715a4649d984357950125656f953a47bfd
Parents: 4433c5a
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Aug 13 16:17:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Aug 13 16:20:09 2012 -0700

----------------------------------------------------------------------
 .../com/cloud/projects/MockProjectManagerImpl.java |   19 ++++++++-------
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |   10 ++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/62526a71/server/test/com/cloud/projects/MockProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/projects/MockProjectManagerImpl.java b/server/test/com/cloud/projects/MockProjectManagerImpl.java
index e72a1ff..af81c86 100644
--- a/server/test/com/cloud/projects/MockProjectManagerImpl.java
+++ b/server/test/com/cloud/projects/MockProjectManagerImpl.java
@@ -53,15 +53,6 @@ public class MockProjectManagerImpl implements ProjectManager, Manager {
     }
 
     @Override
-    public List<? extends Project> listProjects(Long id, String name,
-            String displayText, String state, String accountName,
-            Long domainId, String keyword, Long startIndex, Long pageSize,
-            boolean listAll, boolean isRecursive) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
     public ProjectAccount assignAccountToProject(Project project,
             long accountId, Role accountRole) {
         // TODO Auto-generated method stub
@@ -228,4 +219,14 @@ public class MockProjectManagerImpl implements ProjectManager, Manager {
         return false;
     }
 
+    /* (non-Javadoc)
+     * @see com.cloud.projects.ProjectService#listProjects(java.lang.Long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Long, java.lang.String, java.lang.Long, java.lang.Long, boolean, boolean, java.util.Map)
+     */
+    @Override
+    public List<? extends Project> listProjects(Long id, String name, String displayText, String state, String accountName, Long domainId, String keyword, Long startIndex, Long pageSize, boolean listAll,
+            boolean isRecursive, Map<String, String> tags) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/62526a71/server/test/com/cloud/vpc/MockVpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java
index 8fb2aee..575ed2b 100644
--- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java
@@ -41,6 +41,7 @@ import com.cloud.network.vpc.VpcGateway;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.VpcOffering;
 import com.cloud.network.vpc.VpcService;
+import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
 import com.cloud.user.User;
 import com.cloud.utils.component.ComponentLocator;
@@ -442,4 +443,13 @@ public class MockVpcManagerImpl implements VpcManager, Manager{
         return null;
     }
 
+    /* (non-Javadoc)
+     * @see com.cloud.network.vpc.VpcManager#validateNtwkOffForVpc(com.cloud.offering.NetworkOffering, java.util.List)
+     */
+    @Override
+    public void validateNtwkOffForVpc(NetworkOffering guestNtwkOff, List<Service> supportedSvcs) {
+        // TODO Auto-generated method stub
+        
+    }
+
 }