diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-20 11:23:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-20 11:23:52 +0200 |
commit | 92325cc097e9d3e51f0196fa4440a2d6153e4893 (patch) | |
tree | 4a6592c4d94acd83928f0f307d36654fe5a0aac3 /controller-api/src/test | |
parent | 66b6364237ff60e26f98a821da5b7baa5b9c6eaf (diff) | |
parent | f9133d57754e4659f1fd8dc6efe82c5120f789dc (diff) |
Merge pull request #22125 from vespa-engine/jonmv/serialize-job-type-with-zone
Jonmv/serialize job type with zone
Diffstat (limited to 'controller-api/src/test')
-rw-r--r-- | controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java index 91edfff5b17..64f4d6150dd 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobTypeTest.java @@ -30,8 +30,13 @@ public class JobTypeTest { } } - assertEquals(JobType.testUsEast3, JobType.fromJobName("prod.us-east-3.test")); - assertEquals(JobType.devAwsUsEast1c, JobType.fromJobName("dev.aws-us-east-1c")); + assertEquals(JobType.testUsEast3, JobType.ofSerialized("prod.us-east-3.test")); + assertEquals(JobType.devAwsUsEast1c, JobType.ofSerialized("dev.aws-us-east-1c")); + + assertEquals(JobType.fromJobName("production-my-zone", null), JobType.prod("my-zone")); + assertEquals(JobType.fromJobName("test-my-zone", null), JobType.test("my-zone")); + assertEquals(JobType.fromJobName("dev-my-zone", null), JobType.dev("my-zone")); + assertEquals(JobType.fromJobName("perf-my-zone", null), JobType.perf("my-zone")); assertFalse(JobType.dev("snohetta").isTest()); assertTrue(JobType.dev("snohetta").isDeployment()); |