aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-06-14 14:35:53 +0200
committerGitHub <noreply@github.com>2019-06-14 14:35:53 +0200
commit37375dfc85cf8f54272a0b1e2278032b50e1b034 (patch)
treec246490cb9eb66c07eb05e04f9c6e67fde9cb308 /controller-server
parente0964e009b2a2d2686b2479eaa194e16271808b0 (diff)
parent7ee992b7ac5554c079b446769364b1f0c325d814 (diff)
Merge pull request #9798 from vespa-engine/mpolden/remove-classpath-dependency
Avoid using classpath to read test data
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/TestConfigSerializerTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/TestConfigSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/TestConfigSerializerTest.java
index bc411d4377d..d4550ecc338 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/TestConfigSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/TestConfigSerializerTest.java
@@ -9,6 +9,8 @@ import org.junit.Test;
import java.io.IOException;
import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
@@ -28,7 +30,7 @@ public class TestConfigSerializerTest {
Map.of(zone, Map.of(ClusterSpec.Id.from("ai"),
URI.create("https://server/"))),
Map.of(zone, List.of("facts")));
- byte[] expected = InternalStepRunnerTest.class.getResourceAsStream("/testConfig.json").readAllBytes();
+ byte[] expected = Files.readAllBytes(Paths.get("src/test/resources/testConfig.json"));
assertEquals(new String(SlimeUtils.toJsonBytes(SlimeUtils.jsonToSlime(expected))),
new String(json));
}