Use HttpURL.Path for Path.getRest()

2 files changed, 9 insertions, 4 deletions

diff --git a/container-core/src/test/java/com/yahoo/restapi/HttpURLTest.java b/container-core/src/test/java/com/yahoo/restapi/HttpURLTest.java
index 05a218b0f04..858513c2a69 100644
--- a/container-core/src/test/java/com/yahoo/restapi/HttpURLTest.java
+++ b/container-core/src/test/java/com/yahoo/restapi/HttpURLTest.java
@@ -124,6 +124,11 @@ class HttpURLTest {
         assertEquals(List.of(expected.get(2), expected.get(0)),
                      path.append(path).cut(2).skip(2).segments());
 
+        for (int i = 0; i < 3; i++) {
+            assertEquals(path.head(i), path.cut(3 - i));
+            assertEquals(path.tail(i), path.skip(3 - i));
+        }
+
         assertThrows(NullPointerException.class,
                      () -> path.append((String) null));
 
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 065b02be0e4..4786eb9775c 100644
--- a/container-core/src/test/java/com/yahoo/restapi/PathTest.java
+++ b/container-core/src/test/java/com/yahoo/restapi/PathTest.java
@@ -35,7 +35,7 @@ public class PathTest {
             assertTrue(path.matches("/a/{foo}/bar/{b}/{*}"));
             assertEquals("1", path.get("foo"));
             assertEquals("fuz", path.get("b"));
-            assertEquals("", path.getRest());
+            assertEquals("/", path.getRest().raw());
         }
 
         {
@@ -43,7 +43,7 @@ public class PathTest {
             assertTrue(path.matches("/a/{foo}/bar/{b}/{*}"));
             assertEquals("1", path.get("foo"));
             assertEquals("fuz", path.get("b"));
-            assertEquals("kanoo", path.getRest());
+            assertEquals("/kanoo", path.getRest().raw());
         }
 
         {
@@ -51,7 +51,7 @@ public class PathTest {
             assertTrue(path.matches("/a/{foo}/bar/{b}/{*}"));
             assertEquals("1", path.get("foo"));
             assertEquals("fuz", path.get("b"));
-            assertEquals("kanoo/trips", path.getRest());
+            assertEquals("/kanoo/trips", path.getRest().raw());
         }
 
         {
@@ -59,7 +59,7 @@ public class PathTest {
             assertTrue(path.matches("/a/{foo}/bar/{b}/{*}"));
             assertEquals("1", path.get("foo"));
             assertEquals("fuz", path.get("b"));
-            assertEquals("kanoo/trips/", path.getRest());
+            assertEquals("/kanoo/trips/", path.getRest().raw());
         }
     }