Moved to more specific methods on ServiceMonitor

3 files changed, 14 insertions, 15 deletions

diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
index ce13cf60082..7be4ff38a7f 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ModelGeneratorTest.java
@@ -38,9 +38,9 @@ public class ModelGeneratorTest {
 
     @Test
     public void toApplicationModel() throws Exception {
-        ModelGenerator modelGenerator = new ModelGenerator();
-
         Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION));
+        ModelGenerator modelGenerator = new ModelGenerator(zone);
+
 
         SlobrokMonitorManagerImpl slobrokMonitorManager = mock(SlobrokMonitorManagerImpl.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any(), any()))
@@ -49,7 +49,6 @@ public class ModelGeneratorTest {
         ServiceModel serviceModel =
                 modelGenerator.toServiceModel(
                         getExampleApplicationInfos(),
-                        zone,
                         slobrokMonitorManager);
 
         Map<ApplicationInstanceReference,
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelCacheTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelCacheTest.java
index c2314be1e0f..21c6a49cc18 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelCacheTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelCacheTest.java
@@ -16,27 +16,27 @@ import static org.mockito.Mockito.when;
 
 public class ServiceModelCacheTest {
     @SuppressWarnings("unchecked")
-    private final Supplier<ServiceModel> rawSupplier = mock(Supplier.class);
+    private final Supplier<ServiceModel> expensiveServiceMonitor = mock(Supplier.class);
     private final Timer timer = mock(Timer.class);
-    private final ServiceModelCache cache = new ServiceModelCache(rawSupplier, timer, true);
+    private final ServiceModelCache cache = new ServiceModelCache(expensiveServiceMonitor, timer);
 
     @Test
     public void sanityCheck() {
         ServiceModel serviceModel = mock(ServiceModel.class);
-        when(rawSupplier.get()).thenReturn(serviceModel);
+        when(expensiveServiceMonitor.get()).thenReturn(serviceModel);
 
         long timeMillis = 0;
         when(timer.currentTimeMillis()).thenReturn(timeMillis);
 
         // Will always populate cache the first time
-        ServiceModel actualServiceModel = cache.get();
+        ServiceModel actualServiceModel = cache.getServiceModelSnapshot();
         assertTrue(actualServiceModel == serviceModel);
-        verify(rawSupplier, times(1)).get();
+        verify(expensiveServiceMonitor, times(1)).get();
 
         // Cache hit
         timeMillis += ServiceModelCache.EXPIRY_MILLIS / 2;
         when(timer.currentTimeMillis()).thenReturn(timeMillis);
-        actualServiceModel = cache.get();
+        actualServiceModel = cache.getServiceModelSnapshot();
         assertTrue(actualServiceModel == serviceModel);
 
         // Cache expired
@@ -44,17 +44,17 @@ public class ServiceModelCacheTest {
         when(timer.currentTimeMillis()).thenReturn(timeMillis);
 
         ServiceModel serviceModel2 = mock(ServiceModel.class);
-        when(rawSupplier.get()).thenReturn(serviceModel2);
+        when(expensiveServiceMonitor.get()).thenReturn(serviceModel2);
 
-        actualServiceModel = cache.get();
+        actualServiceModel = cache.getServiceModelSnapshot();
         assertTrue(actualServiceModel == serviceModel2);
         // '2' because it's cumulative with '1' from the first times(1).
-        verify(rawSupplier, times(2)).get();
+        verify(expensiveServiceMonitor, times(2)).get();
 
         // Cache hit #2
         timeMillis += 1;
         when(timer.currentTimeMillis()).thenReturn(timeMillis);
-        actualServiceModel = cache.get();
+        actualServiceModel = cache.getServiceModelSnapshot();
         assertTrue(actualServiceModel == serviceModel2);
     }
 }
\ No newline at end of file
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelProviderTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelProviderTest.java
index 13f6da1534d..f34d61970ef 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelProviderTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceModelProviderTest.java
@@ -37,8 +37,8 @@ public class ServiceModelProviderTest {
                 .collect(Collectors.toList());
         when(duperModelManager.getApplicationInfos()).thenReturn(applications);
 
-        ServiceModel serviceModel = provider.get();
+        ServiceModel serviceModel = provider.getServiceModelSnapshot();
         verify(duperModelManager, times(1)).getApplicationInfos();
-        verify(modelGenerator).toServiceModel(applications, zone, slobrokMonitorManager);
+        verify(modelGenerator).toServiceModel(applications, slobrokMonitorManager);
     }
 }
\ No newline at end of file