summaryrefslogtreecommitdiffstats
path: root/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
diff options
context:
space:
mode:
Diffstat (limited to 'vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java')
-rw-r--r--vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java16
1 files changed, 8 insertions, 8 deletions
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 4c8fbb1beee..f4d58a671f1 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -228,17 +228,17 @@ public class VdsVisitTestCase {
@Test
public void testAutoSelectClusterRoute() throws Exception {
List<ClusterDef> clusterDefs = new ArrayList<>();
- clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
+ clusterDefs.add(new ClusterDef("storage"));
ClusterList clusterList = new ClusterList(clusterDefs);
String route = VdsVisit.resolveClusterRoute(clusterList, null);
- assertEquals("[Storage:cluster=storage;clusterconfigid=content/cluster.foo/storage]", route);
+ assertEquals("[Content:cluster=storage]", route);
}
@Test
public void testBadClusterName() throws Exception {
List<ClusterDef> clusterDefs = new ArrayList<>();
- clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
+ clusterDefs.add(new ClusterDef("storage"));
ClusterList clusterList = new ClusterList(clusterDefs);
try {
VdsVisit.resolveClusterRoute(clusterList, "borkbork");
@@ -252,8 +252,8 @@ public class VdsVisitTestCase {
@Test
public void testRequireClusterOptionIfMultipleClusters() {
List<ClusterDef> clusterDefs = new ArrayList<>();
- clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
- clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage"));
+ clusterDefs.add(new ClusterDef("storage"));
+ clusterDefs.add(new ClusterDef("storage2"));
ClusterList clusterList = new ClusterList(clusterDefs);
try {
VdsVisit.resolveClusterRoute(clusterList, null);
@@ -265,12 +265,12 @@ public class VdsVisitTestCase {
@Test
public void testExplicitClusterOptionWithMultipleClusters() {
List<ClusterDef> clusterDefs = new ArrayList<>();
- clusterDefs.add(new ClusterDef("storage", "content/cluster.foo/storage"));
- clusterDefs.add(new ClusterDef("storage2", "content/cluster.bar/storage"));
+ clusterDefs.add(new ClusterDef("storage"));
+ clusterDefs.add(new ClusterDef("storage2"));
ClusterList clusterList = new ClusterList(clusterDefs);
String route = VdsVisit.resolveClusterRoute(clusterList, "storage2");
- assertEquals("[Storage:cluster=storage2;clusterconfigid=content/cluster.bar/storage]", route);
+ assertEquals("[Content:cluster=storage2]", route);
}
@Test