1 files changed, 8 insertions, 14 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java
index 20db038485d..ffb78b7342a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java
@@ -7,10 +7,10 @@ import com.yahoo.jdisc.handler.ReadableContentChannel;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.filter.DiscFilterRequest;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserId;
-import com.yahoo.vespa.hosted.controller.athenz.AthenzPrincipal;
-import com.yahoo.vespa.hosted.controller.athenz.AthenzUtils;
-import com.yahoo.vespa.hosted.controller.athenz.InvalidTokenException;
-import com.yahoo.vespa.hosted.controller.athenz.NToken;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzPrincipal;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzUser;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.InvalidTokenException;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.NToken;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.when;
  */
 public class AthenzPrincipalFilterTest {
 
-    private static final NToken NTOKEN = createDummyToken();
+    private static final NToken NTOKEN = new NToken("dummy");
     private static final String ATHENZ_PRINCIPAL_HEADER = "Athenz-Principal-Auth";
 
     private NTokenValidator validator;
@@ -44,13 +44,13 @@ public class AthenzPrincipalFilterTest {
     @Before
     public void before() {
         validator = mock(NTokenValidator.class);
-        principal = AthenzUtils.createPrincipal(new UserId("bob"));
+        principal = new AthenzPrincipal(AthenzUser.fromUserId(new UserId("bob")), NTOKEN);
     }
 
     @Test
     public void valid_ntoken_is_accepted() throws Exception {
         DiscFilterRequest request = mock(DiscFilterRequest.class);
-        when(request.getHeader(ATHENZ_PRINCIPAL_HEADER)).thenReturn(NTOKEN.getToken());
+        when(request.getHeader(ATHENZ_PRINCIPAL_HEADER)).thenReturn(NTOKEN.getRawToken());
 
         when(validator.validate(NTOKEN)).thenReturn(principal);
 
@@ -78,7 +78,7 @@ public class AthenzPrincipalFilterTest {
     @Test
     public void invalid_token_is_unauthorized() throws Exception {
         DiscFilterRequest request = mock(DiscFilterRequest.class);
-        when(request.getHeader(ATHENZ_PRINCIPAL_HEADER)).thenReturn(NTOKEN.getToken());
+        when(request.getHeader(ATHENZ_PRINCIPAL_HEADER)).thenReturn(NTOKEN.getRawToken());
 
         when(validator.validate(NTOKEN)).thenThrow(new InvalidTokenException("Invalid token"));
 
@@ -92,12 +92,6 @@ public class AthenzPrincipalFilterTest {
         assertThat(responseHandler.getResponseContent(), containsString("Invalid token"));
     }
 
-    private static NToken createDummyToken() {
-        return new NToken.Builder(
-                "U1", AthenzUtils.createPrincipal(new UserId("bob")), AthenzTestUtils.generateRsaKeypair().getPrivate(), "0")
-                .build();
-    }
-
     private static class ResponseHandlerMock implements ResponseHandler {
 
         public Response response;