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 'upstream/main' into #2893

Browse Source
This commit is contained in:
Mark H. Wood
2020-07-31 18:12:23 -04:00
parent dc198bae00 c67da0b077
commit 87843a0edc
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
View File

@@ -8,8 +8,6 @@
package org.dspace.curate;
import static com.jayway.jsonpath.JsonPath.read;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.containsStringIgnoringCase;
import static org.hamcrest.Matchers.is;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -94,9 +92,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains the valid options
.andExpect(status().reason(containsString(CurationClientOptions.getTaskOptions().toString())));
.andExpect(status().isBadRequest());
}
@Test
@@ -138,9 +134,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains -e (the missing required cl option
.andExpect(status().reason(containsString("-e")));
.andExpect(status().isBadRequest());
}
@Test
@@ -183,9 +177,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains email
.andExpect(status().reason(containsString("email")));
.andExpect(status().isBadRequest());
}
@Test
@@ -208,9 +200,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains handle
.andExpect(status().reason(containsString("handle")));
.andExpect(status().isBadRequest());
}
@Test
@@ -234,9 +224,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains invalidHandle
.andExpect(status().reason(containsStringIgnoringCase("invalidhandle")));
.andExpect(status().isBadRequest());
}
@Test
@@ -278,9 +266,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains task
.andExpect(status().reason(containsString("task")));
.andExpect(status().isBadRequest());
}
@Test
@@ -328,9 +314,7 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
.param("properties",
new Gson().toJson(list)))
// Illegal Argument Exception
.andExpect(status().isBadRequest())
// Contains taskFile
.andExpect(status().reason(containsString("taskFile")));
.andExpect(status().isBadRequest());
}
@Test