mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged up to HEAD.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -41,7 +41,6 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
||||
import org.alfresco.service.cmr.dictionary.ClassDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryException;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.dictionary.InvalidAspectException;
|
||||
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
|
||||
import org.alfresco.service.cmr.repository.AssociationExistsException;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
@@ -621,17 +620,6 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
// check that the titled aspect is present
|
||||
assertTrue("Titled aspect not present",
|
||||
nodeService.hasAspect(nodeRef, ASPECT_QNAME_TEST_TITLED));
|
||||
|
||||
// attempt to remove the aspect
|
||||
try
|
||||
{
|
||||
nodeService.removeAspect(nodeRef, ASPECT_QNAME_TEST_TITLED);
|
||||
fail("Failed to prevent removal of type-required aspect");
|
||||
}
|
||||
catch (InvalidAspectException e)
|
||||
{
|
||||
// expected
|
||||
}
|
||||
}
|
||||
|
||||
public static class BadOnDeleteNodePolicy implements
|
||||
@@ -1040,10 +1028,12 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
Serializable wsProtocol = nodeService.getProperty(rootNodeRef, ContentModel.PROP_STORE_PROTOCOL);
|
||||
Serializable wsIdentifier = nodeService.getProperty(rootNodeRef, ContentModel.PROP_STORE_IDENTIFIER);
|
||||
Serializable nodeUuid = nodeService.getProperty(rootNodeRef, ContentModel.PROP_NODE_UUID);
|
||||
Serializable nodeDbId = nodeService.getProperty(rootNodeRef, ContentModel.PROP_NODE_DBID);
|
||||
|
||||
assertNotNull("Workspace Protocol property not present", wsProtocol);
|
||||
assertNotNull("Workspace Identifier property not present", wsIdentifier);
|
||||
assertNotNull("Node UUID property not present", nodeUuid);
|
||||
assertNotNull("Node DB ID property not present", nodeDbId);
|
||||
|
||||
assertEquals("Workspace Protocol property incorrect", rootNodeRef.getStoreRef().getProtocol(), wsProtocol);
|
||||
assertEquals("Workspace Identifier property incorrect", rootNodeRef.getStoreRef().getIdentifier(), wsIdentifier);
|
||||
@@ -1054,6 +1044,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
assertTrue("Workspace Protocol property not present in map", properties.containsKey(ContentModel.PROP_STORE_PROTOCOL));
|
||||
assertTrue("Workspace Identifier property not present in map", properties.containsKey(ContentModel.PROP_STORE_IDENTIFIER));
|
||||
assertTrue("Node UUID property not present in map", properties.containsKey(ContentModel.PROP_NODE_UUID));
|
||||
assertTrue("Node DB ID property not present in map", properties.containsKey(ContentModel.PROP_NODE_DBID));
|
||||
}
|
||||
|
||||
public void testGetParentAssocs() throws Exception
|
||||
|
Reference in New Issue
Block a user