From 2a932cda54a38d265dc354df50cb0c6c03dbb8dc Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Thu, 23 Feb 2012 18:04:18 +0000 Subject: [PATCH] Merged BRANCHES\DEV\V4.0-BUG-FIX to HEAD 34203: Build fix - test affected by background update of parent timestamp git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/solr/SOLRTrackingComponentTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java index 47a992f941..7e801fa0b2 100644 --- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java +++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java @@ -37,6 +37,7 @@ import org.alfresco.repo.dictionary.M2Property; import org.alfresco.repo.dictionary.M2Type; import org.alfresco.repo.domain.node.Node; import org.alfresco.repo.domain.node.NodeDAO; +import org.alfresco.repo.node.db.DbNodeServiceImpl; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback; @@ -84,6 +85,7 @@ public class SOLRTrackingComponentTest extends TestCase private NodeDAO nodeDAO; private DictionaryDAO dictionaryDAO; private SOLRTrackingComponent solrTrackingComponent; + private DbNodeServiceImpl dbNodeService; private StoreRef storeRef; private NodeRef rootNodeRef; @@ -103,6 +105,9 @@ public class SOLRTrackingComponentTest extends TestCase dictionaryService = serviceRegistry.getDictionaryService(); namespaceService = serviceRegistry.getNamespaceService(); authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent"); + + dbNodeService = (DbNodeServiceImpl)ctx.getBean("dbNodeService"); + dbNodeService.setEnableTimestampPropagation(false); authenticationComponent.setSystemUserAsCurrentUser();