Partial cleanup of metric-defaults config.

1 files changed, 0 insertions, 21 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 27c05e08886..9ea984737c7 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -40,21 +40,6 @@ import static org.junit.Assert.assertTrue;
 public class ContainerClusterTest {
 
     @Test
-    public void requireThatDefaultMetricConsumerFactoryCanBeConfigured() {
-        ContainerCluster cluster = newContainerCluster();
-        cluster.setDefaultMetricConsumerFactory(MetricDefaultsConfig.Factory.Enum.YAMAS_SCOREBOARD);
-        assertEquals(MetricDefaultsConfig.Factory.Enum.YAMAS_SCOREBOARD,
-                getMetricDefaultsConfig(cluster).factory());
-    }
-
-    @Test
-    public void requireThatDefaultMetricConsumerFactoryMatchesConfigDefault() {
-        ContainerCluster cluster = newContainerCluster();
-        assertEquals(new MetricDefaultsConfig(new MetricDefaultsConfig.Builder()).factory(),
-                getMetricDefaultsConfig(cluster).factory());
-    }
-
-    @Test
     public void requireThatClusterInfoIsPopulated() {
         ContainerCluster cluster = newContainerCluster();
         ClusterInfoConfig config = getClusterInfoConfig(cluster);
@@ -301,12 +286,6 @@ public class ContainerClusterTest {
         return cluster;
     }
 
-    private static MetricDefaultsConfig getMetricDefaultsConfig(ContainerCluster cluster) {
-        MetricDefaultsConfig.Builder builder = new MetricDefaultsConfig.Builder();
-        cluster.getConfig(builder);
-        return new MetricDefaultsConfig(builder);
-    }
-
     private static ClusterInfoConfig getClusterInfoConfig(ContainerCluster cluster) {
         ClusterInfoConfig.Builder builder = new ClusterInfoConfig.Builder();
         cluster.getConfig(builder);