Component id must be globally unique. Not enough to be unique in the branch.

1 files changed, 4 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
index e5bc0644e10..70e307e1748 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
@@ -177,13 +177,13 @@ public class SearchClusterTest {
         model.getConfig(dispatchConfigBuilder, dispatcher.getConfigId());
         assertEquals(host, dispatchConfigBuilder.build().node(0).host());
 
-        assertTrue(dispatcher.getInjectedComponentIds().contains("com.yahoo.search.dispatch.rpc.RpcResourcePool"));
+        assertTrue(dispatcher.getInjectedComponentIds().contains("rpcresourcepool." + cluster));
 
-        Component<?,?> rpcResourcePool = (Component<?, ?>)dispatcher.getChildren().get("com.yahoo.search.dispatch.rpc.RpcResourcePool");
+        Component<?,?> rpcResourcePool = (Component<?, ?>)dispatcher.getChildren().get("rpcresourcepool." + cluster);
         assertNotNull(rpcResourcePool);
-        assertEquals("com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getComponentId().stringValue());
+        assertEquals("rpcresourcepool." + cluster, rpcResourcePool.getComponentId().stringValue());
         assertEquals("com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getClassId().stringValue());
-        assertEquals("j1/component/dispatcher." + cluster + "/com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getConfigId());
+        assertEquals("j1/component/dispatcher." + cluster + "/rpcresourcepool." + cluster, rpcResourcePool.getConfigId());
         dispatchConfigBuilder = new DispatchConfig.Builder();
         model.getConfig(dispatchConfigBuilder, rpcResourcePool.getConfigId());
         assertEquals(host, dispatchConfigBuilder.build().node(0).host());