Avoid mock thread factory and simplify construction

1 files changed, 3 insertions, 10 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
index b77836774d7..dd96414bbc7 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
@@ -4,11 +4,9 @@ package com.yahoo.container.jdisc.metric;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.jdisc.MetricConsumerFactory;
-import com.yahoo.container.jdisc.config.HealthMonitorConfig;
-import com.yahoo.metrics.MetricsPresentationConfig;
 import com.yahoo.container.jdisc.state.StateMonitor;
 import com.yahoo.jdisc.application.MetricConsumer;
-import com.yahoo.jdisc.core.SystemTimer;
+import com.yahoo.metrics.MetricsPresentationConfig;
 
 /**
  * @author Simon Thoresen Hult
@@ -26,13 +24,13 @@ class MetricConsumerProviders {
     public static MetricConsumerProvider newInstance(MetricConsumerFactory... factories) {
         return new MetricConsumerProvider(newComponentRegistry(factories),
                                           new MetricsPresentationConfig(new MetricsPresentationConfig.Builder()),
-                                          newStateMonitor());
+                                          StateMonitor.createForTesting());
     }
 
     public static MetricConsumerProvider newDefaultInstance() {
         return new MetricConsumerProvider(newComponentRegistry(),
                                           new MetricsPresentationConfig(new MetricsPresentationConfig.Builder()),
-                                          newStateMonitor());
+                                          StateMonitor.createForTesting());
     }
 
     public static ComponentRegistry<MetricConsumerFactory> newComponentRegistry(MetricConsumerFactory... factories) {
@@ -43,9 +41,4 @@ class MetricConsumerProviders {
         return registry;
     }
 
-    public static StateMonitor newStateMonitor() {
-        return new StateMonitor(new HealthMonitorConfig(new HealthMonitorConfig.Builder()),
-                                new SystemTimer());
-    }
-
 }