diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-04-19 08:50:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-19 08:50:28 +0200 |
commit | a51f9882240db77bd1584c79988252abc30c80af (patch) | |
tree | 5952515f65f4ba088793e7e8b83d579dca9250c4 /controller-api/src/test | |
parent | d8384ad07427e07c868915d3632620b7fca473d9 (diff) |
Revert "Remove compatibility serialisation for revisions, and add (de-) for job types"
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 | 33 |
1 files changed, 0 insertions, 33 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 990e8911e91..51c20056ad4 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 @@ -1,14 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.deployment; -import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.SystemName; -import com.yahoo.config.provision.zone.ZoneId; -import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** @@ -29,33 +23,6 @@ public class JobTypeTest { assertTrue(type + " should have matching job", match); } } - - assertEquals(JobType.testUsEast3, JobType.fromJobName("prod.us-east-3.test")); - assertEquals(JobType.devAwsUsEast1c, JobType.fromJobName("dev.aws-us-east-1c")); - - assertFalse(JobType.dev("snøhetta").isTest()); - assertTrue(JobType.dev("snøhetta").isDeployment()); - assertFalse(JobType.dev("snøhetta").isProduction()); - - assertFalse(JobType.perf("snøhetta").isTest()); - assertTrue(JobType.perf("snøhetta").isDeployment()); - assertFalse(JobType.perf("snøhetta").isProduction()); - - assertTrue(JobType.deploymentTo(ZoneId.from("test", "snøhetta")).isTest()); - assertTrue(JobType.deploymentTo(ZoneId.from("test", "snøhetta")).isDeployment()); - assertFalse(JobType.deploymentTo(ZoneId.from("test", "snøhetta")).isProduction()); - - assertTrue(JobType.deploymentTo(ZoneId.from("staging", "snøhetta")).isTest()); - assertTrue(JobType.deploymentTo(ZoneId.from("staging", "snøhetta")).isDeployment()); - assertFalse(JobType.deploymentTo(ZoneId.from("staging", "snøhetta")).isProduction()); - - assertFalse(JobType.prod("snøhetta").isTest()); - assertTrue(JobType.prod("snøhetta").isDeployment()); - assertTrue(JobType.prod("snøhetta").isProduction()); - - assertTrue(JobType.test("snøhetta").isTest()); - assertFalse(JobType.test("snøhetta").isDeployment()); - assertTrue(JobType.test("snøhetta").isProduction()); } } |