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

Make destroy more forgiving of test failures

Browse Source
This commit is contained in:
Terry Brady
2017-05-15 14:31:41 -07:00
committed by Terry W Brady
parent c5414e836e
commit c29745d421
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dspace-api/src/test/java/org/dspace/content/ItemTest.java
View File

@@ -107,28 +107,30 @@ public class ItemTest extends AbstractDSpaceObjectTest
@Override @Override
public void destroy() public void destroy()
{ {
// try { context.turnOffAuthorisationSystem();
context.turnOffAuthorisationSystem(); try {
//Get new instances, god knows what happended before itemService.delete(context, it);
// it = itemService.find(context, it.getID()); } catch(Exception e){
// collection = collectionService.find(context, collection.getID()); }
// owningCommunity = communityService.find(context, owningCommunity.getID());
// try {
// communityService.delete(context, owningCommunity); collectionService.delete(context, collection);
// context.commit(); } catch(Exception e){
// context.restoreAuthSystemState(); }
it = null;
collection = null; try {
owningCommunity = null; communityService.delete(context, owningCommunity);
} catch(Exception e){
}
context.restoreAuthSystemState();
it = null;
collection = null;
owningCommunity = null;
try {
super.destroy(); super.destroy();
// } catch (SQLException | AuthorizeException | IOException ex) { } catch(Exception e){
// if(context.isValid()) }
// {
// context.abort();
// }
// log.error("Error in destroy", ex);
// fail("Error in destroy: " + ex.getMessage());
// }
} }