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

ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
70016: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70015: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70014: MNT-11437: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            70009: Revised fix for     MNT-11107  Documents uploaded by another user are not filtered via tags in My Files
            Fix for     MNT-11427  Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502
            - test fixes and maintain order


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-11 22:08:45 +00:00
parent 873db6ba7c
commit bc7fb95b83
5 changed files with 115 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
View File

@@ -254,11 +254,24 @@ public class SOLRDAOTest extends TestCase
{
break;
}
assertEquals("Expected exactly one result", 1, acls.size());
totalAclCount++;
if(acls.size() == 1)
{
// OK single acl
}
else if(acls.size() == 2)
{
// definning has unlinkfd shared acl
assertEquals("Not a defining and shared pair", acls.get(0).getInheritedId(), acls.get(1).getId());
}
else
{
fail("More then two acls");
}
totalAclCount++;;
minAclId = acls.get(0).getId() + 1;
}
assertEquals("Expected to page to exact number of results", aclCount, totalAclCount);
// This may not be true - it depands on lazy/eager shared acl creation.
//assertEquals("Expected to page to exact number of results", aclCount, totalAclCount);
}
private List<Long> toIds(List<AclChangeSet> aclChangeSets)

45
source/test-java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
View File

@@ -138,27 +138,30 @@ public class SOLRTrackingComponentTest extends TestCase
}
public void testGetAcls_Simple()
{
List<AclChangeSet> cs = getAclChangeSets(null, null, null, null, 50);
assertTrue("Expected results to be limited in number", cs.size() <= 50);
int totalAcls = 0;
for (AclChangeSet aclChangeSet : cs)
{
totalAcls += aclChangeSet.getAclCount();
}
int totalAclsCheck = 0;
for (AclChangeSet aclChangeSet : cs)
{
List<Acl> acls = getAcls(Arrays.asList(new Long[]{aclChangeSet.getId()}), null, 200);
assertEquals(aclChangeSet.getAclCount(), acls.size());
totalAclsCheck += acls.size();
}
// Double check number of ACLs
assertEquals("ACL count should have matched", totalAcls, totalAclsCheck);
}
// This test is no longer valid as we may or may include shared acls not linked to defining ones
// If they are not linked to a node they will be counted wring ...
// public void testGetAcls_Simple()
// {
// List<AclChangeSet> cs = getAclChangeSets(null, null, null, null, 50);
// assertTrue("Expected results to be limited in number", cs.size() <= 50);
// int totalAcls = 0;
// for (AclChangeSet aclChangeSet : cs)
// {
// totalAcls += aclChangeSet.getAclCount();
// }
// int totalAclsCheck = 0;
//
// for (AclChangeSet aclChangeSet : cs)
// {
// List<Acl> acls = getAcls(Arrays.asList(new Long[]{aclChangeSet.getId()}), null, 200);
// assertEquals(aclChangeSet.getAclCount(), acls.size());
// totalAclsCheck += acls.size();
// }
//
// // Double check number of ACLs
// assertEquals("ACL count should have matched", totalAcls, totalAclsCheck);
// }
public void testGetNodeMetaData()
{