summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-06-05 13:33:19 +0200
committerMartin Polden <mpolden@mpolden.no>2018-06-06 14:50:04 +0200
commit63c83ade591a7b8e43cb9ab593d494e869cf8d88 (patch)
treefab4fa6bfec4fda73e0759857b1a74b727d86728
parent62ae46a58d9501ad60431634f374b3cfa2856a48 (diff)
Remove unnecessary legacy test
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java12
1 files changed, 0 insertions, 12 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 f6bf3bdd8cf..071ec7b5c11 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
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.slime.Slime;
import com.yahoo.vespa.config.SlimeUtils;
import com.yahoo.vespa.hosted.controller.Application;
-import com.yahoo.vespa.hosted.controller.ControllerTester;
import com.yahoo.vespa.hosted.controller.api.integration.MetricsService;
import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
@@ -42,7 +41,6 @@ import static com.yahoo.config.provision.SystemName.main;
import static com.yahoo.vespa.hosted.controller.ControllerTester.writable;
import static java.util.Optional.empty;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
/**
* @author bratseth
@@ -56,7 +54,6 @@ public class ApplicationSerializerTest {
@Test
public void testSerialization() {
- ControllerTester tester = new ControllerTester();
DeploymentSpec deploymentSpec = DeploymentSpec.fromXml("<deployment version='1.0'>" +
" <staging/>" +
"</deployment>");
@@ -210,15 +207,6 @@ public class ApplicationSerializerTest {
}
@Test
- public void testLegacySerialization() {
- Application applicationWithSuccessfulJob = applicationSerializer.fromSlime(applicationSlime(false));
- assertFalse("No job error for successful job", applicationWithSuccessfulJob.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.systemTest).jobError().isPresent());
-
- Application applicationWithFailingJob = applicationSerializer.fromSlime(applicationSlime(true));
- assertEquals(JobError.unknown, applicationWithFailingJob.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.systemTest).jobError().get());
- }
-
- @Test
public void testCompleteApplicationDeserialization() throws Exception {
byte[] applicationJson = Files.readAllBytes(testData.resolve("complete-application.json"));
applicationSerializer.fromSlime(SlimeUtils.jsonToSlime(applicationJson));