Let outstanding change know the application version

1 files changed, 13 insertions, 4 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
index 3d34e78c759..4bed276fcac 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java
@@ -2,15 +2,18 @@
 package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.component.Version;
+import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.BuildService;
 import com.yahoo.vespa.hosted.controller.application.Change;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
+import com.yahoo.vespa.hosted.controller.application.SourceRevision;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import com.yahoo.vespa.hosted.controller.persistence.MockCuratorDb;
 import org.junit.Test;
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,9 +37,15 @@ public class OutstandingChangeDeployerTest {
         tester.deploymentTrigger().triggerChange(tester.application("app1").id(), Change.of(version));
 
         assertEquals(Change.of(version), tester.application("app1").change());
-        assertFalse(tester.application("app1").hasOutstandingChange());
-        tester.notifyJobCompletion(DeploymentJobs.JobType.component, tester.application("app1"), true);
-        assertTrue(tester.application("app1").hasOutstandingChange());
+        assertFalse(tester.application("app1").outstandingChange().isPresent());
+        tester.notifyJobCompletion(DeploymentJobs.JobType.component, tester.application("app1"),
+                                   Optional.empty(), Optional.of(new SourceRevision("repo", "master",
+                                                                                    "cafed00d")),
+                                   42);
+
+        Application app = tester.application("app1");
+        assertTrue(app.outstandingChange().isPresent());
+        assertEquals("1.0.42-cafed00d", app.outstandingChange().application().get().id());
         assertEquals(1, tester.buildSystem().jobs().size());
 
         deployer.maintain();
@@ -50,7 +59,7 @@ public class OutstandingChangeDeployerTest {
         assertEquals(1, jobs.size());
         assertEquals(11, jobs.get(0).projectId());
         assertEquals(DeploymentJobs.JobType.systemTest.jobName(), jobs.get(0).jobName());
-        assertFalse(tester.application("app1").hasOutstandingChange());
+        assertFalse(tester.application("app1").outstandingChange().isPresent());
     }
 
 }