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
This commit is contained in:
Andrew Hind
2012-02-23 18:04:18 +00:00
parent bdc0214b79
commit 2a932cda54

View File

@@ -37,6 +37,7 @@ import org.alfresco.repo.dictionary.M2Property;
import org.alfresco.repo.dictionary.M2Type; import org.alfresco.repo.dictionary.M2Type;
import org.alfresco.repo.domain.node.Node; import org.alfresco.repo.domain.node.Node;
import org.alfresco.repo.domain.node.NodeDAO; 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.security.authentication.AuthenticationComponent;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback;
@@ -84,6 +85,7 @@ public class SOLRTrackingComponentTest extends TestCase
private NodeDAO nodeDAO; private NodeDAO nodeDAO;
private DictionaryDAO dictionaryDAO; private DictionaryDAO dictionaryDAO;
private SOLRTrackingComponent solrTrackingComponent; private SOLRTrackingComponent solrTrackingComponent;
private DbNodeServiceImpl dbNodeService;
private StoreRef storeRef; private StoreRef storeRef;
private NodeRef rootNodeRef; private NodeRef rootNodeRef;
@@ -104,6 +106,9 @@ public class SOLRTrackingComponentTest extends TestCase
namespaceService = serviceRegistry.getNamespaceService(); namespaceService = serviceRegistry.getNamespaceService();
authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent"); authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
dbNodeService = (DbNodeServiceImpl)ctx.getBean("dbNodeService");
dbNodeService.setEnableTimestampPropagation(false);
authenticationComponent.setSystemUserAsCurrentUser(); authenticationComponent.setSystemUserAsCurrentUser();
storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, getName() + System.currentTimeMillis()); storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, getName() + System.currentTimeMillis());