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 (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84146: Fix Build test failure: NodeDAOTest testRootNodeCacheEntries
      Following merge 84033 for MNT-12297: TransactionalCache equality checks lead to false negatives in a cluster
      - Change required to test method that only exists on HEAD-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:26:59 +00:00
parent 2b15a5b5ad
commit b5abcd7812
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/test-java/org/alfresco/repo/domain/node/NodeDAOTest.java
View File

@@ -27,6 +27,8 @@ import junit.framework.TestCase;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.cache.TransactionalCache;
import org.alfresco.repo.cache.TransactionalCache.ValueHolder;
import org.alfresco.repo.domain.node.NodeDAO.NodeRefQueryCallback; import org.alfresco.repo.domain.node.NodeDAO.NodeRefQueryCallback;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -57,8 +59,7 @@ public class NodeDAOTest extends TestCase
private TransactionService transactionService; private TransactionService transactionService;
private RetryingTransactionHelper txnHelper; private RetryingTransactionHelper txnHelper;
private NodeDAO nodeDAO; private NodeDAO nodeDAO;
private SimpleCache<Serializable, Node> rootNodesCache; private SimpleCache<Serializable, ValueHolder<Node>> rootNodesCache;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void setUp() public void setUp()
@@ -71,7 +72,7 @@ public class NodeDAOTest extends TestCase
txnHelper.setMaxRetryWaitMs(50); txnHelper.setMaxRetryWaitMs(50);
nodeDAO = (NodeDAO) ctx.getBean("nodeDAO"); nodeDAO = (NodeDAO) ctx.getBean("nodeDAO");
rootNodesCache = (SimpleCache<Serializable, Node>) ctx.getBean("node.rootNodesSharedCache"); rootNodesCache = (SimpleCache<Serializable, ValueHolder<Node>>) ctx.getBean("node.rootNodesSharedCache");
} }
public void testTransaction() throws Throwable public void testTransaction() throws Throwable
@@ -171,7 +172,8 @@ public class NodeDAOTest extends TestCase
// Check each root node // Check each root node
for (Serializable key : keys) for (Serializable key : keys)
{ {
NodeEntity node = (NodeEntity) rootNodesCache.get(key); NodeEntity node = (NodeEntity) TransactionalCache.getSharedCacheValue(rootNodesCache, key);
// Create a good value // Create a good value
NodeEntity clonedNode = (NodeEntity) node.clone(); NodeEntity clonedNode = (NodeEntity) node.clone();
// Run equals and hashcode // Run equals and hashcode