inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
77129: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73474: ACE-1685: aclsReaders.post WebScript now includes denied authorities in results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:41:36 +00:00
parent 53eb8be74a
commit fb70692bac
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
View File

@@ -214,7 +214,7 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
);
}
public void aclReadersGetImpl() throws Exception
private void aclReadersGetImpl() throws Exception
{
List<AclChangeSet> aclChangeSets = solrTrackingComponent.getAclChangeSets(null, null, null, null, 1024);
List<Long> aclChangeSetIds = new ArrayList<Long>(50);
@@ -252,6 +252,13 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
readersByAclId.put(aclReaders.getAclId(), aclReaders.getReaders());
}
Map<Long, Set<String>> deniedByAclId = new HashMap<Long, Set<String>>();
for (AclReaders aclReaders : aclsReaders)
{
assertNotNull("AclReaders should not contain null denial set", aclReaders.getDenied());
deniedByAclId.put(aclReaders.getAclId(), aclReaders.getDenied());
}
// Now query using the webscript
String url = "/api/solr/aclsReaders";
TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, json.toString(), "application/json");
@@ -279,6 +286,15 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
String readerJSON = readersJSON.getString(j);
assertTrue("Found reader not in check set: " + readerJSON, readersCheck.contains(readerJSON));
}
Set<String> deniedCheck = deniedByAclId.get(aclIdJSON);
JSONArray deniedJSON = aclReadersJSON.getJSONArray("denied");
assertEquals("Denied list for ACL " + aclIdJSON + " is wrong. ", deniedCheck.size(), deniedJSON.length());
for (int j = 0; j < deniedJSON.length(); j++)
{
String denyJSON = deniedJSON.getString(j);
assertTrue("Found denied authority not in check set: " + denyJSON, deniedCheck.contains(denyJSON));
}
}
}
@@ -559,6 +575,8 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
GetNodesParameters params = new GetNodesParameters();
params.setTransactionIds(transactionIds);
params.setStoreProtocol(storeRef.getProtocol());
params.setStoreIdentifier(storeRef.getIdentifier());
JSONArray nodes = getNodes(params, 0, 2);
List<Long> nodeIds = new ArrayList<Long>(nodes.length());
@@ -640,6 +658,8 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
GetNodesParameters params = new GetNodesParameters();
params.setTransactionIds(transactionIds);
params.setStoreProtocol(storeRef.getProtocol());
params.setStoreIdentifier(storeRef.getIdentifier());
JSONArray nodes = getNodes(params, 0, 2);
List<Long> nodeIds = new ArrayList<Long>(nodes.length());
@@ -679,6 +699,8 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
List<Long> transactionIds = getTransactionIds(transactions);
GetNodesParameters params = new GetNodesParameters();
params.setStoreProtocol(storeRef.getProtocol());
params.setStoreIdentifier(storeRef.getIdentifier());
params.setTransactionIds(transactionIds);
JSONArray nodes = getNodes(params, 0, 2001);