Skip to content

Commit dccf1f4

Browse files
authored
Merge pull request DSpace#11762 from atmire/w2p-137948_harcode-values-subject-to-change-in-test-env
Fix test that can easily fail because of config changes by introducing test config
2 parents 0e68890 + 62e1167 commit dccf1f4

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

dspace-api/src/test/data/dspaceFolder/config/local.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,7 @@ assetstore.jcloud.subfolder = assetstore
203203
assetstore.jcloud.provider = filesystem
204204
assetstore.jcloud.container = assetstore-jclouds-container
205205
assetstore.jcloud.basedir = target/testing/dspace
206+
207+
webui.submit.upload.required = true
208+
rest.cors.allowed-origins = http://localhost:4000
209+
dspace.name = DSpace at My University

dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,29 @@ public void setup() throws Exception {
8181
public void findAll() throws Exception {
8282

8383
context.turnOffAuthorisationSystem();
84-
MetadataField metadataField = MetadataFieldBuilder
85-
.createMetadataField(context, "AnElement", "AQualifier", "AScopeNote").build();
86-
context.restoreAuthSystemState();
8784

8885
getClient().perform(get("/api/core/metadatafields")
89-
.param("size", String.valueOf(100)))
86+
.param("size", String.valueOf(9999)))
9087
.andExpect(status().isOk())
9188
.andExpect(content().contentType(contentType))
9289
.andExpect(jsonPath("$._embedded.metadatafields", Matchers.hasItems(
9390
MetadataFieldMatcher.matchMetadataFieldByKeys("dc", "title", null),
9491
MetadataFieldMatcher.matchMetadataFieldByKeys("dc", "date", "issued"))
95-
))
92+
));
93+
}
94+
95+
@Test
96+
public void findAllPaginated() throws Exception {
97+
getClient().perform(get("/api/core/metadatafields")
98+
.param("size", String.valueOf(2)))
99+
.andExpect(status().isOk())
100+
.andExpect(content().contentType(contentType))
101+
.andExpect(jsonPath("$._embedded.metadatafields", Matchers.notNullValue()))
96102
.andExpect(jsonPath("$._links.first.href", Matchers.containsString("/api/core/metadatafields")))
97103
.andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/core/metadatafields")))
98104
.andExpect(jsonPath("$._links.next.href", Matchers.containsString("/api/core/metadatafields")))
99105
.andExpect(jsonPath("$._links.last.href", Matchers.containsString("/api/core/metadatafields")))
100-
101-
.andExpect(jsonPath("$.page.size", is(100)));
106+
.andExpect(jsonPath("$.page.size", is(2)));
102107
}
103108

104109
@Test

0 commit comments

Comments
 (0)