diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2017-12-05 12:37:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 12:37:20 +0100 |
commit | c70fff7c21674730fd50332956f212ee1b801d84 (patch) | |
tree | 37adde60bdd1a9a90dd07ba69ffb06f932057bed /controller-server/src/test/java/com/yahoo | |
parent | 1f0e8ca070cd02bc7f8adbad11e56fa8e7e538af (diff) | |
parent | ffbfeaac2e7d7a5d49f8766f3d3c8a6b3efd59d9 (diff) |
Merge pull request #4349 from vespa-engine/mortent/remove-keyservice
Replace usage of KeyService with SecretStore
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java index 4e2e4bb15b4..2351b26f337 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.restapi.impl; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.yahoo.vespa.hosted.controller.api.integration.security.KeyService; +import com.yahoo.jdisc.http.SecretStore; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -30,15 +30,15 @@ public class StatusPageResourceTest { Client mockClient = Mockito.mock(Client.class); WebTarget mockTarget = Mockito.mock(WebTarget.class); Invocation.Builder mockRequest = Mockito.mock(Invocation.Builder.class); - KeyService keyService = Mockito.mock(KeyService.class); + SecretStore secretStore = Mockito.mock(SecretStore.class); Mockito.when(mockClient.target(Mockito.any(UriBuilder.class))).thenReturn(mockTarget); Mockito.when(mockTarget.request()).thenReturn(mockRequest); Mockito.when(mockRequest.get(JsonNode.class)).thenReturn( new ObjectMapper().readTree("{\"page\":{\"name\":\"Vespa\"}}")); - Mockito.when(keyService.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); + Mockito.when(secretStore.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); - statusPage = new StatusPageResource(keyService, mockClient); + statusPage = new StatusPageResource(secretStore, mockClient); } |