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

DSpace refactored service api

Browse Source
This commit is contained in:
KevinVdV
2014-11-08 09:19:09 +01:00
parent fcb3717aad
commit 54222f3c1d
1145 changed files with 52233 additions and 57064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
dspace-api/src/test/java/org/dspace/content/VersioningTest.java
View File

@@ -10,16 +10,20 @@ package org.dspace.content;
import org.apache.log4j.Logger;
import org.dspace.AbstractUnitTest;
import org.dspace.authorize.AuthorizeException;
import org.dspace.handle.HandleManager;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.*;
import org.dspace.handle.factory.HandleServiceFactory;
import org.dspace.handle.service.HandleService;
import org.dspace.utils.DSpace;
import org.dspace.versioning.Version;
import org.dspace.versioning.VersionHistory;
import org.dspace.versioning.VersioningService;
import org.dspace.versioning.factory.VersionServiceFactory;
import org.dspace.versioning.service.VersionHistoryService;
import org.dspace.versioning.service.VersioningService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.*;
@@ -42,7 +46,14 @@ public class VersioningTest extends AbstractUnitTest {
private Item versionedItem;
private String summary = "Unit test version";
private DSpace dspace = new DSpace();
private VersioningService versioningService = dspace.getSingletonService(VersioningService.class);
protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
protected InstallItemService installItemService = ContentServiceFactory.getInstance().getInstallItemService();
protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
protected HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
protected VersioningService versionService = VersionServiceFactory.getInstance().getVersionService();
protected VersionHistoryService versionHistoryService = VersionServiceFactory.getInstance().getVersionHistoryService();
/**
@@ -60,17 +71,18 @@ public class VersioningTest extends AbstractUnitTest {
try
{
context.turnOffAuthorisationSystem();
Collection col = Collection.create(context);
WorkspaceItem is = WorkspaceItem.create(context, col, false);
Community community = communityService.create(null, context);
originalItem = InstallItem.installItem(context, is);
Collection col = collectionService.create(context, community);
WorkspaceItem is = workspaceItemService.create(context, col, false);
Version version = versioningService.createNewVersion(context, originalItem.getID(), summary);
WorkspaceItem wsi = WorkspaceItem.findByItem(context, version.getItem());
originalItem = installItemService.installItem(context, is);
versionedItem = InstallItem.installItem(context, wsi);
Version version = versionService.createNewVersion(context, originalItem, summary);
WorkspaceItem wsi = workspaceItemService.findByItem(context, version.getItem());
versionedItem = installItemService.installItem(context, wsi);
context.restoreAuthSystemState();
context.commit();
}
catch (AuthorizeException ex)
{
@@ -81,9 +93,6 @@ public class VersioningTest extends AbstractUnitTest {
{
log.error("SQL Error in init", ex);
fail("SQL Error in init: " + ex.getMessage());
} catch (IOException ex) {
log.error("IO Error in init", ex);
fail("IO Error in init: " + ex.getMessage());
}
}
@@ -99,15 +108,17 @@ public class VersioningTest extends AbstractUnitTest {
@Override
public void destroy()
{
context.abort();
super.destroy();
}
@Test
public void testVersionFind(){
VersionHistory versionHistory = versioningService.findVersionHistory(context, originalItem.getID());
public void testVersionFind() throws SQLException
{
VersionHistory versionHistory = versionHistoryService.findByItem(context, originalItem);
assertThat("testFindVersionHistory", versionHistory, notNullValue());
Version version = versionHistory.getVersion(versionedItem);
Version version = versionHistoryService.getVersion(versionHistory, versionedItem);
assertThat("testFindVersion", version, notNullValue());
}
@@ -118,8 +129,8 @@ public class VersioningTest extends AbstractUnitTest {
public void testVersionSummary() throws Exception
{
//Start by creating a new item !
VersionHistory versionHistory = versioningService.findVersionHistory(context, originalItem.getID());
Version version = versionHistory.getVersion(versionedItem);
VersionHistory versionHistory = versionHistoryService.findByItem(context, originalItem);
Version version = versionHistoryService.getVersion(versionHistory, versionedItem);
assertThat("Test_version_summary", summary, equalTo(version.getSummary()));
}
@@ -131,9 +142,9 @@ public class VersioningTest extends AbstractUnitTest {
@Test
public void testVersionDelete() throws Exception {
context.turnOffAuthorisationSystem();
versioningService.removeVersion(context, versionedItem);
assertThat("Test_version_delete", Item.find(context, versionedItem.getID()), nullValue());
assertThat("Test_version_handle_delete", HandleManager.resolveToObject(context, versionedItem.getHandle()), nullValue());
versionService.removeVersion(context, versionedItem);
assertThat("Test_version_delete", itemService.find(context, versionedItem.getID()), nullValue());
assertThat("Test_version_handle_delete", handleService.resolveToObject(context, versionedItem.getHandle()), nullValue());
context.restoreAuthSystemState();
}
}