diff options
Diffstat (limited to 'config-lib/src')
3 files changed, 5 insertions, 7 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/PathNode.java b/config-lib/src/main/java/com/yahoo/config/PathNode.java index 03e6fb51086..ea4c657af8c 100644 --- a/config-lib/src/main/java/com/yahoo/config/PathNode.java +++ b/config-lib/src/main/java/com/yahoo/config/PathNode.java @@ -25,7 +25,7 @@ public class PathNode extends LeafNode<Path> { super(true); this.value = Path.of(fileReference.value()); if (value.normalize().toString().startsWith("..")) - throw new IllegalArgumentException("path may not start with '..', but got :" + value); + throw new IllegalArgumentException("path may not start with '..', but got: " + value); this.fileReference = fileReference; } diff --git a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java index 1ad9f722eca..42e4978091d 100644 --- a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java @@ -23,9 +23,8 @@ public class FileNodeTest { assertEquals("foo.txt", n.value().value()); assertEquals("\"foo.txt\"", n.toString()); - assertThrows("path may not start with '..', but got: foo/../../boo", - IllegalArgumentException.class, - () -> new FileNode("foo/../../boo")); + assertEquals("path may not start with '..', but got: foo/../../boo", + assertThrows(IllegalArgumentException.class, () -> new FileNode("foo/../../boo")).getMessage()); } } diff --git a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java index 2240f647726..016c53b42e3 100644 --- a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java +++ b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java @@ -22,9 +22,8 @@ public class PathNodeTest { n = new PathNode(new FileReference("foo.txt")); assertEquals(new File("foo.txt").toPath(), n.value()); - assertThrows("path may not start with '..', but got: foo/../../boo", - IllegalArgumentException.class, - () -> new PathNode(new FileReference("foo/../../boo"))); + assertEquals("path may not start with '..', but got: foo/../../boo", + assertThrows(IllegalArgumentException.class, () -> new PathNode(new FileReference("foo/../../boo"))).getMessage()); } } |