Skip to content

Make getResourcePath overridable for build systems other than Gradle #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2018
Merged

Make getResourcePath overridable for build systems other than Gradle #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57274bc
Make getResourcePath overridable for build systems other than Gradle
ajs6f Mar 21, 2018
f69fd3e
Use a constructor for JenaIOService that does not rely on Tamaya
ajs6f Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions trellis-test/src/main/java/org/trellisldp/test/BaseCommonTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.URISyntaxException;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;

Expand All @@ -52,8 +53,8 @@ class BaseCommonTests {
private static String BASE_URL = null;
private static Client CLIENT = null;

private static final IOService IO_SVC = new JenaIOService(
new NamespacesJsonContext(getResourcePath("/data/namespaces.json")));
private final IOService IO_SVC = new JenaIOService(
new NamespacesJsonContext(getResourcePath("/data/namespaces.json")), null, Collections.emptyMap());
protected static final RDF rdf = new JenaRDF();

protected static void setUp() throws Exception {
Expand Down Expand Up @@ -99,7 +100,7 @@ protected static List<Link> getLinks(final Response res) {
return res.getStringHeaders().get(LINK).stream().map(Link::valueOf).collect(toList());
}

protected static String getResourcePath(final String path) {
protected String getResourcePath(final String path) {
try {
return new File(BaseCommonTests.class.getResource(path).toURI()).getAbsolutePath();
} catch (final URISyntaxException ex) {
Expand All @@ -124,7 +125,7 @@ protected Predicate<Link> hasType(final IRI iri) {
return link -> "type".equals(link.getRel()) && iri.getIRIString().equals(link.getUri().toString());
}

protected static Graph readEntityAsGraph(final Object entity, final RDFSyntax syntax) {
protected Graph readEntityAsGraph(final Object entity, final RDFSyntax syntax) {
final Graph g = rdf.createGraph();
IO_SVC.read((InputStream) entity, getBaseUrl(), syntax).forEach(g::add);
return g;
Expand Down