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

Revert "RM-2606 Classify the head of the version history."

Browse Source 
This reverts commit ffc29c05d4643780c9dcbb568eb0a89838009886.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-09-30 10:27:58 +00:00
parent 4fe3b948c5
commit 378d897fb6
3 changed files with 22 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.java
View File

@@ -1,4 +1,5 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -31,14 +32,12 @@ import static org.mockito.Mockito.when;
import java.io.Serializable;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import org.alfresco.model.ContentModel;
import org.alfresco.model.QuickShareModel;
@@ -50,14 +49,10 @@ import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetad
import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper;
import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.version.VersionBaseModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService.PersonInfo;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.cmr.version.VersionService;
import org.alfresco.service.namespace.QName;
import org.junit.Before;
import org.junit.Test;
@@ -87,7 +82,6 @@ public class ContentClassificationServiceImplUnitTest implements ClassifiedConte
@Mock SecurityClearanceService mockSecurityClearanceService;
@Mock AuthenticationUtil mockAuthenticationUtil;
@Mock ReferredMetadataService mockReferredMetadataService;
@Mock VersionService mockVersionService;
@Mock ClassificationAspectProperties mockPropertiesDTO;
@Captor ArgumentCaptor<Map<QName, Serializable>> propertiesCaptor;
@@ -385,53 +379,4 @@ public class ContentClassificationServiceImplUnitTest implements ClassifiedConte
assertFalse(contentClassificationServiceImpl.isClassified(nodeRef));
}
/** Check that replacing the only version will use ensureVersioningEnabled. */
@Test public void replaceHeadOfVersionHistory_onlyOneVersion()
{
NodeRef content = new NodeRef("fake://content/");
VersionHistory mockVersionHistory = mock(VersionHistory.class);
when(mockVersionService.getVersionHistory(content)).thenReturn(mockVersionHistory);
Version mockVersion = mock(Version.class);
when(mockVersionHistory.getHeadVersion()).thenReturn(mockVersion);
when(mockVersionHistory.getRootVersion()).thenReturn(mockVersion);
NodeRef versionedNodeRef = new NodeRef("fake://versionedNodeRef/");
when(mockVersion.getVersionedNodeRef()).thenReturn(versionedNodeRef);
Map<QName, Serializable> properties = new HashMap<>();
when(mockNodeService.getProperties(versionedNodeRef)).thenReturn(properties);
// Call the method under test.
contentClassificationServiceImpl.replaceHeadOfVersionHistory(content);
verify(mockVersionService).deleteVersion(content, mockVersion);
verify(mockVersionService).ensureVersioningEnabled(content, properties);
}
/**
* Check that when replacing a later version than the initial one, the entry in the version history is deleted and
* recreated. Ensure that properties from {link VersionUtil.RESERVED_PROPERTY_NAMES} are removed from the properties
* before calling {@link VersionService.createVersion}.
*/
@Test public void replaceHeadOfVersionHistory_twoVersions()
{
NodeRef content = new NodeRef("fake://content/");
VersionHistory mockVersionHistory = mock(VersionHistory.class);
when(mockVersionService.getVersionHistory(content)).thenReturn(mockVersionHistory);
Version mockHeadVersion = mock(Version.class);
when(mockVersionHistory.getHeadVersion()).thenReturn(mockHeadVersion);
Version mockRootVersion = mock(Version.class);
when(mockVersionHistory.getRootVersion()).thenReturn(mockRootVersion);
Map<String, Serializable> versionProperties = ImmutableMap.of("ClassificationKey", "ClassificationValue",
"VersionNumber", "1.1",
VersionBaseModel.PROP_CREATED_DATE, "DateToBeIgnored");
when(mockHeadVersion.getVersionProperties()).thenReturn(versionProperties);
// Call the method under test.
contentClassificationServiceImpl.replaceHeadOfVersionHistory(content);
verify(mockVersionService).deleteVersion(content, mockHeadVersion);
Map<String, Serializable> expectedVersionProperties = ImmutableMap.of("ClassificationKey", "ClassificationValue",
"VersionNumber", "1.1");
verify(mockVersionService).createVersion(content, expectedVersionProperties);
}
}