[confluence-cmis-plugin] r119 committed - Move common methods up in the hierarchy

[confluence-...@googlecode.com]

Revision: 119
Author: c.sc...@sourcesense.com
Date: Mon Jun 7 08:47:49 2010
Log: Move common methods up in the hierarchy
http://code.google.com/p/confluence-cmis-plugin/source/detail?r=119

Modified:

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

=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/AbstractBaseUnitTest.java
Mon Jun 7 08:25:37 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/AbstractBaseUnitTest.java
Mon Jun 7 08:47:49 2010
@@ -4,10 +4,13 @@
import com.atlassian.bandana.BandanaManager;
import com.sourcesense.confluence.cmis.utils.VelocityNullChecker;
import junit.framework.TestCase;
+import org.apache.chemistry.opencmis.client.api.Property;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;

+import java.io.StringWriter;
import java.util.*;

import static org.mockito.Matchers.anyObject;
@@ -61,4 +64,21 @@
bandanaManager = mock(BandanaManager.class);
when(bandanaManager.getValue((BandanaContext) anyObject(),
anyString())).thenReturn(repoConfigs);
}
-}
+
+ protected Property<String> createMockedProperty (String displayName,
String value)
+ {
+ Property<String> property = mock(Property.class);
+ when(property.getDisplayName()).thenReturn(displayName);
+ when(property.getValueAsString()).thenReturn(value);
+ return property;
+ }
+
+ protected String render (String template) throws Exception
+ {
+ Template t = ve.getTemplate(template);
+ StringWriter sw = new StringWriter();
+ t.merge(vc, sw);
+
+ return sw.getBuffer().toString();
+ }
+}
=======================================
---
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestDocInfoMacro.java
Mon Jun 7 08:28:04 2010
+++
/trunk/src/test/java/com/sourcesense/confluence/cmis/TestDocInfoMacro.java
Mon Jun 7 08:47:49 2010
@@ -1,15 +1,10 @@
package com.sourcesense.confluence.cmis;

import org.apache.chemistry.opencmis.client.api.Property;
-import org.apache.velocity.Template;
-
-import java.io.StringWriter;
+
import java.util.HashMap;
import java.util.Map;

-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* @author Carlo Sciolla &lt;c.sc...@sourcesense.com&gt;
*/
@@ -29,14 +24,10 @@
prop = createMockedProperty ("nullProperty", null);
documentProperties.put(prop.getDisplayName(),
prop.getValueAsString());

- Template t = ve.getTemplate("templates/cmis/docinfo.vm");
- StringWriter sw = new StringWriter();
-
vc.put("documentProperties", documentProperties);
vc.put("documentLink", "http://www.sourcesense.com");
- t.merge(vc, sw);
-
- String renderedView = sw.getBuffer().toString();
+
+ String renderedView = render ("templates/cmis/docinfo.vm");

assertNotNull(renderedView);
assertTrue(renderedView.length() > 0);
@@ -49,12 +40,4 @@

assertEquals(expectedResult, renderedView);
}
-
- private Property<String> createMockedProperty (String displayName,
String value)
- {
- Property<String> property = mock(Property.class);
- when(property.getDisplayName()).thenReturn(displayName);
- when(property.getValueAsString()).thenReturn(value);
- return property;
- }
-}
+}