[confluence-cmis-plugin] r109 committed - Mockito used instead of hardcoded mock objects

[confluence-...@googlecode.com]

Revision: 109
Author: c.sc...@sourcesense.com
Date: Mon Jun 7 06:45:36 2010
Log: Mockito used instead of hardcoded mock objects
http://code.google.com/p/confluence-cmis-plugin/source/detail?r=109

Modified:
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java

=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Mon Jun 7 06:16:55 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Mon Jun 7 06:45:36 2010
@@ -18,12 +18,14 @@
import com.atlassian.bandana.BandanaContext;
import com.atlassian.bandana.BandanaManager;
import com.atlassian.renderer.RenderContext;
-import com.atlassian.renderer.v2.RenderMode;
import com.atlassian.renderer.v2.macro.MacroException;
import com.sourcesense.confluence.cmis.utils.ConfluenceCMISRepository;
import com.sourcesense.confluence.cmis.utils.RepositoryStorage;
import junit.framework.TestCase;
-import org.apache.chemistry.opencmis.client.api.*;
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.Document;
+import org.apache.chemistry.opencmis.client.api.ItemIterable;
+import org.apache.chemistry.opencmis.client.api.Session;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
@@ -32,12 +34,17 @@

import java.util.*;

+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class TestBaseCMISMacro extends TestCase {

Logger logger = Logger.getLogger(TestBaseCMISMacro.class);

protected VelocityEngine ve;
protected VelocityContext vc;
+ protected BandanaManager bandanaManager;

String cmisRealm = "http://cmis.alfresco.com:80/service/cmis";
String cmisUser = "admin";
@@ -60,6 +67,20 @@
vc = new VelocityContext();
ve = new VelocityEngine();
ve.init(p);
+
+ // Confluence
+ Map<String, List<String>> repoConfigs = new WeakHashMap<String,
List<String>>();
+ List<String> repoConfig = new ArrayList<String>();
+
+ repoConfig.add(cmisRealm);
+ repoConfig.add(cmisUser);
+ repoConfig.add(cmisPwd);
+ //No need to specify a RepositoryID
+ repoConfig.add(null);
+ repoConfigs.put("test", repoConfig);
+
+ bandanaManager = mock (BandanaManager.class);
+ when(bandanaManager.getValue((BandanaContext)anyObject(),
anyString())).thenReturn(repoConfigs);
}

public void testRepositoryConnection() throws Exception {
@@ -76,23 +97,10 @@
String cmisPwdProp = System.getProperty("pwd");
if (cmisPwdProp != null) cmisPwd = cmisPwdProp;

- BaseCMISMacro baseMacro = new BaseCMISMacro() {
-
- public boolean hasBody() {
- return false; //To change body of implemented methods use File |
Settings | File Templates.
- }
-
- public RenderMode getBodyRenderMode() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
- }
-
- @Override
- protected String executeImpl(Map params, String body, RenderContext
renderContext, ConfluenceCMISRepository repo) {
- return "OK";
- }
- };
-
- baseMacro.setBandanaManager(new MockBandanaManager());
+ BaseCMISMacro baseMacro = mock (BaseCMISMacro.class);
+ when(baseMacro.execute(anyMap(), anyString(),
(RenderContext)anyObject())).thenReturn("OK");
+ when(baseMacro.hasBody()).thenReturn(false);
+ baseMacro.setBandanaManager(bandanaManager);

String result = null;

@@ -112,7 +120,7 @@

public void testRepositoryEnumeration() {

- RepositoryStorage repoStorage = RepositoryStorage.getInstance(new
MockBandanaManager());
+ RepositoryStorage repoStorage =
RepositoryStorage.getInstance(bandanaManager);

Set<String> repos = repoStorage.getRepositoryNames();

@@ -138,7 +146,7 @@
}

public void testCMISLinkGeneration() {
- RepositoryStorage repoStorage = RepositoryStorage.getInstance(new
MockBandanaManager());
+ RepositoryStorage repoStorage =
RepositoryStorage.getInstance(bandanaManager);

try {
ConfluenceCMISRepository repo = repoStorage.getRepository("test");
@@ -156,44 +164,4 @@
fail(e.getMessage());
}
}
-
- class MockBandanaManager implements BandanaManager {
-
- public void init() {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
- public void setValue(BandanaContext bandanaContext, String s, Object
o) {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
- // used in RepositoryStorage
-
- public Object getValue(BandanaContext bandanaContext, String s) {
- Map<String, List<String>> repoConfigs = new WeakHashMap<String,
List<String>>();
- List<String> repoConfig = new ArrayList<String>();
-
- repoConfig.add(cmisRealm);
- repoConfig.add(cmisUser);
- repoConfig.add(cmisPwd);
- //No need to specify a RepositoryID
- repoConfig.add(null);
-
- repoConfigs.put("test", repoConfig);
-
- return repoConfigs; //To change body of implemented methods use
File | Settings | File Templates.
- }
-
- public Object getValue(BandanaContext bandanaContext, String s,
boolean b) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
- }
-
- public String exportValues(BandanaContext bandanaContext) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
- }
-
- public void importValues(BandanaContext bandanaContext, String s) {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
- }
-}
+}