Cleanup unused stuff to reduce entanglement

2 files changed, 1 insertions, 28 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index c128b9af6e0..9126c678171 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1327,7 +1327,7 @@ public class ModelProvisioningTest {
         assertEquals(4, cluster.getRedundancy().effectiveInitialRedundancy());
         assertEquals(4, cluster.getRedundancy().effectiveFinalRedundancy());
         assertEquals(4, cluster.getRedundancy().effectiveReadyCopies());
-        assertEquals(4, cluster.getSearch().getIndexed().getSearchableCopies());
+        assertEquals(4, cluster.getRedundancy().readyCopies());
         assertFalse(cluster.getRootGroup().getPartitions().isPresent());
         assertEquals(4, cluster.getRootGroup().getNodes().size());
         assertEquals(0, cluster.getRootGroup().getSubgroups().size());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
index 7fba5ba12e9..8a47eb030f3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
@@ -3,13 +3,10 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.vespa.config.content.StorDistributionConfig;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
-import com.yahoo.vespa.model.search.DispatchGroup;
-import com.yahoo.vespa.model.search.SearchInterface;
 import com.yahoo.vespa.model.search.SearchNode;
 import com.yahoo.yolean.Exceptions;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -193,30 +190,6 @@ public class IndexedHierarchicDistributionTest {
     }
 
     @Test
-    void requireThatLeafGroupsCanHaveUnequalNumberOfNodesIfRandomPolicy() throws Exception {
-        ContentCluster c = getOddGroupsCluster();
-        DispatchGroup dg = c.getSearch().getIndexed().getRootDispatch();
-        assertEquals(8, dg.getRowBits());
-        assertEquals(3, dg.getNumPartitions());
-        assertTrue(dg.useFixedRowInDispatch());
-        ArrayList<SearchInterface> list = new ArrayList<>();
-        for (SearchInterface si : dg.getSearchersIterable()) {
-            list.add(si);
-        }
-        assertEquals(5, list.size());
-        assertEquals(0, list.get(0).getNodeSpec().partitionId());
-        assertEquals(0, list.get(0).getNodeSpec().groupIndex());
-        assertEquals(0, list.get(1).getNodeSpec().partitionId());
-        assertEquals(1, list.get(1).getNodeSpec().groupIndex());
-        assertEquals(1, list.get(2).getNodeSpec().partitionId());
-        assertEquals(0, list.get(2).getNodeSpec().groupIndex());
-        assertEquals(1, list.get(3).getNodeSpec().partitionId());
-        assertEquals(1, list.get(3).getNodeSpec().groupIndex());
-        assertEquals(2, list.get(4).getNodeSpec().partitionId());
-        assertEquals(1, list.get(4).getNodeSpec().groupIndex());
-    }
-
-    @Test
     void requireThatLeafGroupsCountMustBeAFactorOfRedundancy() {
         try {
             getTwoGroupsCluster(3, 3, "2|*");