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

[DS-2779] Fix versioning due to service api: Additional unit tests

Browse Source
This commit is contained in:
KevinVdV
2015-10-05 12:51:17 +02:00
parent 038e2c57c5
commit 75b0ce5d29
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
View File

@@ -326,8 +326,12 @@ public class HandleServiceImpl implements HandleService
Handle dbHandle = findHandleInternal(context, handle); Handle dbHandle = findHandleInternal(context, handle);
if(dbHandle != null) if(dbHandle != null)
{ {
//Remove the old handle from the current handle list
dbHandle.getDSpaceObject().getHandles().remove(dbHandle);
//Transfer the current handle to the new object
dbHandle.setDSpaceObject(newOwner); dbHandle.setDSpaceObject(newOwner);
dbHandle.setResourceTypeId(newOwner.getType()); dbHandle.setResourceTypeId(newOwner.getType());
newOwner.getHandles().add(0, dbHandle);
handleDAO.save(context, dbHandle); handleDAO.save(context, dbHandle);
} }

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

@@ -12,6 +12,7 @@ import org.dspace.AbstractUnitTest;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.content.factory.ContentServiceFactory; import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.*; import org.dspace.content.service.*;
import org.dspace.core.ConfigurationManager;
import org.dspace.handle.factory.HandleServiceFactory; import org.dspace.handle.factory.HandleServiceFactory;
import org.dspace.handle.service.HandleService; import org.dspace.handle.service.HandleService;
import org.dspace.utils.DSpace; import org.dspace.utils.DSpace;
@@ -28,6 +29,7 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@@ -42,6 +44,7 @@ public class VersioningTest extends AbstractUnitTest {
private static final Logger log = Logger.getLogger(VersioningTest.class); private static final Logger log = Logger.getLogger(VersioningTest.class);
private String originalHandle;
private Item originalItem; private Item originalItem;
private Item versionedItem; private Item versionedItem;
private String summary = "Unit test version"; private String summary = "Unit test version";
@@ -55,6 +58,8 @@ public class VersioningTest extends AbstractUnitTest {
protected VersioningService versionService = VersionServiceFactory.getInstance().getVersionService(); protected VersioningService versionService = VersionServiceFactory.getInstance().getVersionService();
protected VersionHistoryService versionHistoryService = VersionServiceFactory.getInstance().getVersionHistoryService(); protected VersionHistoryService versionHistoryService = VersionServiceFactory.getInstance().getVersionHistoryService();
//A regex that can be used to see if a handle contains the format of handle created by the org.dspace.identifier.VersionedHandleIdentifierProvider
protected String versionedHandleRegex = ConfigurationManager.getProperty("handle.prefix") + "\\/[0-9]*\\.[0-9]";
/** /**
* This method will be run before every test as per @Before. It will * This method will be run before every test as per @Before. It will
@@ -77,6 +82,7 @@ public class VersioningTest extends AbstractUnitTest {
WorkspaceItem is = workspaceItemService.create(context, col, false); WorkspaceItem is = workspaceItemService.create(context, col, false);
originalItem = installItemService.installItem(context, is); originalItem = installItemService.installItem(context, is);
originalHandle = originalItem.getHandle();
Version version = versionService.createNewVersion(context, originalItem, summary); Version version = versionService.createNewVersion(context, originalItem, summary);
WorkspaceItem wsi = workspaceItemService.findByItem(context, version.getItem()); WorkspaceItem wsi = workspaceItemService.findByItem(context, version.getItem());
@@ -136,7 +142,20 @@ public class VersioningTest extends AbstractUnitTest {
@Test @Test
public void testVersionHandle() throws Exception { public void testVersionHandle() throws Exception {
assertThat("Test_version_handle", versionedItem.getHandle(), notNullValue()); /*
Verify the handles assigned to an item, the original item should get a single handle
while the versioned item should get 2 handles, the original handle & a versioned one.
*/
assertThat("Test_version_handle 1", versionedItem.getHandle(), notNullValue());
assertThat("Test_version_handle 2", originalItem.getHandle(), notNullValue());
assertTrue("Test_version_handle 3 ", originalItem.getHandles().size() == 1);
assertTrue("Test_version_handle 4 ", versionedItem.getHandles().size() == 2);
assertTrue("Test_version_handle 5 ", originalItem.getHandle().matches(versionedHandleRegex));
assertTrue("Test_version_handle 6 ", originalItem.getHandle().startsWith(originalHandle + "."));
//The getHandle method should always return the original handle
assertTrue("Test_version_handle 7 ", versionedItem.getHandle().equals(originalHandle));
assertTrue("Test_version_handle 8 ", versionedItem.getHandles().get(1).getHandle().startsWith(originalHandle + "."));
assertTrue("Test_version_handle 9 ", versionedItem.getHandles().get(1).getHandle().matches(versionedHandleRegex));
} }
@Test @Test