Fix more tests

4 files changed, 36 insertions, 32 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
index fe7beb538da..68ebc5e86aa 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
@@ -20,6 +20,6 @@ public class NodeRepoStats {
 
     public Load load() { return load; }
     public Load activeLoad() { return activeLoad; }
-    public List<ApplicationStats> applicationStats() { return  applicationStats; }
+    public List<ApplicationStats> applicationStats() { return applicationStats; }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index 158cc6caede..1a4a42cb521 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -30,6 +30,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -132,7 +133,7 @@ public class DeploymentApiHandler extends ThreadedHttpRequestHandler {
                                                                             entry -> entry.getValue().instanceJobs().get(entry.getKey())));
             Cursor productionArray = versionObject.setArray("productionApplications");
             statistics.productionSuccesses().stream()
-                      .collect(groupingBy(run -> run.id().application()))
+                      .collect(groupingBy(run -> run.id().application(), TreeMap::new, toList()))
                       .forEach((id, runs) -> {
                           Cursor applicationObject = productionArray.addObject();
                           toSlime(applicationObject, id, request);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 640e6860eb6..a464e3d7e9b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -264,36 +264,38 @@ public class ApplicationPackageBuilder {
             xml.append(athenzIdentityAttributes);
         }
         xml.append(">\n");
-        xml.append("  <instance id='").append(instances).append("'>\n");
-        if (upgradePolicy != null || revisionTarget != null || revisionChange != null || upgradeRollout != null) {
-            xml.append("    <upgrade ");
-            if (upgradePolicy != null) xml.append("policy='").append(upgradePolicy).append("' ");
-            if (revisionTarget != null) xml.append("revision-target='").append(revisionTarget).append("' ");
-            if (revisionChange != null) xml.append("revision-change='").append(revisionChange).append("' ");
-            if (upgradeRollout != null) xml.append("rollout='").append(upgradeRollout).append("' ");
-            xml.append("/>\n");
-        }
-        xml.append(notifications);
-        if (explicitSystemTest)
-            xml.append("    <test />\n");
-        if (explicitStagingTest)
-            xml.append("    <staging />\n");
-        xml.append(blockChange);
-        xml.append("    <prod");
-        if (globalServiceId != null) {
-            xml.append(" global-service-id='");
-            xml.append(globalServiceId);
-            xml.append("'");
-        }
-        xml.append(">\n");
-        xml.append(prodBody);
-        xml.append("    </prod>\n");
-        if (endpointsBody.length() > 0 ) {
-            xml.append("    <endpoints>\n");
-            xml.append(endpointsBody);
-            xml.append("    </endpoints>\n");
+        for (String instance : instances.split(",")) {
+            xml.append("  <instance id='").append(instance).append("'>\n");
+            if (upgradePolicy != null || revisionTarget != null || revisionChange != null || upgradeRollout != null) {
+                xml.append("    <upgrade ");
+                if (upgradePolicy != null) xml.append("policy='").append(upgradePolicy).append("' ");
+                if (revisionTarget != null) xml.append("revision-target='").append(revisionTarget).append("' ");
+                if (revisionChange != null) xml.append("revision-change='").append(revisionChange).append("' ");
+                if (upgradeRollout != null) xml.append("rollout='").append(upgradeRollout).append("' ");
+                xml.append("/>\n");
+            }
+            xml.append(notifications);
+            if (explicitSystemTest)
+                xml.append("    <test />\n");
+            if (explicitStagingTest)
+                xml.append("    <staging />\n");
+            xml.append(blockChange);
+            xml.append("    <prod");
+            if (globalServiceId != null) {
+                xml.append(" global-service-id='");
+                xml.append(globalServiceId);
+                xml.append("'");
+            }
+            xml.append(">\n");
+            xml.append(prodBody);
+            xml.append("    </prod>\n");
+            if (endpointsBody.length() > 0) {
+                xml.append("    <endpoints>\n");
+                xml.append(endpointsBody);
+                xml.append("    </endpoints>\n");
+            }
+            xml.append("  </instance>\n");
         }
-        xml.append("  </instance>\n");
         if (applicationEndpointsBody.length() > 0) {
             xml.append("  <endpoints>\n");
             xml.append(applicationEndpointsBody);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index a2a1b4ba0a1..7b67db39350 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
@@ -224,7 +225,7 @@ public class NodeRepositoryMock implements NodeRepository {
     }
 
     public void putApplication(ZoneId zone, Application application) {
-        applications.computeIfAbsent(zone, (k) -> new HashMap<>())
+        applications.computeIfAbsent(zone, (k) -> new TreeMap<>())
                     .put(application.id(), application);
     }