litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix building on JDK 9

Browse source
This commit is contained in:
Graham Triggs 2017-10-23 19:24:32 +01:00
parent f7a7aa5060
commit 41be1c22f4
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
View file

@ -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<String, Object> expMap = (Map<String, Object>)(om.readValue(expected, Map.class));
Map<String, Object> actMap = (Map<String, Object>)(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+", " "),

2
api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
View file

@ -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.<init>");
assertLogMessagesContains("no real path", "java.io.File.<init>");
}
@Test

2
installer/pom.xml
View file

@ -96,7 +96,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>

4
pom.xml
View file

@ -271,7 +271,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -290,7 +290,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>