[confluence-cmis-plugin] r107 committed - Moved Velocity initialization up to the base class

[confluence-...@googlecode.com]

Revision: 107
Author: c.sc...@sourcesense.com
Date: Mon Jun 7 06:16:55 2010
Log: Moved Velocity initialization up to the base class
http://code.google.com/p/confluence-cmis-plugin/source/detail?r=107

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

=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Sat Jun 5 04:34:03 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestBaseCMISMacro.java
Mon Jun 7 06:16:55 2010
@@ -26,15 +26,41 @@
import org.apache.chemistry.opencmis.client.api.*;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;

import java.util.*;

public class TestBaseCMISMacro extends TestCase {
+
Logger logger = Logger.getLogger(TestBaseCMISMacro.class);

+ protected VelocityEngine ve;
+ protected VelocityContext vc;
+
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);
+ }

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:10:15 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestDocInfoMacro.java
Mon Jun 7 06:16:55 2010
@@ -18,35 +18,13 @@
/**
* @author Carlo Sciolla &lt;c.sc...@sourcesense.com&gt;
*/
-public class TestDocInfoMacro extends TestCase
-{
- protected VelocityEngine ve;
- protected VelocityContext vc;
-
- @Override
- 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);
- }
-
+public class TestDocInfoMacro extends TestBaseCMISMacro
+{
@SuppressWarnings("unchecked")
public void testRenderDocumentInfo() throws Exception
{
List<Property<?>> documentProperties = new ArrayList<Property<?>>
();
+
Property<String> property = mock(Property.class);
when(property.getValueAsString()).thenReturn("value");
when(property.getDisplayName()).thenReturn("displayName");