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 V2.2 to HEAD

Browse Source 
10963: Merged DEV/LARGE_COLLECTION_PROPERTIES_2.2.1 to V2.2
          - PersonService: Lucene removal
          - Lucene optimizations (in progress)
          - Multi-valued and locale-specific properties persisted in alf_node_properties
          - Removal of unused AVM tables
   10987: Oracle dialects and enhanced SQL patch support
          - Only support Alfresco's 9i and 10g dialects (with auto-switching)
          - SQL script patches can now apply selectively to ranges
   11007: Test to check cached retrieval of QNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 13:26:18 +00:00
parent dd2ce5da0a
commit 6f302f0350
100 changed files with 8759 additions and 3628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

357
source/java/org/alfresco/repo/domain/hibernate/HibernateSessionHelperTest.java
View File

@@ -1,18 +1,18 @@
package org.alfresco.repo.domain.hibernate;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import org.alfresco.repo.domain.NodeKey;
import org.alfresco.repo.domain.NodeStatus;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.Node;
import org.alfresco.repo.domain.QNameDAO;
import org.alfresco.repo.domain.QNameEntity;
import org.alfresco.repo.domain.Server;
import org.alfresco.repo.domain.StoreKey;
import org.alfresco.repo.domain.Store;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.util.BaseSpringTest;
import org.hibernate.engine.EntityKey;
import org.springframework.orm.toplink.SessionReadCallback;
public class HibernateSessionHelperTest extends BaseSpringTest
{
@@ -31,9 +31,8 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
StoreImpl store = new StoreImpl();
StoreKey storeKey = new StoreKey(StoreRef.PROTOCOL_WORKSPACE,
"TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
store.setKey(storeKey);
store.setProtocol(StoreRef.PROTOCOL_WORKSPACE);
store.setIdentifier("TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
// persist so that it is present in the hibernate cache
getSession().save(store);
@@ -81,17 +80,20 @@ public class HibernateSessionHelperTest extends BaseSpringTest
public void testNestedMarks()
{
assertEquals(0, getSession().getStatistics().getEntityCount());
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
QNameDAO qnameDAO = (QNameDAO) getApplicationContext().getBean("qnameDAO");
QNameEntity baseQNameEntity = qnameDAO.getOrCreateQNameEntity(ContentModel.TYPE_BASE);
StoreImpl store = new StoreImpl();
StoreKey storeKey = new StoreKey(StoreRef.PROTOCOL_WORKSPACE,
"TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
store.setKey(storeKey);
store.setProtocol(StoreRef.PROTOCOL_WORKSPACE);
store.setIdentifier("TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
// persist so that it is present in the hibernate cache
getSession().save(store);
assertEquals(1, getSession().getStatistics().getEntityCount());
assertEquals(2, getSession().getStatistics().getEntityCount());
Server server = (Server) getSession().get(ServerImpl.class, new Long(1));
if (server == null)
@@ -104,9 +106,9 @@ public class HibernateSessionHelperTest extends BaseSpringTest
TransactionImpl transaction = new TransactionImpl();
transaction.setServer(server);
transaction.setChangeTxnId(AlfrescoTransactionSupport.getTransactionId());
Serializable txID = getSession().save(transaction);
getSession().save(transaction);
assertEquals(3, getSession().getStatistics().getEntityCount());
assertEquals(4, getSession().getStatistics().getEntityCount());
HibernateSessionHelper helper = (HibernateSessionHelper)getApplicationContext().getBean("hibernateSessionHelper");
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
@@ -114,136 +116,131 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(1, helper.getMarks().size());
NodeKey key1 = new NodeKey(store.getKey(), "1");
createNodeStatus(transaction, key1);
Node n1 = createNode(transaction, store, "1", baseQNameEntity);
assertEquals(4, getSession().getStatistics().getEntityCount());
assertEquals(5, getSession().getStatistics().getEntityCount());
helper.mark();
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(2, helper.getMarks().size());
NodeKey key2 = new NodeKey(store.getKey(), "2");
createNodeStatus(transaction, key2);
assertEquals(5, getSession().getStatistics().getEntityCount());
helper.mark();
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(3, helper.getMarks().size());
NodeKey key3 = new NodeKey(store.getKey(), "3");
createNodeStatus(transaction, key3);
Node n2 = createNode(transaction, store, "2", baseQNameEntity);
assertEquals(6, getSession().getStatistics().getEntityCount());
helper.mark();
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(4, helper.getMarks().size());
assertEquals(3, helper.getMarks().size());
NodeKey key4 = new NodeKey(store.getKey(), "4");
createNodeStatus(transaction, key4);
Node n3 = createNode(transaction, store, "3", baseQNameEntity);
assertEquals(7, getSession().getStatistics().getEntityCount());
helper.mark();
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertEquals(4, helper.getMarks().size());
NodeKey key5 = new NodeKey(store.getKey(), "5");
createNodeStatus(transaction, key5);
Node n4 = createNode(transaction, store, "4", baseQNameEntity);
assertEquals(8, getSession().getStatistics().getEntityCount());
helper.mark();
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
Node n5 = createNode(transaction, store, "5", baseQNameEntity);
assertEquals(9, getSession().getStatistics().getEntityCount());
helper.reset();
assertEquals(7, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
getSession().get(NodeStatusImpl.class, key5);
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
getSession().get(NodeImpl.class, n5.getId());
assertEquals(9, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.reset();
assertEquals(7, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
getSession().get(NodeStatusImpl.class, key5);
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
getSession().get(NodeImpl.class, n5.getId());
assertEquals(9, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark();
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(4, helper.getMarks().size());
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark();
assertEquals(7, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(4, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertEquals(3, helper.getMarks().size());
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark();
assertEquals(6, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(3, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertEquals(2, helper.getMarks().size());
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertFalse(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark();
assertEquals(5, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(2, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertFalse(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
helper.resetAndRemoveMark();
assertEquals(4, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(1, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertFalse(sessionContainsNodeStatus(key3));
assertFalse(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertFalse(sessionContainsNode(n3));
assertFalse(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark();
assertEquals(3, getSession().getStatistics().getEntityCount());
assertEquals(4, getSession().getStatistics().getEntityCount());
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(0, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertFalse(sessionContainsNodeStatus(key3));
assertFalse(sessionContainsNodeStatus(key2));
assertFalse(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertFalse(sessionContainsNode(n3));
assertFalse(sessionContainsNode(n2));
assertFalse(sessionContainsNode(n1));
try
{
@@ -262,9 +259,8 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
StoreImpl store = new StoreImpl();
StoreKey storeKey = new StoreKey(StoreRef.PROTOCOL_WORKSPACE,
"TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
store.setKey(storeKey);
store.setProtocol(StoreRef.PROTOCOL_WORKSPACE);
store.setIdentifier("TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
// persist so that it is present in the hibernate cache
getSession().save(store);
@@ -316,14 +312,16 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertEquals(0, getSession().getStatistics().getEntityCount());
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
QNameDAO qnameDAO = (QNameDAO) getApplicationContext().getBean("qnameDAO");
QNameEntity baseQNameEntity = qnameDAO.getOrCreateQNameEntity(ContentModel.TYPE_BASE);
StoreImpl store = new StoreImpl();
StoreKey storeKey = new StoreKey(StoreRef.PROTOCOL_WORKSPACE,
"TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
store.setKey(storeKey);
store.setProtocol(StoreRef.PROTOCOL_WORKSPACE);
store.setIdentifier("TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
// persist so that it is present in the hibernate cache
getSession().save(store);
assertEquals(1, getSession().getStatistics().getEntityCount());
assertEquals(2, getSession().getStatistics().getEntityCount());
Server server = (Server) getSession().get(ServerImpl.class, new Long(1));
if (server == null)
@@ -336,9 +334,9 @@ public class HibernateSessionHelperTest extends BaseSpringTest
TransactionImpl transaction = new TransactionImpl();
transaction.setServer(server);
transaction.setChangeTxnId(AlfrescoTransactionSupport.getTransactionId());
Serializable txID = getSession().save(transaction);
getSession().save(transaction);
assertEquals(3, getSession().getStatistics().getEntityCount());
assertEquals(4, getSession().getStatistics().getEntityCount());
HibernateSessionHelper helper = (HibernateSessionHelper)getApplicationContext().getBean("hibernateSessionHelper");
assertNull(helper.getCurrentMark());
@@ -348,121 +346,116 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(1, helper.getMarks().size());
NodeKey key1 = new NodeKey(store.getKey(), "1");
createNodeStatus(transaction, key1);
Node n1 = createNode(transaction, store, "1", baseQNameEntity);
assertEquals(4, getSession().getStatistics().getEntityCount());
assertEquals(5, getSession().getStatistics().getEntityCount());
helper.mark("Two");
assertEquals("Two", helper.getCurrentMark());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(2, helper.getMarks().size());
NodeKey key2 = new NodeKey(store.getKey(), "2");
createNodeStatus(transaction, key2);
Node n2 = createNode(transaction, store, "2", baseQNameEntity);
assertEquals(5, getSession().getStatistics().getEntityCount());
assertEquals(6, getSession().getStatistics().getEntityCount());
helper.mark("Three");
assertEquals("Three", helper.getCurrentMark());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(3, helper.getMarks().size());
NodeKey key3 = new NodeKey(store.getKey(), "3");
createNodeStatus(transaction, key3);
Node n3 = createNode(transaction, store, "3", baseQNameEntity);
assertEquals(6, getSession().getStatistics().getEntityCount());
assertEquals(7, getSession().getStatistics().getEntityCount());
helper.mark("Four");
assertEquals("Four", helper.getCurrentMark());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(4, helper.getMarks().size());
NodeKey key4 = new NodeKey(store.getKey(), "4");
createNodeStatus(transaction, key4);
Node n4 = createNode(transaction, store, "4", baseQNameEntity);
assertEquals(7, getSession().getStatistics().getEntityCount());
assertEquals(8, getSession().getStatistics().getEntityCount());
helper.mark("Five");
assertEquals("Five", helper.getCurrentMark());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
NodeKey key5 = new NodeKey(store.getKey(), "5");
createNodeStatus(transaction, key5);
Node n5 = createNode(transaction, store, "5", baseQNameEntity);
assertEquals(8, getSession().getStatistics().getEntityCount());
assertEquals(9, getSession().getStatistics().getEntityCount());
helper.reset("Five");
assertEquals(7, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
getSession().get(NodeStatusImpl.class, key5);
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
getSession().get(NodeImpl.class, n5.getId());
assertEquals(9, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.reset("Five");
assertEquals(7, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
getSession().get(NodeStatusImpl.class, key5);
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
getSession().get(NodeImpl.class, n5.getId());
assertEquals(9, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(5, helper.getMarks().size());
assertTrue(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
assertEquals("Five", helper.getCurrentMark());
helper.resetAndRemoveMark("Five");
assertEquals("Four", helper.getCurrentMark());
assertEquals(7, getSession().getStatistics().getEntityCount());
assertEquals(8, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(4, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertTrue(sessionContainsNodeStatus(key4));
assertTrue(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertTrue(sessionContainsNode(n4));
assertTrue(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark("Three");
assertEquals("Two", helper.getCurrentMark());
assertEquals(5, getSession().getStatistics().getEntityCount());
assertEquals(6, getSession().getStatistics().getEntityCount());
assertTrue(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(2, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertFalse(sessionContainsNodeStatus(key3));
assertTrue(sessionContainsNodeStatus(key2));
assertTrue(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertFalse(sessionContainsNode(n3));
assertTrue(sessionContainsNode(n2));
assertTrue(sessionContainsNode(n1));
helper.resetAndRemoveMark("One");
assertNull(helper.getCurrentMark());
assertEquals(3, getSession().getStatistics().getEntityCount());
assertEquals(4, getSession().getStatistics().getEntityCount());
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
assertEquals(0, helper.getMarks().size());
assertFalse(sessionContainsNodeStatus(key5));
assertFalse(sessionContainsNodeStatus(key4));
assertFalse(sessionContainsNodeStatus(key3));
assertFalse(sessionContainsNodeStatus(key2));
assertFalse(sessionContainsNodeStatus(key1));
assertFalse(sessionContainsNode(n5));
assertFalse(sessionContainsNode(n4));
assertFalse(sessionContainsNode(n3));
assertFalse(sessionContainsNode(n2));
assertFalse(sessionContainsNode(n1));
try
{
@@ -481,9 +474,8 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertFalse(SessionSizeResourceManager.isDisableInTransaction());
StoreImpl store = new StoreImpl();
StoreKey storeKey = new StoreKey(StoreRef.PROTOCOL_WORKSPACE,
"TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
store.setKey(storeKey);
store.setProtocol(StoreRef.PROTOCOL_WORKSPACE);
store.setIdentifier("TestWorkspace@" + getName() + " - " + System.currentTimeMillis());
// persist so that it is present in the hibernate cache
getSession().save(store);
@@ -500,7 +492,7 @@ public class HibernateSessionHelperTest extends BaseSpringTest
TransactionImpl transaction = new TransactionImpl();
transaction.setServer(server);
transaction.setChangeTxnId(AlfrescoTransactionSupport.getTransactionId());
Serializable txID = getSession().save(transaction);
getSession().save(transaction);
assertEquals(3, getSession().getStatistics().getEntityCount());
@@ -541,24 +533,30 @@ public class HibernateSessionHelperTest extends BaseSpringTest
assertNull(helper.getCurrentMark());
}
private NodeStatus createNodeStatus(TransactionImpl transaction, NodeKey key)
private Node createNode(TransactionImpl transaction, Store store, String uuid, QNameEntity typeQNameEntity)
{
NodeStatus nodeStatus = new NodeStatusImpl();
nodeStatus.setKey(key);
nodeStatus.setTransaction(transaction);
getSession().save(nodeStatus);
return nodeStatus;
// Create the Node
Node node = new NodeImpl();
node.setStore(store);
node.setUuid(uuid);
node.setTypeQName(typeQNameEntity);
node.setTransaction(transaction);
node.setDeleted(false);
getSession().save(node);
return node;
}
@SuppressWarnings("unchecked")
private boolean sessionContainsNodeStatus(NodeKey nodeKey)
private boolean sessionContainsNode(Node node)
{
Long nodeId = node.getId();
Set<EntityKey> keys = (Set<EntityKey>)getSession().getStatistics().getEntityKeys();
for(EntityKey key : keys)
{
if(key.getEntityName().equals(NodeStatusImpl.class.getName()))
if(key.getEntityName().equals(NodeImpl.class.getName()))
{
if(key.getIdentifier().equals(nodeKey))
if(key.getIdentifier().equals(nodeId))
{
return true;
}
@@ -566,5 +564,4 @@ public class HibernateSessionHelperTest extends BaseSpringTest
}
return false;
}
}