aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient-java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-01-05 14:57:03 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-01-05 14:57:03 +0100
commit56f4cf889caf4802ae0ed4d403e3c5b08bb341d0 (patch)
tree6d3630613800d8005ea9666b3783a6bd37bd00d9 /vespaclient-java
parentbe5ea0ad39c15c13fb85a70d9990165499a92896 (diff)
Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated -direct route
Diffstat (limited to 'vespaclient-java')
-rw-r--r--vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java2
-rw-r--r--vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index d6bda4b8bc1..8820658fa02 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -235,7 +235,7 @@ public class DocumentRetrieverTest {
@Test
public void testClusterLookup() throws DocumentRetrieverException {
final String cluster = "storage",
- expectedRoute = "storage-direct";
+ expectedRoute = "[Content:cluster=storage]";
ClientParameters params = createParameters()
.setCluster(cluster)
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index 7828fbb249d..f4d58a671f1 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -232,7 +232,7 @@ public class VdsVisitTestCase {
ClusterList clusterList = new ClusterList(clusterDefs);
String route = VdsVisit.resolveClusterRoute(clusterList, null);
- assertEquals("storage-direct", route);
+ assertEquals("[Content:cluster=storage]", route);
}
@Test
@@ -270,7 +270,7 @@ public class VdsVisitTestCase {
ClusterList clusterList = new ClusterList(clusterDefs);
String route = VdsVisit.resolveClusterRoute(clusterList, "storage2");
- assertEquals("storage2-direct", route);
+ assertEquals("[Content:cluster=storage2]", route);
}
@Test