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

Merge branch 'feature-relationship-versioning__discovery__bug-in-workspaceItemService' into feature-relationship-versioning__discovery

Browse Source
This commit is contained in:
Bruno Roemers
2022-05-10 17:42:48 +02:00
parent 09872a7491 f36d0377ce
commit 97fdc3477c
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
View File

@@ -19,6 +19,7 @@ import java.util.List;
import org.apache.commons.cli.ParseException;
import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.launcher.ScriptLauncher;
@@ -93,10 +94,10 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
}
@Test
public void metadataImportIntoCollectionWithEntityTypeTest() throws Exception {
public void metadataImportIntoCollectionWithEntityTypeWithTemplateEnabledTest() throws Exception {
String[] csv = {"id,collection,dc.title,dc.contributor.author",
"+," + publicationCollection.getHandle() + ",\"Test Import 1\"," + "\"Donald, SmithImported\""};
performImportScript(csv);
performImportScript(csv, true);
Item importedItem = findItemByName("Test Import 1");
assertTrue(StringUtils.equals(itemService.getMetadata(importedItem, "dc", "contributor", "author", Item.ANY)
.get(0).getValue(), "Donald, SmithImported"));
@@ -110,6 +111,24 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
context.restoreAuthSystemState();
}
@Test
public void metadataImportIntoCollectionWithEntityTypeWithTemplateDisabledTest() throws Exception {
String[] csv = {"id,collection,dc.title,dc.contributor.author",
"+," + publicationCollection.getHandle() + ",\"Test Import 1\"," + "\"Donald, SmithImported\""};
performImportScript(csv, false);
Item importedItem = findItemByName("Test Import 1");
assertTrue(StringUtils.equals(itemService.getMetadata(importedItem, "dc", "contributor", "author", Item.ANY)
.get(0).getValue(), "Donald, SmithImported"));
assertEquals(0, itemService.getMetadata(importedItem, "dspace", "entity", "type", Item.ANY)
.size());
eperson = ePersonService.findByEmail(context, eperson.getEmail());
assertEquals(importedItem.getSubmitter(), eperson);
context.turnOffAuthorisationSystem();
itemService.delete(context, itemService.find(context, importedItem.getID()));
context.restoreAuthSystemState();
}
@Test(expected = ParseException.class)
public void metadataImportWithoutEPersonParameterTest()
throws IllegalAccessException, InstantiationException, ParseException {
@@ -227,12 +246,16 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
return importedItem;
}
public void performImportScript(String[] csv) throws Exception {
performImportScript(csv, false);
}
/**
* Import mocked CSVs to test item creation behavior, deleting temporary file afterward.
* @param csv content for test file.
* @throws java.lang.Exception passed through.
*/
public void performImportScript(String[] csv) throws Exception {
public void performImportScript(String[] csv, boolean useTemplate) throws Exception {
File csvFile = File.createTempFile("dspace-test-import", "csv");
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(csvFile), "UTF-8"));
for (String csvLine : csv) {
@@ -243,6 +266,9 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
String fileLocation = csvFile.getAbsolutePath();
try {
String[] args = new String[] {"metadata-import", "-f", fileLocation, "-e", eperson.getEmail(), "-s"};
if (useTemplate) {
args = ArrayUtils.add(args, "-t");
}
TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
ScriptLauncher
.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);

2
dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
View File

@@ -48,7 +48,7 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
this.context = context;
try {
workspaceItem = workspaceItemService.create(context, col, false);
workspaceItem = workspaceItemService.create(context, col, true);
item = workspaceItem.getItem();
} catch (Exception e) {
return handleException(e);