diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-04-30 10:44:27 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-04-30 10:44:27 +0200 |
commit | 3623adcfcf9160e409eb4c4e2320c41f7bac632e (patch) | |
tree | 20961531cb87741838718362f0b737eabd6da597 | |
parent | d6a0322484c3df1185f025a6e60c3ce4c1fbde71 (diff) |
Simplify mock
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java index 23d21d2b51a..e5e4c9e46fc 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java @@ -4,70 +4,17 @@ package com.yahoo.vespa.hosted.controller.integration; import com.yahoo.component.AbstractComponent; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.vespa.hosted.controller.api.integration.deployment.ArtifactRepository; import com.yahoo.config.provision.zone.ZoneId; -import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import com.yahoo.vespa.hosted.controller.api.integration.deployment.ArtifactRepository; /** * @author mpolden */ public class ArtifactRepositoryMock extends AbstractComponent implements ArtifactRepository { - private final Map<Integer, Artifact> repository = new HashMap<>(); - - public ArtifactRepositoryMock put(ApplicationId applicationId, ApplicationPackage applicationPackage, - String applicationVersion) { - repository.put(artifactHash(applicationId, applicationVersion), - new Artifact(applicationPackage.zippedContent())); - return this; - } - - public int hits(ApplicationId applicationId, String applicationVersion) { - Artifact artifact = repository.get(artifactHash(applicationId, applicationVersion)); - return artifact == null ? 0 : artifact.hits; - } - - public boolean contains(ApplicationId applicationId, String applicationVersion) { - return repository.containsKey(artifactHash(applicationId, applicationVersion)); - } - - @Override - public byte[] getApplicationPackage(ApplicationId applicationId, String applicationVersion) { - Artifact artifact = repository.get(artifactHash(applicationId, applicationVersion)); - if (artifact == null) { - throw new IllegalArgumentException("No application package found for " + applicationId + " with version " - + applicationVersion); - } - artifact.recordHit(); - return artifact.data; - } - @Override public byte[] getSystemApplicationPackage(ApplicationId application, ZoneId zone, Version version) { return new byte[0]; } - private static int artifactHash(ApplicationId applicationId, String applicationVersion) { - return Objects.hash(applicationId, applicationVersion); - } - - private static class Artifact { - - private final byte[] data; - private int hits = 0; - - private Artifact(byte[] data) { - this.data = data; - } - - private void recordHit() { - hits++; - } - - } - } |