diff --git a/.gitignore b/.gitignore index 7361d25011c..37db4a9d156 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,3 @@ scripts/api/py_api_wrapper/local-data/* doc/sphinx-guides/build faces-config.NavData src/main/java/BuildNumber.properties -/nbproject/ - diff --git a/pom.xml b/pom.xml index 77eeaf9abab..288f2f7fb62 100644 --- a/pom.xml +++ b/pom.xml @@ -49,11 +49,7 @@ true - - unknown-jars-temp-repo - A temporary repository created by NetBeans for libraries and jars it could not identify. Please replace the dependencies in this repository with correct ones and delete this repository. - file:${project.basedir}/lib - + @@ -140,11 +136,6 @@ 16.0.1 jar - - unknown.binary - javax.ws.rs-api-2.0 - SNAPSHOT - javax javaee-api diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Sys.java b/src/main/java/edu/harvard/iq/dataverse/api/Sys.java index bcdab6359bf..713895d3839 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Sys.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Sys.java @@ -6,10 +6,8 @@ package edu.harvard.iq.dataverse.api; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; -import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*; import javax.ejb.EJB; import javax.json.Json; -import javax.json.JsonValue; import javax.json.JsonObjectBuilder; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -35,12 +33,10 @@ public Response getDatasetPublishPopupCustomText(){ JsonObjectBuilder response = Json.createObjectBuilder(); if(setting != null){ - response.add("DatasetPublishPopupCustomText", json(setting)); + return okResponse(response.add("DatasetPublishPopupCustomText", setting)); } else { - response.add("DatasetPublishPopupCustomText", JsonValue.NULL); + return notFound("Setting DatasetPublishPopupCustomText not found"); } - - return okResponse(response); } } \ No newline at end of file diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java index cef435dbb55..ae287626b86 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java @@ -5,25 +5,44 @@ */ package edu.harvard.iq.dataverse.api; -import com.jayway.restassured.response.Response; import static com.jayway.restassured.RestAssured.*; +import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import org.junit.Test; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.equalTo; /** * * @author jacksonokuhn */ public class SysIT { - + /** * Test of getDatasetPublishPopupCustomText method, of class Sys. */ @Test public void testGetDatasetPublishPopupCustomText() { + System.out.println("checking getDatasetPublishPopupCustomText"); - Response result = given().urlEncodingEnabled(false).get("/api/system/settings/:DatasetPublishPopupCustomText"); - result.prettyPrint(); - assertEquals(200, result.getStatusCode()); + + given().urlEncodingEnabled(false) + .get("/api/system/settings/:DatasetPublishPopupCustomText") + .then().assertThat().statusCode(404) + .body("message", equalTo("Setting DatasetPublishPopupCustomText not found")); + + given().urlEncodingEnabled(false) + .body("Hello world!").put("/api/admin/settings/DatasetPublishPopupCustomText"); + + given().urlEncodingEnabled(false) + .get("/api/system/settings/:DatasetPublishPopupCustomText") + .then().assertThat().statusCode(200) + .body("data.DatasetPublishPopupCustomText", equalTo("Hello world!")); + + given().urlEncodingEnabled(false) + .delete("/api/admin/settings/DatasetPublishPopupCustomText"); + + given().urlEncodingEnabled(false) + .get("/api/system/settings/:DatasetPublishPopupCustomText") + .then().assertThat().statusCode(404) + .body("message", equalTo("Setting DatasetPublishPopupCustomText not found")); } -} +} \ No newline at end of file