[confluence-cmis-plugin] r110 committed - Refactor unit tests class hierarchy

[confluence-...@googlecode.com]

Revision: 110
Author: c.sc...@sourcesense.com
Date: Mon Jun 7 06:49:43 2010
Log: Refactor unit tests class hierarchy
http://code.google.com/p/confluence-cmis-plugin/source/detail?r=110

Added:

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

=======================================
--- /dev/null
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/AbstractBaseUnitTest.java
Mon Jun 7 06:49:43 2010
@@ -0,0 +1,62 @@
+package com.sourcesense.confluence.cmis;
+
+import com.atlassian.bandana.BandanaContext;
+import com.atlassian.bandana.BandanaManager;
+import junit.framework.TestCase;
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+import java.util.*;
+
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Carlo Sciolla <c.sc...@sourcesense.com>
+ */
+public abstract class AbstractBaseUnitTest extends TestCase
+{
+ protected VelocityEngine ve;
+ protected VelocityContext vc;
+ protected BandanaManager bandanaManager;
+
+ String cmisRealm = "http://cmis.alfresco.com:80/service/cmis";
+ String cmisUser = "admin";
+ String cmisPwd = "admin";
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // log4j:
+
PropertyConfigurator.configure(this.getClass().getClassLoader().getResource("log4j.properties"));
+
+ // Velocity:
+ Properties p = new Properties();
+
p.setProperty("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ p.setProperty("resource.loader", "class");
+
p.setProperty("runtime.log.logsystem.class", "org.apache.velocity.runtime.log.Log4JLogChute");
+ p.setProperty("runtime.log.logsystem.log4j.category", "velocity");
+
+ 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);
+ }
+}
=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Mon Jun 7 06:45:36 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Mon Jun 7 06:49:43 2010
@@ -38,50 +38,9 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

-public class TestBaseCMISMacro extends TestCase {
+public class TestBaseCMISMacro extends AbstractBaseUnitTest {

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";
- String cmisPwd = "admin";
-
- public void setUp () throws Exception
- {
- super.setUp();
-
- // log4j:
-
PropertyConfigurator.configure(this.getClass().getClassLoader().getResource("log4j.properties"));
-
- // Velocity:
- Properties p = new Properties();
-
p.setProperty("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
- p.setProperty("resource.loader", "class");
-
p.setProperty("runtime.log.logsystem.class", "org.apache.velocity.runtime.log.Log4JLogChute");
- p.setProperty("runtime.log.logsystem.log4j.category", "velocity");
-
- 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 {
Map<String, String> parameters = new HashMap<String, String>();
=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestDocInfoMacro.java
Mon Jun 7 06:16:55 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestDocInfoMacro.java
Mon Jun 7 06:49:43 2010
@@ -18,7 +18,7 @@
/**
* @author Carlo Sciolla &lt;c.sc...@sourcesense.com&gt;
*/
-public class TestDocInfoMacro extends TestBaseCMISMacro
+public class TestDocInfoMacro extends AbstractBaseUnitTest
{
@SuppressWarnings("unchecked")
public void testRenderDocumentInfo() throws Exception