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

Merged V4.1-BUG-FIX to HEAD

Browse Source 
42725: Record Only Merge: V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      << Record only as 4.1.2 used PDFBOX 1.0.7 rather than 1.0.6 >>
      42721: ALF-14185 PDF not indexed as a result of PDFBOX-1143 workaround in Tika 
   42726: ALF-16388 CLONE: PDF not indexed as a result of PDFBOX-1143 workaround in Tika
      - 4.1 specific fix (uses PDFBox 1.0.7) for the same issue as ALF-14185 on 3.4 (uses PDFBox 1.0.6).
   42736: ALF-16093: Implement new getPeople CQ (eg. if using user admin console and/or Solr unavailable)
   42740: Merged DEV to V4.1-BUG-FIX
      42626: ALF-14336: SOLR indexing fails with unterminated string for PDF uploaded
             Appeared exception due to postgreSQL (http://archives.postgresql.org/pgsql-jdbc/2007-02/msg00107.php).
             Remove '\u0000' characters from the property. 
   42741: Fix for ALF-16332 - Alternative version of AbstractWebScriptViewResolver that uses a ConcurrentHashMap and thus allows multiple views to be resolved at the same time!
   42755: Merged DEV to V4.1-BUG-FIX
     42750 : ALF-16315
   42762: ALF-15616: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42758: ALF-11956 WCM accessibility
         - tabIndex code. See comment on 17 Oct 2012
           "4) TinyMCE fields are not accessible using the keyboard (you have to use the mouse to select the "click to edit" option) - > It's reproduced for (+) icon, content created on press-release.xsd."
   42768: Merged somehow-lost mergeinfo from r42679
   42769: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42738: ALF-12724 CLONE - Activities trigger high CPU usage and lock contention 
      42767: Merged V3.4 to V3.4-BUG-FIX
         42727: ALF-16366: PermissionService calls were updating nodes but not reindexing them, leaving out of sync transactions after a clean bootstrap!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-10-17 19:45:37 +00:00
parent 4dc751ee3a
commit 46f9f8c24e
14 changed files with 1192 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
source/java/org/alfresco/repo/security/person/PersonTest.java
View File

@@ -560,7 +560,6 @@ public class PersonTest extends TestCase
personService.deletePerson("Derek");
assertEquals(2, getPeopleCount());
}
public void testPeopleFiltering()
@@ -581,6 +580,113 @@ public class PersonTest extends TestCase
PagingRequest pr = new PagingRequest(100, null);
List<QName> filters = new ArrayList<QName>(4);
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
assertEquals(2, personService.getPeople("y", filters, null, pr).getPage().size());
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
filters.add(ContentModel.PROP_FIRSTNAME);
filters.add(ContentModel.PROP_LASTNAME);
assertEquals(3, personService.getPeople("b", filters, null, pr).getPage().size());
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
assertEquals(2, personService.getPeople("A", filters, null, pr).getPage().size()); // includes "admin"
personService.deletePerson("aa");
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
assertEquals(1, personService.getPeople("a", filters, null, pr).getPage().size()); // includes "admin"
// a* is the same as a
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
assertEquals(1, personService.getPeople("a*", filters, null, pr).getPage().size()); // includes "admin"
// * means everyone
filters.clear();
filters.add(ContentModel.PROP_USERNAME);
assertEquals(5, getPeopleCount());
assertEquals(5, personService.getPeople("*", filters, null, pr).getPage().size());
}
public void testPeopleSortingPaging()
{
personService.setCreateMissingPeople(false);
assertEquals(2, getPeopleCount());
NodeRef p1 = personService.getPerson(AuthenticationUtil.getAdminUserName()); // admin - by default
NodeRef p2 = personService.getPerson(AuthenticationUtil.getGuestUserName()); // guest - by default
NodeRef p3 = personService.createPerson(createDefaultProperties("aa", "Aa", "Aa", "aa@aa", "alfresco", rootNodeRef));
NodeRef p4 = personService.createPerson(createDefaultProperties("cc", "Cc", "Cc", "cc@cc", "alfresco", rootNodeRef));
NodeRef p5 = personService.createPerson(createDefaultProperties("hh", "Hh", "Hh", "hh@hh", "alfresco", rootNodeRef));
NodeRef p6 = personService.createPerson(createDefaultProperties("bb", "Bb", "Bb", "bb@bb", "alfresco", rootNodeRef));
NodeRef p7 = personService.createPerson(createDefaultProperties("dd", "Dd", "Dd", "dd@dd", "alfresco", rootNodeRef));
assertEquals(7, getPeopleCount());
List<Pair<QName, Boolean>> sort = new ArrayList<Pair<QName, Boolean>>(1);
sort.add(new Pair<QName,Boolean>(ContentModel.PROP_USERNAME, true));
// page 1
PagingRequest pr = new PagingRequest(0, 2, null);
PagingResults<PersonInfo> ppr = personService.getPeople(null, null, sort, pr);
List<PersonInfo> results = ppr.getPage();
assertEquals(2, results.size());
assertEquals(p3, results.get(0).getNodeRef());
assertEquals(p1, results.get(1).getNodeRef());
// page 2
pr = new PagingRequest(2, 2, null);
ppr = personService.getPeople(null, null, sort, pr);
results = ppr.getPage();
assertEquals(2, results.size());
assertEquals(p6, results.get(0).getNodeRef());
assertEquals(p4, results.get(1).getNodeRef());
// page 3
pr = new PagingRequest(4, 2, null);
ppr = personService.getPeople(null, null, sort, pr);
results = ppr.getPage();
assertEquals(2, results.size());
assertEquals(p7, results.get(0).getNodeRef());
assertEquals(p2, results.get(1).getNodeRef());
// page 4
pr = new PagingRequest(6, 2, null);
ppr = personService.getPeople(null, null, sort, pr);
results = ppr.getPage();
assertEquals(1, results.size());
assertEquals(p5, results.get(0).getNodeRef());
}
// note: this test can be removed as and when we remove the deprecated "getPeople" impl
public void testPeopleFiltering_deprecatedCQ_via_getChildren()
{
personService.setCreateMissingPeople(false);
assertEquals(2, getPeopleCount());
checkPeopleContain(AuthenticationUtil.getAdminUserName());
checkPeopleContain(AuthenticationUtil.getGuestUserName());
personService.createPerson(createDefaultProperties("aa", "Aa", "Aa", "aa@aa", "alfresco", rootNodeRef));
personService.createPerson(createDefaultProperties("bc", "c", "C", "bc@bc", "alfresco", rootNodeRef));
personService.createPerson(createDefaultProperties("yy", "B", "D", "yy@yy", "alfresco", rootNodeRef));
personService.createPerson(createDefaultProperties("Yz", "yz", "B", "yz@yz", "alfresco", rootNodeRef));
assertEquals(6, getPeopleCount());
PagingRequest pr = new PagingRequest(100, null);
List<Pair<QName, String>> filters = new ArrayList<Pair<QName, String>>(4);
filters.clear();
@@ -618,7 +724,8 @@ public class PersonTest extends TestCase
assertEquals(5, personService.getPeople(filters, true, null, pr).getPage().size());
}
public void testPeopleSortingPaging()
// note: this test can be removed as and when we remove the deprecated "getPeople" impl
public void testPeopleSortingPaging_deprecatedCQ_via_getChildren()
{
personService.setCreateMissingPeople(false);