hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-09 11:03:12 +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

131
dspace-api/src/test/java/org/dspace/content/BitstreamTest.java
View File

@@ -11,6 +11,11 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.BitstreamFormatService;
import org.dspace.core.Context;
import org.junit.*;
import static org.junit.Assert.* ;
@@ -18,7 +23,6 @@ import static org.hamcrest.CoreMatchers.*;
import mockit.*;
import org.apache.log4j.Logger;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.AuthorizeManager;
import org.dspace.core.Constants;
/**
@@ -30,6 +34,9 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
/** log4j category */
private static final Logger log = Logger.getLogger(BitstreamTest.class);
protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance().getBitstreamFormatService();
/**
* BitStream instance for the tests
*/
@@ -51,10 +58,9 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
{
//we have to create a new bitstream in the database
File f = new File(testProps.get("test.bitstream").toString());
this.bs = Bitstream.create(context, new FileInputStream(f));
this.bs = bitstreamService.create(context, new FileInputStream(f));
this.dspaceObject = bs;
//we need to commit the changes so we don't block the table for testing
context.commit();
}
catch (IOException ex) {
log.error("IO Error in init", ex);
@@ -88,11 +94,11 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
@Test
public void testBSFind() throws SQLException
{
int id = this.bs.getID();
Bitstream found = Bitstream.find(context, id);
UUID id = this.bs.getID();
Bitstream found = bitstreamService.find(context, id);
assertThat("testBSFind 0", found, notNullValue());
//the item created by default has no name nor type set
assertThat("testBSFind 1", found.getFormat().getMIMEType(), equalTo("application/octet-stream"));
assertThat("testBSFind 1", found.getFormat(context).getMIMEType(), equalTo("application/octet-stream"));
assertThat("testBSFind 2", found.getName(), nullValue());
assertThat("testBSFind 3", found.getID(), equalTo(id));
}
@@ -103,11 +109,11 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
@Test
public void testFindAll() throws SQLException
{
Bitstream[] found = Bitstream.findAll(context);
List<Bitstream> found = bitstreamService.findAll(context);
assertThat("testFindAll 0", found, notNullValue());
//we have many bs, one created per test run, so at least we have 1 if
//this test is run first
assertTrue("testFindAll 1", found.length >= 1);
assertTrue("testFindAll 1", found.size() >= 1);
boolean added = false;
for(Bitstream b: found)
@@ -127,11 +133,10 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testCreate() throws IOException, SQLException
{
File f = new File(testProps.get("test.bitstream").toString());
Bitstream created = Bitstream.create(context, new FileInputStream(f));
context.commit();
Bitstream created = bitstreamService.create(context, new FileInputStream(f));
//the item created by default has no name nor type set
assertThat("testCreate 0", created.getFormat().getMIMEType(), equalTo("application/octet-stream"));
assertThat("testCreate 0", created.getFormat(context).getMIMEType(), equalTo("application/octet-stream"));
assertThat("testCreate 1", created.getName(), nullValue());
}
@@ -139,28 +144,38 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
* Test of register method, of class Bitstream.
*/
@Test
public void testRegister() throws IOException, SQLException
public void testRegister() throws IOException, SQLException, AuthorizeException
{
new NonStrictExpectations(authorizeService.getClass())
{{
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.WRITE); result = null;
}};
int assetstore = 0;
File f = new File(testProps.get("test.bitstream").toString());
Bitstream registered = Bitstream.register(context,assetstore, f.getName());
Bitstream registered = bitstreamService.register(context,assetstore, f.getName());
//the item created by default has no name nor type set
assertThat("testRegister 0", registered.getFormat().getMIMEType(), equalTo("application/octet-stream"));
assertThat("testRegister 0", registered.getFormat(context).getMIMEType(), equalTo("application/octet-stream"));
assertThat("testRegister 1", registered.getName(), nullValue());
}
/**
* Test of getID method, of class Bitstream.
*/
@Override
@Test
public void testGetID()
{
assertTrue("testGetID 0", bs.getID() >= 0);
assertTrue("testGetID 0", bs.getID() != null);
}
@Test
public void testLegacyID() { assertTrue("testGetLegacyID 0", bs.getLegacyId() == null);}
/**
* Test of getHandle method, of class Bitstream.
*/
@Override
@Test
public void testGetHandle()
{
@@ -192,6 +207,7 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
/**
* Test of getName method, of class Bitstream.
*/
@Override
@Test
public void testGetName()
{
@@ -203,10 +219,10 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
* Test of setName method, of class Bitstream.
*/
@Test
public void testSetName()
public void testSetName() throws SQLException
{
String name = "new name";
bs.setName(name);
bs.setName(context, name);
assertThat("testGetName 0", bs.getName(), notNullValue());
assertThat("testGetName 1", bs.getName(), not(equalTo("")));
assertThat("testGetName 2", bs.getName(), equalTo(name));
@@ -226,10 +242,10 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
* Test of setSource method, of class Bitstream.
*/
@Test
public void testSetSource()
public void testSetSource() throws SQLException
{
String source = "new source";
bs.setSource(source);
bs.setSource(context, source);
assertThat("testSetSource 0", bs.getSource(), notNullValue());
assertThat("testSetSource 1", bs.getSource(), not(equalTo("")));
assertThat("testSetSource 2", bs.getSource(), equalTo(source));
@@ -249,10 +265,10 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
* Test of setDescription method, of class Bitstream.
*/
@Test
public void testSetDescription()
public void testSetDescription() throws SQLException
{
String description = "new description";
bs.setDescription(description);
bs.setDescription(context, description);
assertThat("testSetDescription 0", bs.getDescription(), notNullValue());
assertThat("testSetDescription 1", bs.getDescription(), not(equalTo("")));
assertThat("testSetDescription 2", bs.getDescription(), equalTo(description));
@@ -302,7 +318,7 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testSetUserFormatDescription() throws SQLException
{
String userdescription = "user format description";
bs.setUserFormatDescription(userdescription);
bs.setUserFormatDescription(context, userdescription);
assertThat("testSetUserFormatDescription 0", bs.getUserFormatDescription()
, notNullValue());
assertThat("testSetUserFormatDescription 1", bs.getUserFormatDescription()
@@ -326,15 +342,14 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
* Test of getFormatDescription method, of class Bitstream.
*/
@Test
public void testGetFormatDescription()
{
public void testGetFormatDescription() throws SQLException {
//format is unknown by default
String format = "Unknown";
assertThat("testGetFormatDescription 0", bs.getFormatDescription(),
assertThat("testGetFormatDescription 0", bs.getFormatDescription(context),
notNullValue());
assertThat("testGetFormatDescription 1", bs.getFormatDescription(),
assertThat("testGetFormatDescription 1", bs.getFormatDescription(context),
not(equalTo("")));
assertThat("testGetFormatDescription 2", bs.getFormatDescription(),
assertThat("testGetFormatDescription 2", bs.getFormatDescription(context),
equalTo(format));
}
@@ -344,8 +359,8 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
@Test
public void testGetFormat() throws SQLException
{
assertThat("testGetFormat 0", bs.getFormat(), notNullValue());
assertThat("testGetFormat 1", bs.getFormat(), equalTo(BitstreamFormat.findUnknown(context)));
assertThat("testGetFormat 0", bs.getFormat(context), notNullValue());
assertThat("testGetFormat 1", bs.getFormat(context), equalTo(bitstreamFormatService.findUnknown(context)));
}
/**
@@ -355,10 +370,10 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testSetFormat() throws SQLException
{
int id = 3;
BitstreamFormat format = BitstreamFormat.find(context, id);
BitstreamFormat format = bitstreamFormatService.find(context, id);
bs.setFormat(format);
assertThat("testSetFormat 0", bs.getFormat(), notNullValue());
assertThat("testSetFormat 1", bs.getFormat(), equalTo(BitstreamFormat.find(context, id)));
assertThat("testSetFormat 0", bs.getFormat(context), notNullValue());
assertThat("testSetFormat 1", bs.getFormat(context), equalTo(bitstreamFormatService.find(context, id)));
}
/**
@@ -367,15 +382,15 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
@Test(expected=AuthorizeException.class)
public void testUpdateNotAdmin() throws SQLException, AuthorizeException
{
new NonStrictExpectations(AuthorizeManager.class)
new NonStrictExpectations(authorizeService.getClass())
{{
// Disallow Bitstream WRITE perms
AuthorizeManager.authorizeAction((Context) any, (Bitstream) any,
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.WRITE); result = new AuthorizeException();
}};
//TODO: we need to verify the update, how?
bs.update();
bitstreamService.update(context, bs);
}
/**
@@ -384,31 +399,40 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
@Test
public void testUpdateAdmin() throws SQLException, AuthorizeException
{
new NonStrictExpectations(AuthorizeManager.class)
new NonStrictExpectations(authorizeService.getClass())
{{
// Allow Bitstream WRITE perms
AuthorizeManager.authorizeAction((Context) any, (Bitstream) any,
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.WRITE); result = null;
}};
//TODO: we need to verify the update, how?
bs.update();
bitstreamService.update(context, bs);
}
/**
* Test of delete method, of class Bitstream.
*/
@Test
public void testDelete() throws IOException, SQLException
{
// Create a new bitstream, which we can delete. As ordering of these
public void testDelete() throws IOException, SQLException, AuthorizeException
{
new NonStrictExpectations(authorizeService.getClass())
{{
// Allow Bitstream WRITE perms
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.WRITE); result = null;
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.DELETE); result = null;
}};
// Create a new bitstream, which we can delete. As ordering of these
// tests is unpredictable we don't want to delete the global bitstream
File f = new File(testProps.get("test.bitstream").toString());
Bitstream delBS = Bitstream.create(context, new FileInputStream(f));
Bitstream delBS = bitstreamService.create(context, new FileInputStream(f));
assertFalse("testIsDeleted 0", delBS.isDeleted());
delBS.delete();
bitstreamService.delete(context, delBS);
assertTrue("testDelete 0", delBS.isDeleted());
}
@@ -419,14 +443,14 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testRetrieveCanRead() throws IOException, SQLException,
AuthorizeException
{
new NonStrictExpectations(AuthorizeManager.class)
new NonStrictExpectations(authorizeService.getClass())
{{
// Allow Bitstream READ perms
AuthorizeManager.authorizeAction((Context) any, (Bitstream) any,
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.READ); result = null;
}};
assertThat("testRetrieveCanRead 0", bs.retrieve(), notNullValue());
assertThat("testRetrieveCanRead 0", bitstreamService.retrieve(context, bs), notNullValue());
}
/**
@@ -436,14 +460,14 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testRetrieveNoRead() throws IOException, SQLException,
AuthorizeException
{
new NonStrictExpectations(AuthorizeManager.class)
new NonStrictExpectations(authorizeService.getClass())
{{
// Disallow Bitstream READ perms
AuthorizeManager.authorizeAction((Context) any, (Bitstream) any,
authorizeService.authorizeAction((Context) any, (Bitstream) any,
Constants.READ); result = new AuthorizeException();
}};
assertThat("testRetrieveNoRead 0", bs.retrieve(), notNullValue());
assertThat("testRetrieveNoRead 0", bitstreamService.retrieve(context, bs), notNullValue());
}
/**
@@ -454,12 +478,13 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
{
assertThat("testGetBundles 0", bs.getBundles(), notNullValue());
//by default no bundles
assertTrue("testGetBundles 1", bs.getBundles().length == 0);
assertTrue("testGetBundles 1", bs.getBundles().size() == 0);
}
/**
* Test of getType method, of class Bitstream.
*/
@Override
@Test
public void testGetType()
{
@@ -473,7 +498,7 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testIsRegisteredBitstream()
{
//false by default
assertThat("testIsRegisteredBitstream 0", bs.isRegisteredBitstream(),
assertThat("testIsRegisteredBitstream 0", bitstreamService.isRegisteredBitstream(bs),
equalTo(false));
}
@@ -494,7 +519,7 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
public void testGetParentObject() throws SQLException
{
//by default this bitstream is not linked to any object
assertThat("testGetParentObject 0", bs.getParentObject(),
assertThat("testGetParentObject 0", bitstreamService.getParentObject(context, bs),
nullValue());
}