From 517792517c6b510e72cd875d2552e66317879638 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Sun, 11 Jan 2015 12:13:25 +0000 Subject: [PATCH] Stopped using getResource. --- .../main/java/uk/ac/ic/wlgitbridge/Main.java | 2 ++ .../wlgitbridge/WLGitBridgeIntegrationTest.java | 17 +++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java index 5dd5a7e941..e7594dcdd3 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java @@ -2,6 +2,8 @@ package uk.ac.ic.wlgitbridge; import uk.ac.ic.wlgitbridge.application.WLGitBridgeApplication; +import java.nio.file.Paths; + /** * Created by Winston on 01/11/14. */ diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java index 740a007aa4..a8969a569a 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java +++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java @@ -12,10 +12,7 @@ import uk.ac.ic.wlgitbridge.test.state.SnapshotAPIState; import uk.ac.ic.wlgitbridge.test.state.SnapshotAPIStateBuilder; import uk.ac.ic.wlgitbridge.test.util.FileUtil; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; +import java.io.*; import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; @@ -82,15 +79,15 @@ public class WLGitBridgeIntegrationTest { } private Path getResource(String path) { + return Paths.get("src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path); + } + + private InputStream getResourceAsStream(String path) { try { - return Paths.get(getClass().getResource("/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path).toURI()); - } catch (URISyntaxException e) { + return new FileInputStream(getResource(path).toFile()); + } catch (FileNotFoundException e) { throw new RuntimeException(e); } } - private InputStream getResourceAsStream(String path) { - return getClass().getResourceAsStream("/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest" + path); - } - }