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 remote-tracking branch 'origin/w2p-62187_IT-changes' into entities-feedback-2019-05-07

Browse Source 
# Conflicts:
#	dspace-spring-rest/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
This commit is contained in:
Ben Bosman
2019-05-08 16:47:16 +02:00
parent be9d80c410 b76aacc626
commit 858bf72fa9
1 changed files with 63 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
dspace-spring-rest/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
View File

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.rest.builder.CollectionBuilder;
import org.dspace.app.rest.builder.CommunityBuilder;
import org.dspace.app.rest.builder.EPersonBuilder;
import org.dspace.app.rest.builder.ItemBuilder;
import org.dspace.app.rest.builder.RelationshipBuilder;
import org.dspace.app.rest.matcher.PageMatcher;
@@ -43,7 +44,6 @@ import org.dspace.content.service.RelationshipTypeService;
import org.dspace.core.Constants;
import org.dspace.core.I18nUtil;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,9 +58,6 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
@Autowired
private EntityTypeService entityTypeService;
@Autowired
private EPersonService ePersonService;
@Autowired
private AuthorizeService authorizeService;
@@ -199,15 +196,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("testaze@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, publication, Constants.WRITE, user);
@@ -267,15 +261,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("testazhfhdfhe@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, author1, Constants.WRITE, user);
@@ -335,15 +326,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("testazeazeazezae@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
context.restoreAuthSystemState();
@@ -1381,7 +1369,8 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
.andExpect(jsonPath("rightPlace", is(2)));
// Here we will delete the secondRelationship and then verify that the others have their place handled properly
getClient(adminToken).perform(delete("/api/core/relationships/" + secondRelationshipIdString));
getClient(adminToken).perform(delete("/api/core/relationships/" + secondRelationshipIdString))
.andExpect(status().isNoContent());
getClient(adminToken).perform(get("/api/core/relationships/" + firstRelationshipIdString))
.andExpect(status().isOk())
@@ -1522,15 +1511,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("rrarz@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, author1, Constants.WRITE, user);
@@ -1618,15 +1604,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("uiytirthery@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, publication, Constants.WRITE, user);
@@ -1720,15 +1703,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("tturturu@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, publication1, Constants.WRITE, user);
@@ -1824,15 +1804,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("tryhrtureery@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, author1, Constants.WRITE, user);
@@ -1921,15 +1898,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("erertertgrdgf@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
context.restoreAuthSystemState();
@@ -2011,15 +1985,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("tjyhrgefdg@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, author1, Constants.WRITE, user);
@@ -2109,15 +2080,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
EPerson user = ePersonService.create(context);
user.setFirstName(context, "first");
user.setLastName(context, "last");
user.setEmail("tyerzergt@email.com");
user.setCanLogIn(true);
user.setLanguage(context, I18nUtil.getDefaultLocale().getLanguage());
ePersonService.setPassword(user, password);
// actually save the eperson to unit testing DB
ePersonService.update(context, user);
EPerson user = EPersonBuilder.createEPerson(context)
.withNameInMetadata("first", "last")
.withEmail("testaze@gmail.com")
.withPassword(password)
.withLanguage(I18nUtil.getDefaultLocale().getLanguage())
.build();
context.setCurrentUser(user);
authorizeService.addPolicy(context, publication1, Constants.WRITE, user);