summaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@gmail.com>2022-04-07 17:23:10 +0200
committerJon Marius Venstad <jonmv@gmail.com>2022-04-07 17:23:10 +0200
commitd057b221de39e0b94910f14ef4cefb802b5665e8 (patch)
treee91495d0fcf1b6aa4969546b1dee0c59a7cea78d /vespajlib
parent33a511fe7a4edbd4aae635977e719786a024651c (diff)
Fix another unit test
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/ai/vespa/http/HttpURL.java2
-rw-r--r--vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java12
2 files changed, 7 insertions, 7 deletions
diff --git a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
index cc4291442ff..916bbab9fe0 100644
--- a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
+++ b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
@@ -503,7 +503,7 @@ public class HttpURL {
/** Intentionally not usable for constructing new URIs. Use {@link HttpURL} for that instead. */
@Override
public String toString() {
- return "query '" + raw() + "'";
+ return head == null ? "no query" : "query '" + raw().substring(1) + "'";
}
@Override
diff --git a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
index 3dbb022148b..7f3fce27074 100644
--- a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
+++ b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
@@ -178,23 +178,23 @@ class HttpURLTest {
assertEquals(expected, query.remove("foo").lastEntries());
assertEquals(expected, Query.empty(Name::of).set("baz").lastEntries());
- assertEquals("query '?foo=bar&baz=bax&quu=fez&moo'",
+ assertEquals("query 'foo=bar&baz=bax&quu=fez&moo'",
query.set("baz", "bax").set(Map.of("quu", "fez")).set("moo").toString());
Query bloated = query.add("baz", "bax").add(Map.of("quu", List.of("fez", "pop"))).add("moo").add("moo").add("foo", "bar");
- assertEquals("query '?foo=bar&baz&baz=bax&quu=fez&quu=pop&moo&moo&foo=bar'",
+ assertEquals("query 'foo=bar&baz&baz=bax&quu=fez&quu=pop&moo&moo&foo=bar'",
bloated.toString());
- assertEquals("query '?foo=bar&quu=fez&quu=pop&moo&moo&foo=bar'",
+ assertEquals("query 'foo=bar&quu=fez&quu=pop&moo&moo&foo=bar'",
bloated.remove("baz").toString());
- assertEquals("query '?baz&baz=bax&quu=fez&quu=pop&moo&moo'",
+ assertEquals("query 'baz&baz=bax&quu=fez&quu=pop&moo&moo'",
bloated.remove("foo").toString());
- assertEquals("query '?foo=bar&baz&baz=bax&quu=fez&quu=pop&foo=bar&moo'",
+ assertEquals("query 'foo=bar&baz&baz=bax&quu=fez&quu=pop&foo=bar&moo'",
bloated.set("moo").toString());
- assertEquals("query ''",
+ assertEquals("no query",
bloated.remove("foo").remove("baz").remove("quu").remove("moo").toString());
assertThrows(NullPointerException.class,