Rebased main

This commit is contained in:
Nathan Buckingham
2021-09-14 14:13:38 -04:00
parent ad148b529e
commit 2fd4625a7e
2 changed files with 2 additions and 3 deletions

View File

@@ -450,7 +450,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
context.addEvent(new Event(Event.CREATE, Constants.ITEM, item.getID(), context.addEvent(new Event(Event.CREATE, Constants.ITEM, item.getID(),
null, getIdentifiers(context, item))); null, getIdentifiers(context, item)));
log.info(LogManager.getHeader(context, "create_item", "item_id=" + item.getID())); log.info(LogHelper.getHeader(context, "create_item", "item_id=" + item.getID()));
return item; return item;
} }

View File

@@ -10,7 +10,6 @@ package org.dspace.app.packager;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.File; import java.io.File;
@@ -163,7 +162,7 @@ public class PackagerIT extends AbstractIntegrationTestWithDatabase {
Iterator<Item> items = itemService.findByCollection(context, col1); Iterator<Item> items = itemService.findByCollection(context, col1);
Item testItem = items.next(); Item testItem = items.next();
assertFalse(items.hasNext()); //check to make sure there is only 1 item assertFalse(items.hasNext()); //check to make sure there is only 1 item
assertSame("123456789/100", testItem.getHandle()); //check to make sure the item wasn't overwritten as assertEquals("123456789/100", testItem.getHandle()); //check to make sure the item wasn't overwritten as
// it would have the old handle. // it would have the old handle.
} finally { } finally {
tempFile.delete(); tempFile.delete();