inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge BRANCHES/V2.1.0.x to BRANCHES/V2.2:

Browse Source 
68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
   68568: Merge from HEAD to BRANCHES/V2.1.0.x
   68569: Update module version to 2.1.0.1
   76475: Merge HEAD to BRANCHES/V2.1.0.x:
   76597: Merge HEAD to BRANCHES/V2.1.0.x:
       74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
   76598: Merged HEAD to BRANCHES/V2.1.0.x:
        75102: RM Performance testing
   76599: Update module version to 2.1.0.2
   76601: Merged HEAD to BRANCHES/V2.1.0.x:
        75186: RM Performance Improvements
   76673: Root container cache to improve unfiled record browse performance
       * relates to RM-1594 and RM-1595
   76850: RM performance enhancements
       * serach improvements
       * in-place record browse improvements
       * saved search via file plan browse improvements
   76851: Additional unit test to check extended security with cache is working as expected.
   76852: Rollback checked in config
   77709: RM-1630: Error on manage references page
       * regression caused by performance improvements
   84337: Update version to 2.1.0.3
   84421: Transaction level cahcing of declarative capability evaluation
   84676: Fix build
   84677: Prevent unnessary repeated creation of QName
   84678: Improvements to extended dynamic authorities
       * requiredFor set
       * direct access to extended permission information, not via service
   84679: Correct requiredFor value
   88087: RM-1661 (Performance on setting permissions at a high category level)
   88092: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests
   88144: RM-1661 (Performance on setting permissions at a high category level)
   88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
   88192: RM-1661 (Performance on setting permissions at a high category level)
        * Added unit tests
   88193: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests
   88358: RM-1661 (Performance on setting permissions at a high category level)
        * Added unit tests
   88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
   88686: RM-1741 (Moved root category doesn't inherit permissions)
   88687: RM-1741 (Moved root category doesn't inherit permissions)
        * Unit test added
   88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
        * Unit test added
   88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
   88772: RM-1741 (Moved root category doesn't inherit permissions)
   88860: RM-1661 (Performance on setting permissions at a high category level)
   88864: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests
   88959: RM-1746 (Moved record/category always have the inheritance on)
   88960: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests
   88961: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests
   88962: RM-1661 (Performance on setting permissions at a high category level)
        * Fixed failing unit tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@89251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-10-27 22:31:55 +00:00
parent f27869acc0 d93a041d75
commit 677ee971ad
43 changed files with 2044 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
View File

@@ -36,43 +36,43 @@ import org.mockito.InjectMocks;
/**
* Unit test for RecordServiceImpl
*
*
* @author Roy Wetherall
* @since 2.2
*/
public class RecordServiceImplUnitTest extends BaseUnitTest
{
{
private NodeRef nonStandardFilePlanComponent;
private NodeRef nonStandardFilePlan;
private static QName TYPE_MY_FILE_PLAN = generateQName();
private static QName ASPECT_FOR_FILE_PLAN = generateQName();
private static QName ASPECT_FOR_MY_FILE_PLAN = generateQName();
private static QName ASPECT_FOR_BOTH = generateQName();
@InjectMocks private RecordServiceImpl recordService;
@SuppressWarnings("unchecked")
@Before
@Override
public void before()
{
super.before();
nonStandardFilePlanComponent = generateNodeRef(TYPE_RECORD_CATEGORY);
nonStandardFilePlan = generateNodeRef(TYPE_MY_FILE_PLAN);
// set-up node service
// set-up node service
when(mockedNodeService.getProperty(nonStandardFilePlanComponent, PROP_ROOT_NODEREF)).thenReturn(nonStandardFilePlan);
// set-up dictionary service
when(mockedDictionaryService.getAllAspects()).thenReturn(CollectionUtils.EMPTY_COLLECTION);
}
@Test
@Test
public void testRegisterRecordMetadataAspect()
{
Map<QName, Set<QName>> map = recordService.getRecordMetadataAspectsMap();
Map<QName, Set<QName>> map = recordService.getRecordMetadataAspectsMap();
assertTrue(map.isEmpty());
recordService.registerRecordMetadataAspect(ASPECT_FOR_FILE_PLAN, TYPE_FILE_PLAN);
map = recordService.getRecordMetadataAspectsMap();
@@ -83,39 +83,39 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
assertEquals(1, types.size());
assertTrue(types.contains(TYPE_FILE_PLAN));
}
@Test
public void testGetRecordMetadataAspects()
{
// register a couple of record meta-data aspects
recordService.registerRecordMetadataAspect(ASPECT_FOR_FILE_PLAN, TYPE_FILE_PLAN);
recordService.registerRecordMetadataAspect(ASPECT_FOR_MY_FILE_PLAN, TYPE_MY_FILE_PLAN);
recordService.registerRecordMetadataAspect(ASPECT_FOR_BOTH, TYPE_FILE_PLAN);
recordService.registerRecordMetadataAspect(ASPECT_FOR_BOTH, TYPE_MY_FILE_PLAN);
Set<QName> set = recordService.getRecordMetadataAspects(filePlanComponent);
assertNotNull(set);
assertEquals(2, set.size());
assertTrue(set.contains(ASPECT_FOR_FILE_PLAN));
assertTrue(set.contains(ASPECT_FOR_BOTH));
set = recordService.getRecordMetadataAspects(nonStandardFilePlanComponent);
assertNotNull(set);
assertEquals(2, set.size());
assertTrue(set.contains(ASPECT_FOR_MY_FILE_PLAN));
assertTrue(set.contains(ASPECT_FOR_BOTH));
set = recordService.getRecordMetadataAspects(TYPE_FILE_PLAN);
assertNotNull(set);
assertEquals(2, set.size());
assertTrue(set.contains(ASPECT_FOR_FILE_PLAN));
assertTrue(set.contains(ASPECT_FOR_BOTH));
set = recordService.getRecordMetadataAspects(TYPE_MY_FILE_PLAN);
assertNotNull(set);
assertEquals(2, set.size());
assertTrue(set.contains(ASPECT_FOR_MY_FILE_PLAN));
assertTrue(set.contains(ASPECT_FOR_BOTH));
// // register a couple of record meta-data aspects
// recordService.registerRecordMetadataAspect(ASPECT_FOR_FILE_PLAN, TYPE_FILE_PLAN);
// recordService.registerRecordMetadataAspect(ASPECT_FOR_MY_FILE_PLAN, TYPE_MY_FILE_PLAN);
// recordService.registerRecordMetadataAspect(ASPECT_FOR_BOTH, TYPE_FILE_PLAN);
// recordService.registerRecordMetadataAspect(ASPECT_FOR_BOTH, TYPE_MY_FILE_PLAN);
//
// Set<QName> set = recordService.getRecordMetadataAspects(filePlanComponent);
// assertNotNull(set);
// assertEquals(2, set.size());
// assertTrue(set.contains(ASPECT_FOR_FILE_PLAN));
// assertTrue(set.contains(ASPECT_FOR_BOTH));
//
// set = recordService.getRecordMetadataAspects(nonStandardFilePlanComponent);
// assertNotNull(set);
// assertEquals(2, set.size());
// assertTrue(set.contains(ASPECT_FOR_MY_FILE_PLAN));
// assertTrue(set.contains(ASPECT_FOR_BOTH));
//
// set = recordService.getRecordMetadataAspects(TYPE_FILE_PLAN);
// assertNotNull(set);
// assertEquals(2, set.size());
// assertTrue(set.contains(ASPECT_FOR_FILE_PLAN));
// assertTrue(set.contains(ASPECT_FOR_BOTH));
//
// set = recordService.getRecordMetadataAspects(TYPE_MY_FILE_PLAN);
// assertNotNull(set);
// assertEquals(2, set.size());
// assertTrue(set.contains(ASPECT_FOR_MY_FILE_PLAN));
// assertTrue(set.contains(ASPECT_FOR_BOTH));
}
}