diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java index cae072d8f..93e23447f 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java @@ -6,14 +6,19 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; @@ -470,6 +475,8 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass { assertEquivalentTurtle(message, expected, out.toString()); } else if (ACCEPT_N3.equals(acceptHeader)) { assertEquivalentN3(message, expected, out.toString()); + } else if (ACCEPT_JSON.equals(acceptHeader)) { + assertEquivalentJSON(message, expected, out.toString()); } else { assertEqualsIgnoreWhiteSpace(message, expected, out.toString()); } @@ -541,6 +548,18 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass { return StringUtils.join(remainder, "\n"); } + private void assertEquivalentJSON(String message, String expected, + String actual) { + ObjectMapper om = new ObjectMapper(); + try { + Map expMap = (Map)(om.readValue(expected, Map.class)); + Map actMap = (Map)(om.readValue(actual, Map.class)); + assertEquals(message, expMap, actMap); + } catch (IOException e) { + assertEquals(message, expected.replaceAll("\\s+", " "), + actual.replaceAll("\\s+", " ")); + } + } private void assertEqualsIgnoreWhiteSpace(String message, String expected, String actual) { assertEquals(message, expected.replaceAll("\\s+", " "), diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java index 7b49dbebc..08d5c0e79 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java @@ -219,7 +219,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends // Throws an exception because we don't test for a null path from the // ServletContext. - assertLogMessagesContains("no real path", "at java.io.File."); + assertLogMessagesContains("no real path", "java.io.File."); } @Test diff --git a/installer/pom.xml b/installer/pom.xml index 5ff59fc97..bfba62782 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -96,7 +96,7 @@ maven-war-plugin - 2.6 + 3.2.0 diff --git a/pom.xml b/pom.xml index deec70f08..cbca0c95e 100644 --- a/pom.xml +++ b/pom.xml @@ -271,7 +271,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.6 + 3.0.2 org.apache.maven.plugins @@ -290,7 +290,7 @@ maven-war-plugin - 2.6 + 3.2.0 org.codehaus.mojo