You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2014/02/05 00:39:34 UTC
[50/50] [abbrv] git commit: updated refs/heads/rbac to 9e92197
Fixing Build after merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e92197d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e92197d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e92197d
Branch: refs/heads/rbac
Commit: 9e92197dfda800c2a99e8b5db52c7460f28149fc
Parents: f843754
Author: Prachi Damle <pr...@cloud.com>
Authored: Tue Feb 4 15:10:24 2014 -0800
Committer: Prachi Damle <pr...@cloud.com>
Committed: Tue Feb 4 15:10:24 2014 -0800
----------------------------------------------------------------------
.../org/apache/cloudstack/affinity/AffinityApiUnitTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e92197d/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
index f891e70..f0ee8ab 100644
--- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
+++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
@@ -56,6 +56,7 @@ import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.test.utils.SpringUtils;
import com.cloud.dc.dao.DedicatedResourceDao;
@@ -286,6 +287,11 @@ public class AffinityApiUnitTest {
return Mockito.mock(DomainDao.class);
}
+ @Bean
+ public MessageBus messageBus() {
+ return Mockito.mock(MessageBus.class);
+ }
+
public static class Library implements TypeFilter {
@Override