Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

added unit tests for GuavaCacheConfigurationReader

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-04-11 15:28:47 +02:00
parent cab4f1a2d2
commit 55d5830ea8
12 changed files with 981 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
scm-webapp/src/main/java/sonia/scm/cache/EhCacheConfigurationReader.java vendored
View File

@@ -48,7 +48,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import sonia.scm.SCMContext;
//~--- JDK imports ------------------------------------------------------------
@@ -103,9 +102,14 @@ public class EhCacheConfigurationReader
/**
* Constructs ...
*
*
* @param loader
*/
public EhCacheConfigurationReader()
@VisibleForTesting
EhCacheConfigurationReader(CacheConfigurationLoader loader)
{
this.loader = loader;
try
{
builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@@ -118,15 +122,21 @@ public class EhCacheConfigurationReader
//~--- methods --------------------------------------------------------------
public static InputStream read(){
return new EhCacheConfigurationReader(new DefaultCacheConfigurationLoader(
DEFAULT, MANUAL_RESOURCE, MODULE_RESOURCES)).doRead();
}
/**
* Method description
*
*
* @return
*/
public InputStream read()
@VisibleForTesting
InputStream doRead()
{
URL defaultConfig = getDefaultResource();
URL defaultConfig = loader.getDefaultResource();
if (defaultConfig == null)
{
@@ -136,14 +146,14 @@ public class EhCacheConfigurationReader
readConfiguration(defaultConfig, true);
Iterator<URL> it = getModuleResources();
Iterator<URL> it = loader.getModuleResources();
while (it.hasNext())
{
readConfiguration(it.next(), false);
}
File manualFile = getManualFileResource();
File manualFile = loader.getManualFileResource();
if (manualFile.exists())
{
@@ -166,52 +176,6 @@ public class EhCacheConfigurationReader
return createInputStream(doc);
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param path
*
* @return
*/
@VisibleForTesting
protected URL getDefaultResource()
{
return EhCacheConfigurationReader.class.getResource(DEFAULT);
}
/**
* Method description
*
*
* @return
*/
@VisibleForTesting
protected File getManualFileResource()
{
return new File(SCMContext.getContext().getBaseDirectory(),
MANUAL_RESOURCE);
}
/**
* Method description
*
*
* @param path
*
* @return
*/
@VisibleForTesting
protected Iterator<URL> getModuleResources()
{
return CacheConfigurations.findModuleResources(
EhCacheConfigurationReader.class, MODULE_RESOURCES);
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
@@ -467,6 +431,9 @@ public class EhCacheConfigurationReader
/** Field description */
private DocumentBuilder builder;
/** Field description */
private CacheConfigurationLoader loader;
/** Field description */
private Map<Id, Node> nodeMap = Maps.newLinkedHashMap();