summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-09 14:51:56 +0200
committerjonmv <venstad@gmail.com>2022-04-09 14:51:56 +0200
commitcb1eb57fa9707b1186f0aa10a0853780d7674742 (patch)
tree1c1ca993fdf96007ce4e2c98b2058809601d6fe5 /container-core
parent87e5b33c003d07ca585d73e0166857fe22b4c16f (diff)
Revert "Merge pull request #22072 from vespa-engine/jonmv/unify-hostname-classes"
This reverts commit 87e5b33c003d07ca585d73e0166857fe22b4c16f, reversing changes made to 80b96d32550ae0df59572a58cd62f507e8068c2c.
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/test/java/com/yahoo/restapi/PathTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/container-core/src/test/java/com/yahoo/restapi/PathTest.java b/container-core/src/test/java/com/yahoo/restapi/PathTest.java
index 17b35a6343c..b0392c16e2e 100644
--- a/container-core/src/test/java/com/yahoo/restapi/PathTest.java
+++ b/container-core/src/test/java/com/yahoo/restapi/PathTest.java
@@ -68,9 +68,9 @@ public class PathTest {
public void testUrlEncodedPath() {
assertTrue(new Path(URI.create("/a/%62/c")).matches("/a/b/c"));
assertFalse(new Path(URI.create("/a/b%2fc"), __ -> { }).matches("/a/b/c"));
- assertThrows("path segments cannot be \"\", \".\", or \"..\", but got: '..'",
- IllegalArgumentException.class,
- () -> new Path(URI.create("/foo")).matches("/foo/bar/%2e%2e"));
+ assertEquals("path segments cannot be \"\", \".\", or \"..\", but got: '..'",
+ assertThrows(IllegalArgumentException.class,
+ () -> new Path(URI.create("/foo")).matches("/foo/bar/%2e%2e")).getMessage());
Path path = new Path(URI.create("/%61/%2f/%63"), __ -> { });
assertTrue(path.matches("/a/{slash}/{c}"));