diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-27 15:58:24 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-27 15:58:37 +0200 |
commit | 368b5b8076aceb416b885df7de7796d1da95e04c (patch) | |
tree | 509606e2485de975ef43542f6a510500f7c7cdcd /jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java | |
parent | b434b82feae653f432762e30d2a59e4f2ee651e7 (diff) |
Convert jdisc-security-filters to junit5
Diffstat (limited to 'jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java')
-rw-r--r-- | jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java index d670c969e5c..0b04993a723 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzPrincipalFilterTest.java @@ -12,7 +12,7 @@ import com.yahoo.security.X509CertificateBuilder; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPrincipal; import com.yahoo.vespa.athenz.api.AthenzUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.x500.X500Principal; import java.io.BufferedReader; @@ -31,10 +31,10 @@ import static com.yahoo.security.SignatureAlgorithm.SHA256_WITH_ECDSA; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.joining; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -48,7 +48,7 @@ public class AthenzPrincipalFilterTest { private static final X509Certificate CERTIFICATE = createSelfSignedCertificate(IDENTITY); @Test - public void missing_certificate_is_unauthorized() { + void missing_certificate_is_unauthorized() { DiscFilterRequest request = createRequestMock(); when(request.getClientCertificateChain()).thenReturn(emptyList()); @@ -61,7 +61,7 @@ public class AthenzPrincipalFilterTest { } @Test - public void certificate_is_accepted() { + void certificate_is_accepted() { DiscFilterRequest request = createRequestMock(); when(request.getClientCertificateChain()).thenReturn(singletonList(CERTIFICATE)); @@ -81,7 +81,7 @@ public class AthenzPrincipalFilterTest { @Test - public void no_response_produced_when_passthrough_mode_is_enabled() { + void no_response_produced_when_passthrough_mode_is_enabled() { DiscFilterRequest request = createRequestMock(); when(request.getClientCertificateChain()).thenReturn(emptyList()); |