inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59177: Fixes SlowContentStoreTest test breakage. Removes dependency on cachingstore/test-context.xml
   This fix essentially denormalizes the various Spring context XML files in the cachingstore directory. A previous fix had aliased the cachingContentStore to fileContentStore, but unfortunately this broke the SlowContentStoreTest tests, as the cachingContentStore created by those tests is not a real/working content store (the backingStore is a SlowContentStore dummy store), so the bootstrap process failed.
   By making each of the contexts standalone, the different tests are able to evolve as required without breaking the other tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:10:13 +00:00
parent bce41b2198
commit 1300d9bd3a
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/test-resources/cachingstore/test-cleaner-context.xml
View File

@@ -2,7 +2,21 @@
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<import resource="classpath:alfresco/application-context.xml" />
<bean id="cachingContentStoreCache" class="org.alfresco.repo.cache.DefaultSimpleCache"/>
<bean id="contentCache" class="org.alfresco.repo.content.caching.ContentCacheImpl">
<property name="memoryStore" ref="cachingContentStoreCache"/>
<property name="cacheRoot" value="${dir.cachedcontent}"/>
</bean>
<bean id="cachingContentStore" class="org.alfresco.repo.content.caching.CachingContentStore">
<property name="backingStore" ref="backingStore"/>
<property name="cache" ref="contentCache"/>
<property name="cacheOnInbound" value="true"/>
</bean>
<!-- Override the backing store bean for the cleaner tests -->
<bean id="backingStore" class="org.alfresco.repo.content.caching.test.SlowContentStore">
<!-- set pauseMillis to 0 since we're not really after a SLOW backing store -->

19
source/test-resources/cachingstore/test-slow-context.xml
View File

@@ -1,8 +1,27 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<!--
NOTE: this file does NOT alias cachingContentStore to fileContentStore, as SlowContentStore is not
a full implementation (so boostrap would fail). Operations using the fileContentStore will work as normal,
tests will use the cachingContentStore and associated beans explicitly, by name when required.
-->
<beans>
<import resource="classpath:alfresco/application-context.xml" />
<bean id="cachingContentStoreCache" class="org.alfresco.repo.cache.DefaultSimpleCache"/>
<bean id="contentCache" class="org.alfresco.repo.content.caching.ContentCacheImpl">
<property name="memoryStore" ref="cachingContentStoreCache"/>
<property name="cacheRoot" value="${dir.cachedcontent}"/>
</bean>
<bean id="cachingContentStore" class="org.alfresco.repo.content.caching.CachingContentStore">
<property name="backingStore" ref="backingStore"/>
<property name="cache" ref="contentCache"/>
<property name="cacheOnInbound" value="true"/>
</bean>
<bean id="backingStore" class="org.alfresco.repo.content.caching.test.SlowContentStore"/>
</beans>