1 files changed, 4 insertions, 23 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
index 1d05a0d6d51..d81ffedef7f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
@@ -21,9 +21,11 @@ import static org.junit.Assert.*;
 /**
  * Test of search chains config
  * <p>TODO: examine the actual values in the configs.</p>
+ *
  * @author Tony Vaagenes
  */
 public class SearchChainsTest extends SearchChainsTestBase {
+
     private ChainsConfig chainsConfig;
     private ProviderConfig providerConfig;
     private ClusterConfig clusterConfig;
@@ -34,10 +36,6 @@ public class SearchChainsTest extends SearchChainsTestBase {
         chainsBuilder = (ChainsConfig.Builder)root.getConfig(chainsBuilder, "searchchains");
         chainsConfig = new ChainsConfig(chainsBuilder);
 
-        ProviderConfig.Builder providerBuilder = new ProviderConfig.Builder();
-        providerBuilder = (ProviderConfig.Builder)root.getConfig(providerBuilder, "searchchains/chain/provider:1/component/com.yahoo.search.federation.vespa.VespaSearcher");
-        providerConfig = new ProviderConfig(providerBuilder);
-
         ClusterConfig.Builder clusterBuilder = new ClusterConfig.Builder();
         clusterBuilder = (ClusterConfig.Builder)root.getConfig(clusterBuilder, "searchchains/chain/cluster2/component/" + ClusterSearcher.class.getName());
         clusterConfig = new ClusterConfig(clusterBuilder);
@@ -50,7 +48,7 @@ public class SearchChainsTest extends SearchChainsTestBase {
             "<searchchains>",
             "  <searcher id='searcher:1' classId='classId1' />",
 
-            "  <provider id='provider:1' type='vespa' inherits='parentChain1 parentChain2' excludes='ExcludedSearcher1 ExcludedSearcher2'",
+            "  <provider id='provider:1' inherits='parentChain1 parentChain2' excludes='ExcludedSearcher1 ExcludedSearcher2'",
             "             cacheweight='2.3'>",
             "    <federationoptions optional='true' timeout='2.3 s' />",
             "    <nodes>",
@@ -67,7 +65,7 @@ public class SearchChainsTest extends SearchChainsTestBase {
             "  <provider id='provider:2' type='local' cluster='cluster1' />",
             "  <provider id='provider:3' />",
 
-            "  <provider id='vespa-provider' type='vespa' >",
+            "  <provider id='vespa-provider'>",
             "    <nodes>",
             "      <node host='localhost' port='" + Defaults.getDefaults().vespaWebServicePort() + "' />",
             "   </nodes>",
@@ -96,32 +94,15 @@ public class SearchChainsTest extends SearchChainsTestBase {
     }
 
     @Test
-    public void require_user_config_for_vespa_searcher_works() {
-        assertEquals(root.getConfig(ProviderConfig.class, "searchchains/chain/vespa-provider/component/com.yahoo.search.federation.vespa.VespaSearcher").
-            queryType(), ProviderConfig.QueryType.PROGRAMMATIC); 
-    }
-
-    @Test
     public void require_that_source_chain_spec_id_is_namespaced_in_provider_id() {
         Source source = (Source) getSearchChains().allChains().getComponent("source:1@provider:1");
         assertThat(source.getChainSpecification().componentId.getNamespace(), is(ComponentId.fromString("provider:1")));
     }
 
     @Test
-    public void validateHttpProviderConfig() {
-        assertNotNull(providerConfig);
-    }
-
-    @Test
     public void validateLocalProviderConfig() {
         assertEquals(2, clusterConfig.clusterId());
         assertEquals("cluster2", clusterConfig.clusterName());
     }
 
-    public static boolean verifyChainExists(List<ChainsConfig.Chains> chains, String componentId) {
-        for (ChainsConfig.Chains c : chains) {
-            if (c.id().equals(componentId)) return true;
-        }
-        return false;
-    }
 }