Log and forward duper model completion

2 files changed, 3 insertions, 7 deletions

diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
index 67508f14e5a..3448ce46ff9 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
@@ -71,7 +71,6 @@ public class DuperModelManagerTest {
         verify(duperModel, times(0)).add(any());
         manager.infraApplicationActivated(id, proxyHostHosts);
         verify(duperModel, times(1)).add(any());
-        when(duperModel.contains(id)).thenReturn(true);
 
         verify(duperModel, times(0)).remove(any());
         manager.infraApplicationRemoved(id);
@@ -98,7 +97,6 @@ public class DuperModelManagerTest {
         List<HostName> hostnames1 = Stream.of("node11", "node12").map(HostName::from).collect(Collectors.toList());
         manager.infraApplicationActivated(firstId, hostnames1);
         verify(duperModel, times(1)).add(any());
-        when(duperModel.contains(firstId)).thenReturn(true);
 
         // Adding the second config server like application will be ignored
         List<HostName> hostnames2 = Stream.of("node21", "node22").map(HostName::from).collect(Collectors.toList());
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
index 0cc108bae9e..69b6d3d59f3 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
@@ -16,8 +16,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -60,11 +58,11 @@ public class DuperModelTest {
     }
 
     @Test
-    public void test() {
+    public void testListeners() {
         assertEquals(0, duperModel.numberOfApplications());
 
         duperModel.add(application1);
-        assertTrue(duperModel.contains(id1));
+        assertEquals(Optional.of(application1), duperModel.getApplicationInfo(id1));
         assertEquals(Arrays.asList(application1), duperModel.getApplicationInfos());
         assertEquals(1, duperModel.numberOfApplications());
 
@@ -82,7 +80,7 @@ public class DuperModelTest {
         verifyNoMoreInteractions(listener1);
 
         duperModel.remove(id1);
-        assertFalse(duperModel.contains(id1));
+        assertEquals(Optional.empty(), duperModel.getApplicationInfo(id1));
         verify(listener1, times(1)).applicationRemoved(id1);
         verifyNoMoreInteractions(listener1);
         assertEquals(Arrays.asList(application2), duperModel.getApplicationInfos());