Add convenience method to create AssignedRotations

2 files changed, 13 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/AssignedRotation.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/AssignedRotation.java
index 4906d60fe21..ec13066d069 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/AssignedRotation.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/AssignedRotation.java
@@ -4,8 +4,10 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.vespa.hosted.controller.rotation.RotationId;
 
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Contains the tuple of [clusterId, endpointId, rotationId, regions[]], to keep track
@@ -65,4 +67,14 @@ public class AssignedRotation {
         }
         return object;
     }
+
+    /** Convenience method intended for tests */
+    public static AssignedRotation fromStrings(String clusterId, String endpointId, String rotationId, Collection<String> regions) {
+        return new AssignedRotation(
+                new ClusterSpec.Id(clusterId),
+                new EndpointId(endpointId),
+                new RotationId(rotationId),
+                regions.stream().map(RegionName::from).collect(Collectors.toSet())
+        );
+    }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index 7390e0b2068..7b39b0d53a4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -121,7 +121,7 @@ public class ApplicationSerializerTest {
                                                OptionalInt.of(7),
                                                new MetricsService.ApplicationMetrics(0.5, 0.9),
                                                Optional.of("-----BEGIN PUBLIC KEY-----\n∠( ᐛ 」∠)＿\n-----END PUBLIC KEY-----"),
-                                               List.of(new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.default_(), new RotationId("my-rotation"), Set.of())),
+                                               List.of(AssignedRotation.fromStrings("foo", "default", "my-rotation", Set.of())),
                                                rotationStatus,
                                                Optional.of(new ApplicationCertificate("vespa.certificate")));