diff --git a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportTest.java b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportIT.java similarity index 52% rename from dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportTest.java rename to dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportIT.java index 9594e2a2b1ce..7ebe7b781c63 100644 --- a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportTest.java +++ b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportIT.java @@ -14,49 +14,53 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; -import org.dspace.AbstractIntegrationTest; +import org.dspace.AbstractIntegrationTestWithDatabase; import org.dspace.app.launcher.ScriptLauncher; import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler; +import org.dspace.builder.CollectionBuilder; +import org.dspace.builder.CommunityBuilder; +import org.dspace.builder.WorkspaceItemBuilder; import org.dspace.content.Collection; import org.dspace.content.Community; import org.dspace.content.Item; import org.dspace.content.WorkspaceItem; import org.dspace.content.factory.ContentServiceFactory; -import org.dspace.content.service.CollectionService; -import org.dspace.content.service.CommunityService; import org.dspace.content.service.InstallItemService; import org.dspace.content.service.ItemService; -import org.dspace.content.service.WorkspaceItemService; import org.dspace.services.ConfigurationService; import org.dspace.services.factory.DSpaceServicesFactory; import org.junit.Test; -public class MetadataExportTest extends AbstractIntegrationTest { - - private ItemService itemService = ContentServiceFactory.getInstance().getItemService(); - private CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService(); - private CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService(); - private WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService(); - private InstallItemService installItemService = ContentServiceFactory.getInstance().getInstallItemService(); - private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService(); +public class MetadataExportIT + extends AbstractIntegrationTestWithDatabase { + private final ItemService itemService + = ContentServiceFactory.getInstance().getItemService(); + private final InstallItemService installItemService + = ContentServiceFactory.getInstance().getInstallItemService(); + private final ConfigurationService configurationService + = DSpaceServicesFactory.getInstance().getConfigurationService(); @Test public void metadataExportToCsvTest() throws Exception { context.turnOffAuthorisationSystem(); - Community community = communityService.create(null, context); - Collection collection = collectionService.create(context, community); - WorkspaceItem wi = workspaceItemService.create(context, collection, true); + Community community = CommunityBuilder.createCommunity(context).build(); + Collection collection = CollectionBuilder.createCollection(context, community).build(); + WorkspaceItem wi = WorkspaceItemBuilder.createWorkspaceItem(context, collection).build(); Item item = wi.getItem(); itemService.addMetadata(context, item, "dc", "contributor", "author", null, "Donald, Smith"); item = installItemService.installItem(context, wi); context.restoreAuthSystemState(); - String fileLocation = configurationService.getProperty("dspace.dir") + testProps.get("test.exportcsv") - .toString(); + String fileLocation = configurationService.getProperty("dspace.dir") + + testProps.get("test.exportcsv").toString(); - String[] args = new String[] {"metadata-export", "-i", String.valueOf(item.getHandle()), "-f", fileLocation}; - TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler(); + String[] args = new String[] {"metadata-export", + "-i", String.valueOf(item.getHandle()), + "-f", fileLocation}; + TestDSpaceRunnableHandler testDSpaceRunnableHandler + = new TestDSpaceRunnableHandler(); - ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl); + ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), + testDSpaceRunnableHandler, kernelImpl); File file = new File(fileLocation); String fileContent = IOUtils.toString(new FileInputStream(file), StandardCharsets.UTF_8); assertTrue(fileContent.contains("Donald, Smith")); @@ -64,8 +68,6 @@ public void metadataExportToCsvTest() throws Exception { context.turnOffAuthorisationSystem(); itemService.delete(context, itemService.find(context, item.getID())); - collectionService.delete(context, collectionService.find(context, collection.getID())); - communityService.delete(context, communityService.find(context, community.getID())); context.restoreAuthSystemState(); } }