hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

75323: Delete solr record on workspaceitem deletion: Test feedback

Browse Source
This commit is contained in:
Yana De Pauw
2020-12-17 10:46:47 +01:00
parent 2466731028
commit 8cd404b6a7
2 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/discovery/indexobject/factory/IndexObjectFactoryFactory.java
View File

@@ -68,7 +68,7 @@ public abstract class IndexObjectFactoryFactory {
*/
public IndexFactory getIndexFactoryByType(String indexableFactoryType) {
for (IndexFactory indexableObjectFactory : getIndexFactories()) {
if (StringUtils.equalsIgnoreCase(indexableObjectFactory.getType(), (indexableFactoryType))) {
if (StringUtils.equalsIgnoreCase(indexableObjectFactory.getType(), indexableFactoryType)) {
return indexableObjectFactory;
}
}

51
dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
View File

@@ -20,7 +20,6 @@ import org.dspace.content.Community;
import org.dspace.content.WorkspaceItem;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.WorkspaceItemService;
import org.junit.Before;
import org.junit.Test;
/**
@@ -32,47 +31,35 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
protected SearchService searchService = SearchUtils.getSearchService();
Community community;
Collection col;
WorkspaceItem leftIs;
WorkspaceItem rightIs;
/**
* This method will be run before every test as per @Before. It will
* initialize resources required for the tests.
*
* Other methods can be annotated with @Before here or in subclasses
* but no execution order is guaranteed
*/
@Before
@Override
public void setUp() throws Exception {
super.setUp();
context.turnOffAuthorisationSystem();
community = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
col = CollectionBuilder.createCollection(context, community).build();
leftIs = WorkspaceItemBuilder.createWorkspaceItem(context, col).withAbstract("headache").build();
rightIs = WorkspaceItemBuilder.createWorkspaceItem(context, col).withAbstract("headache").build();
context.restoreAuthSystemState();
}
@Test
public void deleteWorkspaceItemSolrRecordAfterDeletionFromDbTest() throws Exception {
context.turnOffAuthorisationSystem();
Community community = CommunityBuilder.createCommunity(context)
.withName("Parent Community")
.build();
Collection col = CollectionBuilder.createCollection(context, community)
.build();
WorkspaceItem workspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, col)
.withAbstract("headache")
.build();
context.restoreAuthSystemState();
DiscoverQuery discoverQuery = new DiscoverQuery();
discoverQuery.setQuery("*:*");
discoverQuery.addFilterQueries("search.resourceid:" + leftIs.getID());
discoverQuery.addFilterQueries("search.resourceid:" + workspaceItem.getID());
DiscoverResult discoverResult = searchService.search(context, discoverQuery);
List<IndexableObject> indexableObjects = discoverResult.getIndexableObjects();
assertEquals(1, indexableObjects.size());
workspaceItemService.deleteAll(context, leftIs);
assertEquals(1, discoverResult.getTotalSearchResults());
context.turnOffAuthorisationSystem();
workspaceItemService.deleteAll(context, workspaceItem);
context.dispatchEvents();
context.restoreAuthSystemState();
discoverResult = searchService.search(context, discoverQuery);
indexableObjects = discoverResult.getIndexableObjects();
assertEquals(0, indexableObjects.size());
context.restoreAuthSystemState();
assertEquals(0, discoverResult.getTotalSearchResults());
}
}