Expect ReconfigurableDispatcher class name in unit test (and text blocks)

1 files changed, 64 insertions, 61 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
index d63b4586082..c8d84f24581 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java
@@ -11,6 +11,7 @@ import com.yahoo.schema.ApplicationBuilder;
 import com.yahoo.schema.document.Attribute;
 import com.yahoo.schema.document.SDDocumentType;
 import com.yahoo.schema.document.SDField;
+import com.yahoo.search.dispatch.ReconfigurableDispatcher;
 import com.yahoo.vespa.config.search.DispatchNodesConfig;
 import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
@@ -62,68 +63,70 @@ public class SchemaClusterTest {
 
     @Test
     void search_model_is_connected_to_container_clusters_two_content_clusters() {
-        String vespaHosts = "<?xml version='1.0' encoding='utf-8' ?>" +
-                "<hosts>" +
-                "  <host name='node0host'>" +
-                "    <alias>node0</alias>" +
-                "  </host>" +
-                "  <host name='node1host'>" +
-                "    <alias>node1</alias>" +
-                "  </host>" +
-                "  <host name='node2host'>" +
-                "    <alias>node2</alias>" +
-                "  </host>" +
-                "</hosts>";
+        String vespaHosts = """
+                            <?xml version='1.0' encoding='utf-8' ?>
+                            <hosts>
+                              <host name='node0host'>
+                                <alias>node0</alias>
+                              </host>
+                              <host name='node1host'>
+                                <alias>node1</alias>
+                              </host>
+                              <host name='node2host'>
+                                <alias>node2</alias>
+                              </host>
+                            </hosts>
+                            """;
 
         String services =
-                "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
-                        "<services version=\"1.0\">" +
-                        "  <admin version='2.0'>" +
-                        "    <adminserver hostalias='node0' />" +
-                        "  </admin>\n" +
-                        "  <container version='1.0' id='j1'>\n" +
-                        "    <search>" +
-                        "      <chain id='s1Chain'>" +
-                        "        <searcher id='S1ClusterSearcher'/>" +
-                        "      </chain>" +
-                        "      <provider cluster='normal' id='normal' type='local'/>\n" +
-                        "    </search>" +
-                        "    <nodes>" +
-                        "      <node hostalias=\"node0\" />" +
-                        "    </nodes>" +
-                        "  </container>" +
-
-                        "  <container version='1.0' id='j2'>" +
-                        "    <search>" +
-                        "      <chain id='s2Chain'>" +
-                        "        <searcher id='S2ClusterSearcher'/>" +
-                        "      </chain>" +
-                        "      <provider cluster='xbulk' id='xbulk' type='local'/>" +
-                        "    </search>" +
-                        "    <nodes>" +
-                        "      <node hostalias=\"node2\" />" +
-                        "    </nodes>" +
-                        "  </container>" +
-
-                        "  <content id='xbulk' version=\"1.0\">" +
-                        "     <redundancy>2</redundancy>" +
-                        "     <documents>" +
-                        "       <document mode='index' type=\"music\" />" +
-                        "     </documents>" +
-                        "     <nodes>" +
-                        "       <node hostalias=\"node0\" distribution-key=\"0\" />" +
-                        "     </nodes>" +
-                        "  </content>" +
-                        "  <content id=\"normal\" version='1.0'>" +
-                        "     <redundancy>2</redundancy>" +
-                        "     <documents>" +
-                        "       <document mode='index' type=\"music\" />" +
-                        "     </documents>" +
-                        "     <nodes>" +
-                        "       <node hostalias=\"node2\" distribution-key=\"0\" />" +
-                        "     </nodes>" +
-                        "  </content>" +
-                        "</services>";
+                """
+                <?xml version="1.0" encoding="utf-8" ?>
+                <services version="1.0">
+                  <admin version='2.0'>
+                    <adminserver hostalias='node0' />
+                  </admin>
+                  <container version='1.0' id='j1'>
+                    <search>
+                      <chain id='s1Chain'>
+                        <searcher id='S1ClusterSearcher'/>
+                      </chain>
+                      <provider cluster='normal' id='normal' type='local'/>
+                    </search>
+                    <nodes>
+                      <node hostalias="node0" />
+                    </nodes>
+                  </container>
+                  <container version='1.0' id='j2'>
+                    <search>
+                      <chain id='s2Chain'>
+                        <searcher id='S2ClusterSearcher'/>
+                      </chain>
+                      <provider cluster='xbulk' id='xbulk' type='local'/>
+                    </search>
+                    <nodes>
+                      <node hostalias="node2" />
+                    </nodes>
+                  </container>
+                  <content id='xbulk' version="1.0">
+                     <redundancy>2</redundancy>
+                     <documents>
+                       <document mode='index' type="music" />
+                     </documents>
+                     <nodes>
+                       <node hostalias="node0" distribution-key="0" />
+                     </nodes>
+                  </content>
+                  <content id="normal" version='1.0'>
+                     <redundancy>2</redundancy>
+                     <documents>
+                       <document mode='index' type="music" />
+                     </documents>
+                     <nodes>
+                       <node hostalias="node2" distribution-key="0" />
+                     </nodes>
+                  </content>
+                </services>
+                """;
 
         VespaModel model = new VespaModelCreatorWithMockPkg(vespaHosts, services, ApplicationPackageUtils.generateSchemas("music")).create();
 
@@ -169,7 +172,7 @@ public class SchemaClusterTest {
         Component<?,?> dispatcher = (Component<?, ?>)containerCluster.getComponentsMap().get(new ComponentId("dispatcher." + cluster));
         assertNotNull(dispatcher);
         assertEquals("dispatcher." + cluster, dispatcher.getComponentId().stringValue());
-        assertEquals("com.yahoo.search.dispatch.Dispatcher", dispatcher.getClassId().stringValue());
+        assertEquals(ReconfigurableDispatcher.class.getName(), dispatcher.getClassId().stringValue());
         assertEquals("j1/component/dispatcher." + cluster, dispatcher.getConfigId());
         DispatchNodesConfig.Builder dispatchConfigBuilder = new DispatchNodesConfig.Builder();
         model.getConfig(dispatchConfigBuilder, dispatcher.getConfigId());