Require application version

1 files changed, 16 insertions, 6 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 4bed276fcac..f6a2177bab8 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,18 +2,20 @@
 package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.component.Version;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.BuildService;
+import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 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.ApplicationPackageBuilder;
 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;
@@ -30,6 +32,11 @@ public class OutstandingChangeDeployerTest {
         tester.configServer().setDefaultVersion(new Version(6, 1));
         OutstandingChangeDeployer deployer = new OutstandingChangeDeployer(tester.controller(), Duration.ofMinutes(10),
                                                                            new JobControl(new MockCuratorDb()));
+        ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .environment(Environment.prod)
+                .region("us-west-1")
+                .build();
+
         tester.createAndDeploy("app1", 11, "default");
         tester.createAndDeploy("app2", 22, "default");
 
@@ -38,14 +45,17 @@ public class OutstandingChangeDeployerTest {
 
         assertEquals(Change.of(version), tester.application("app1").change());
         assertFalse(tester.application("app1").outstandingChange().isPresent());
-        tester.notifyJobCompletion(DeploymentJobs.JobType.component, tester.application("app1"),
-                                   Optional.empty(), Optional.of(new SourceRevision("repo", "master",
-                                                                                    "cafed00d")),
-                                   42);
+
+        tester.jobCompletion(DeploymentJobs.JobType.component)
+              .application(tester.application("app1"))
+              .sourceRevision(new SourceRevision("repository1","master", "cafed00d"))
+              .buildNumber(43)
+              .uploadArtifact(applicationPackage)
+              .submit();
 
         Application app = tester.application("app1");
         assertTrue(app.outstandingChange().isPresent());
-        assertEquals("1.0.42-cafed00d", app.outstandingChange().application().get().id());
+        assertEquals("1.0.43-cafed00d", app.outstandingChange().application().get().id());
         assertEquals(1, tester.buildSystem().jobs().size());
 
         deployer.maintain();