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

Merge pull request #2419 from atmire/w2p-62057_configurable-entities-feedback

Browse Source 
configurable entities feedback
This commit is contained in:
benbosman
2019-05-02 17:10:03 +02:00
committed by GitHub
parent fc05d2dab0 4c6e939e57
commit cd8226cc97
2 changed files with 1658 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-spring-rest/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
View File

@@ -2243,8 +2243,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.withIssueDate("2010-02-13") .withIssueDate("2010-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test") .withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test")
.withAuthor("test2, test2").withAuthor("Maybe, Maybe") .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
.withSubject("AnotherTest").withSubject("TestingForMore") .withSubject("AnotherTest").withSubject("TestingForMore").withSubject("ExtraEntry")
.withSubject("ExtraEntry")
.build(); .build();
UUID scope = col2.getID(); UUID scope = col2.getID();
@@ -2317,8 +2316,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.withIssueDate("2010-02-13") .withIssueDate("2010-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test") .withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test")
.withAuthor("test2, test2").withAuthor("Maybe, Maybe") .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
.withSubject("AnotherTest").withSubject("TestingForMore") .withSubject("AnotherTest").withSubject("TestingForMore").withSubject("ExtraEntry")
.withSubject("ExtraEntry")
.build(); .build();
UUID scope = col2.getID(); UUID scope = col2.getID();
@@ -2540,8 +2538,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.withIssueDate("2010-02-13") .withIssueDate("2010-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test") .withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test")
.withAuthor("test2, test2").withAuthor("Maybe, Maybe") .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
.withSubject("AnotherTest").withSubject("TestingForMore") .withSubject("AnotherTest").withSubject("TestingForMore").withSubject("ExtraEntry")
.withSubject("ExtraEntry")
.build(); .build();
UUID scope = col2.getID(); UUID scope = col2.getID();
@@ -2613,8 +2610,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.withIssueDate("2010-02-13") .withIssueDate("2010-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test") .withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test")
.withAuthor("test2, test2").withAuthor("Maybe, Maybe") .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
.withSubject("AnotherTest").withSubject("TestingForMore") .withSubject("AnotherTest").withSubject("TestingForMore").withSubject("ExtraEntry")
.withSubject("ExtraEntry")
.build(); .build();
UUID scope = col2.getID(); UUID scope = col2.getID();
@@ -2687,8 +2683,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.withIssueDate("2010-02-13") .withIssueDate("2010-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test") .withAuthor("Smith, Maria").withAuthor("Doe, Jane").withAuthor("test,test")
.withAuthor("test2, test2").withAuthor("Maybe, Maybe") .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
.withSubject("AnotherTest").withSubject("TestingForMore") .withSubject("AnotherTest").withSubject("TestingForMore").withSubject("ExtraEntry")
.withSubject("ExtraEntry")
.build(); .build();
UUID scope = col2.getID(); UUID scope = col2.getID();

4
dspace-spring-rest/src/test/java/org/dspace/app/rest/RelationshipTypeRestControllerIT.java
View File

@@ -44,8 +44,6 @@ public class RelationshipTypeRestControllerIT extends AbstractEntityIntegrationT
@Test @Test
public void findAllEntityTypes() throws Exception { public void findAllEntityTypes() throws Exception {
context.turnOffAuthorisationSystem();
getClient().perform(get("/api/core/entitytypes")) getClient().perform(get("/api/core/entitytypes"))
.andExpect(status().isOk()) .andExpect(status().isOk())
@@ -67,7 +65,6 @@ public class RelationshipTypeRestControllerIT extends AbstractEntityIntegrationT
@Test @Test
public void findAllRelationshipTypesForPublications() throws Exception { public void findAllRelationshipTypesForPublications() throws Exception {
context.turnOffAuthorisationSystem();
EntityType publicationEntityType = entityTypeService.findByEntityType(context, "Publication"); EntityType publicationEntityType = entityTypeService.findByEntityType(context, "Publication");
EntityType personEntityType = entityTypeService.findByEntityType(context, "Person"); EntityType personEntityType = entityTypeService.findByEntityType(context, "Person");
EntityType projectEntityType = entityTypeService.findByEntityType(context, "Project"); EntityType projectEntityType = entityTypeService.findByEntityType(context, "Project");
@@ -186,6 +183,7 @@ public class RelationshipTypeRestControllerIT extends AbstractEntityIntegrationT
Relationship relationship4 = RelationshipBuilder Relationship relationship4 = RelationshipBuilder
.createRelationshipBuilder(context, publication2, author3, isAuthorOfPublicationRelationshipType).build(); .createRelationshipBuilder(context, publication2, author3, isAuthorOfPublicationRelationshipType).build();
context.restoreAuthSystemState();
getClient().perform(get("/api/core/relationships/isAuthorOfPublication")) getClient().perform(get("/api/core/relationships/isAuthorOfPublication"))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.relationships", containsInAnyOrder( .andExpect(jsonPath("$._embedded.relationships", containsInAnyOrder(