summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2019-06-25 14:55:31 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2019-06-25 14:55:31 +0200
commit22779d33769d9e1021da0789cd1c31c7e13ab149 (patch)
treee35cc776f9b13524255a44607f2f9574a81eb218 /controller-server
parent5de7ab90d4e12ee3406377dc0ae2993492a15db2 (diff)
Improve serialization test coverage for AssignedRotation
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java19
1 files changed, 18 insertions, 1 deletions
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 de08f1e3576..67b6b1ac61c 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
@@ -262,6 +262,12 @@ public class ApplicationSerializerTest {
rotations.addString("multiple-rotation-1");
rotations.addString("multiple-rotation-2");
+ final var assignedRotations = cursor.setArray("assignedRotations");
+ final var assignedRotation = assignedRotations.addObject();
+ assignedRotation.setString("clusterId", "foobar");
+ assignedRotation.setString("endpointId", "nice-endpoint");
+ assignedRotation.setString("rotationId", "assigned-rotation");
+
// Parse and test the output from parsing contains both legacy rotation and multiple rotations
final var application = applicationSerializer.fromSlime(slime);
@@ -269,7 +275,8 @@ public class ApplicationSerializerTest {
List.of(
new RotationId("single-rotation"),
new RotationId("multiple-rotation-1"),
- new RotationId("multiple-rotation-2")
+ new RotationId("multiple-rotation-2"),
+ new RotationId("assigned-rotation")
),
application.rotations()
);
@@ -277,6 +284,16 @@ public class ApplicationSerializerTest {
assertEquals(
Optional.of(new RotationId("single-rotation")), application.legacyRotation()
);
+
+ assertEquals(
+ List.of(
+ new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("single-rotation")),
+ new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("multiple-rotation-1")),
+ new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("multiple-rotation-2")),
+ new AssignedRotation(new ClusterSpec.Id("foobar"), EndpointId.of("nice-endpoint"), new RotationId("assigned-rotation"))
+ ),
+ application.assignedRotations()
+ );
}
@Test