mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 107413: Merged DEV to 5.0.N (5.0.3) 106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Cleaning of Javadoc, 107565: MNT-13545 Fix compilation after merge of Javadoc git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -878,16 +878,16 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
assertEquals(email, this.nodeService.getProperty(personRef, ContentModel.PROP_EMAIL));
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that a group's display name has the expected value.
|
||||
*
|
||||
* @param name
|
||||
* the person name
|
||||
* @param displayName
|
||||
* the display name
|
||||
*/
|
||||
private void assertGroupDisplayNameEquals(String name, String displayName)
|
||||
{
|
||||
/**
|
||||
* Asserts that a group's display name has the expected value.
|
||||
*
|
||||
* @param name
|
||||
* the person name
|
||||
* @param displayName
|
||||
* the display name
|
||||
*/
|
||||
private void assertGroupDisplayNameEquals(String name, String displayName)
|
||||
{
|
||||
assertEquals(displayName, this.authorityService.getAuthorityDisplayName(longName(name)));
|
||||
}
|
||||
|
||||
@@ -1037,7 +1037,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
|
||||
/**
|
||||
*
|
||||
* @param throwError
|
||||
* @param throwError boolean
|
||||
*/
|
||||
public void setThrowError(boolean throwError)
|
||||
{
|
||||
@@ -1342,14 +1342,14 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
|
||||
/**
|
||||
* The Constructor.
|
||||
*
|
||||
* @param size
|
||||
* the collection size
|
||||
* @param persons
|
||||
* the persons
|
||||
*/
|
||||
public RandomGroupCollection(int size, Collection<NodeDescription> persons)
|
||||
{
|
||||
*
|
||||
* @param size
|
||||
* the collection size
|
||||
* @param persons
|
||||
* the persons
|
||||
*/
|
||||
public RandomGroupCollection(int size, Collection<NodeDescription> persons)
|
||||
{
|
||||
this.size = size;
|
||||
this.authorities = new ArrayList<String>(persons.size());
|
||||
for (NodeDescription nodeDescription : persons)
|
||||
|
Reference in New Issue
Block a user