hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 13:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable optimized selectcollection logic and add tests

Browse Source 
You can run a standalone test via:
/dspace/bin/dspace dsrun org.dspace.app.util.OptimizeSelectCollection
This commit is contained in:
Peter Dietz
2014-09-25 23:53:34 -04:00
parent bbe9ef6f3c
commit 252ab5e879
7 changed files with 93 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
dspace-api/src/test/java/org/dspace/content/CollectionTest.java
View File

@@ -10,10 +10,17 @@ package org.dspace.content;
import java.io.File;
import java.io.FileInputStream;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
import org.dspace.authorize.AuthorizeException;
import org.apache.log4j.Logger;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.elasticsearch.common.collect.Lists;
import org.junit.*;
import static org.junit.Assert.* ;
import static org.hamcrest.CoreMatchers.*;
@@ -1821,6 +1828,76 @@ public class CollectionTest extends AbstractDSpaceObjectTest
assertTrue("testFindAuthorized 10",found.length >= 1);
}
/**
* Test of findAuthorizedOptimized method, of class Collection.
* We create some collections and some users with varying auth, and ensure we can access them all properly.
*/
@Test
public void testFindAuthorizedOptimized() throws Exception
{
context.turnOffAuthorisationSystem();
Community com = Community.create(null, context);
Collection collectionA = Collection.create(context);
Collection collectionB = Collection.create(context);
Collection collectionC = Collection.create(context);
com.addCollection(collectionA);
com.addCollection(collectionB);
com.addCollection(collectionC);
EPerson epersonA = EPerson.create(context);
EPerson epersonB = EPerson.create(context);
EPerson epersonC = EPerson.create(context);
EPerson epersonD = EPerson.create(context);
//personA can submit to collectionA and collectionC
AuthorizeManager.addPolicy(context, collectionA, Constants.ADD, epersonA);
AuthorizeManager.addPolicy(context, collectionC, Constants.ADD, epersonA);
//personB can submit to collectionB and collectionC
AuthorizeManager.addPolicy(context, collectionB, Constants.ADD, epersonB);
AuthorizeManager.addPolicy(context, collectionC, Constants.ADD, epersonB);
//personC can only submit to collectionC
AuthorizeManager.addPolicy(context, collectionC, Constants.ADD, epersonC);
//personD no submission powers
context.restoreAuthSystemState();
context.setCurrentUser(epersonA);
Collection[] personACollections = Collection.findAuthorizedOptimized(context, Constants.ADD);
assertTrue("testFindAuthorizeOptimized A", personACollections.length == 2);
List<Collection> aList = Arrays.asList(personACollections);
assertTrue("testFindAuthorizeOptimized A.A", aList.contains(collectionA));
assertFalse("testFindAuthorizeOptimized A.A", aList.contains(collectionB));
assertTrue("testFindAuthorizeOptimized A.A", aList.contains(collectionC));
context.setCurrentUser(epersonB);
Collection[] personBCollections = Collection.findAuthorizedOptimized(context, Constants.ADD);
assertTrue("testFindAuthorizeOptimized B", personBCollections.length == 2);
List<Collection> bList = Arrays.asList(personBCollections);
assertFalse("testFindAuthorizeOptimized B.A", bList.contains(collectionA));
assertTrue("testFindAuthorizeOptimized B.B", bList.contains(collectionB));
assertTrue("testFindAuthorizeOptimized B.C", bList.contains(collectionC));
context.setCurrentUser(epersonC);
Collection[] personCCollections = Collection.findAuthorizedOptimized(context, Constants.ADD);
assertTrue("testFindAuthorizeOptimized C", personCCollections.length == 1);
List<Collection> cList = Arrays.asList(personCCollections);
assertFalse("testFindAuthorizeOptimized C.A", cList.contains(collectionA));
assertFalse("testFindAuthorizeOptimized C.B", cList.contains(collectionB));
assertTrue("testFindAuthorizeOptimized C.C", cList.contains(collectionC));
context.setCurrentUser(epersonD);
Collection[] personDCollections = Collection.findAuthorizedOptimized(context, Constants.ADD);
assertTrue("testFindAuthorizeOptimized D", personDCollections.length == 0);
List<Collection> dList = Arrays.asList(personDCollections);
assertFalse("testFindAuthorizeOptimized D.A", dList.contains(collectionA));
assertFalse("testFindAuthorizeOptimized D.B", dList.contains(collectionB));
assertFalse("testFindAuthorizeOptimized D.C", dList.contains(collectionC));
}
/**
* Test of countItems method, of class Collection.
*/