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 | |
parent | b434b82feae653f432762e30d2a59e4f2ee651e7 (diff) |
Convert jdisc-security-filters to junit5
9 files changed, 62 insertions, 73 deletions
diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index dd44a114236..a452327f6ff 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -28,6 +28,12 @@ <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -38,11 +44,6 @@ <!-- test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -52,17 +53,6 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>testutil</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilterTest.java index d74075831f1..752f1026f3d 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilterTest.java @@ -21,7 +21,7 @@ import com.yahoo.vespa.athenz.api.ZToken; import com.yahoo.vespa.athenz.utils.AthenzIdentities; import com.yahoo.vespa.athenz.zpe.AuthorizationResult; import com.yahoo.vespa.athenz.zpe.Zpe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.x500.X500Principal; import java.math.BigInteger; @@ -39,10 +39,10 @@ import static com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFil import static com.yahoo.security.SignatureAlgorithm.SHA256_WITH_ECDSA; import static com.yahoo.security.SubjectAlternativeName.Type.EMAIL; import static com.yahoo.vespa.athenz.zpe.AuthorizationResult.Type; -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.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -72,7 +72,7 @@ public class AthenzAuthorizationFilterTest { private static final String REJECTED_METRIC_NAME = "jdisc.http.filter.athenz.rejected_requests"; @Test - public void accepts_request_with_access_token() { + void accepts_request_with_access_token() { AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of()); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -86,7 +86,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void accepts_request_with_role_certificate() { + void accepts_request_with_role_certificate() { AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of()); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -100,7 +100,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void accepts_request_with_role_token() { + void accepts_request_with_role_token() { AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of()); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -114,7 +114,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void accepts_request_with_proxied_access_token() { + void accepts_request_with_proxied_access_token() { Zpe zpe = mock(Zpe.class); when(zpe.checkAccessAllowed(any(), any(), any(), any())).thenReturn(new AuthorizationResult(Type.ALLOW, ROLE)); when(zpe.checkAccessAllowed((AthenzAccessToken) any(), any(), any())).thenReturn(new AuthorizationResult(Type.ALLOW, ROLE)); @@ -135,7 +135,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void accepts_request_with_access_token_and_matching_identity_certificate_with_proxy_support_enabled() { + void accepts_request_with_access_token_and_matching_identity_certificate_with_proxy_support_enabled() { Zpe zpe = mock(Zpe.class); when(zpe.checkAccessAllowed(any(), any(), any(), any())).thenReturn(new AuthorizationResult(Type.ALLOW, ROLE)); when(zpe.checkAccessAllowed((AthenzAccessToken) any(), any(), any())).thenReturn(new AuthorizationResult(Type.ALLOW, ROLE)); @@ -156,7 +156,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void returns_forbidden_when_identity_certificate_has_unknown_proxy_identity() { + void returns_forbidden_when_identity_certificate_has_unknown_proxy_identity() { Zpe zpe = mock(Zpe.class); when(zpe.checkAccessAllowed(any(), any(), any(), any())).thenReturn(new AuthorizationResult(Type.DENY, ROLE)); when(zpe.checkAccessAllowed((AthenzAccessToken) any(), any(), any())).thenReturn(new AuthorizationResult(Type.DENY, ROLE)); @@ -174,7 +174,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void returns_unauthorized_for_request_with_disabled_credential_type() { + void returns_unauthorized_for_request_with_disabled_credential_type() { AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of(EnabledCredentials.ROLE_CERTIFICATE, EnabledCredentials.ACCESS_TOKEN)); @@ -188,7 +188,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void returns_forbidden_for_credentials_rejected_by_zpe() { + void returns_forbidden_for_credentials_rejected_by_zpe() { AthenzAuthorizationFilter filter = createFilter(new DenyingZpe(), List.of()); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -200,7 +200,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void reports_metrics_for_rejected_requests() { + void reports_metrics_for_rejected_requests() { MetricMock metric = new MetricMock(); AthenzAuthorizationFilter filter = createFilter(new DenyingZpe(), List.of(), metric, null); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -211,7 +211,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void reports_metrics_for_accepted_requests() { + void reports_metrics_for_accepted_requests() { MetricMock metric = new MetricMock(); AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of(EnabledCredentials.ACCESS_TOKEN), metric, null); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -222,7 +222,7 @@ public class AthenzAuthorizationFilterTest { } @Test - public void ignores_access_token_if_client_has_role_certificate() { + void ignores_access_token_if_client_has_role_certificate() { AthenzAuthorizationFilter filter = createFilter(new AllowingZpe(), List.of()); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -238,7 +238,7 @@ public class AthenzAuthorizationFilterTest { private void assertMetrics(MetricMock metric, String metricName, Map<String, String> dimensions) { assertTrue(metric.addInvocations.keySet().contains(metricName)); SimpleMetricContext metricContext = metric.addInvocations.get(metricName); - assertNotNull("Metric not found " + metricName, metricName); + assertNotNull(metricName, "Metric not found " + metricName); for (Map.Entry<String, String> entry : dimensions.entrySet()) { String dimensionName = entry.getKey(); String expected = entry.getValue(); 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()); diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBaseTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBaseTest.java index 0f5512a6ec5..34db051aa28 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBaseTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBaseTest.java @@ -6,13 +6,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.container.jdisc.RequestHandlerTestDriver; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; /** @@ -23,7 +23,7 @@ public class JsonSecurityRequestFilterBaseTest { private final ObjectMapper mapper = new ObjectMapper(); @Test - public void filter_renders_errors_as_json() throws IOException { + void filter_renders_errors_as_json() throws IOException { int statusCode = 403; String message = "Forbidden"; DiscFilterRequest request = mock(DiscFilterRequest.class); diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java index ead816afdfd..b5b94d5a2c2 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java @@ -8,16 +8,16 @@ import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.jdisc.http.filter.SecurityRequestFilter; import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS; import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS; import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,28 +29,28 @@ import static org.mockito.Mockito.when; public class CorsPreflightRequestFilterTest { @Test - public void any_options_request_yields_access_control_headers_in_response() { + void any_options_request_yields_access_control_headers_in_response() { HeaderFields headers = doFilterRequest(newRequestFilter(), "http://any.origin"); ACCESS_CONTROL_HEADERS.keySet().forEach( - header -> assertFalse("Empty header: " + header, headers.getFirst(header).isEmpty())); + header -> assertFalse(headers.getFirst(header).isEmpty(), "Empty header: " + header)); } @Test - public void allowed_request_origin_yields_allow_origin_header_in_response() { + void allowed_request_origin_yields_allow_origin_header_in_response() { final String ALLOWED_ORIGIN = "http://allowed.origin"; HeaderFields headers = doFilterRequest(newRequestFilter(ALLOWED_ORIGIN), ALLOWED_ORIGIN); assertEquals(ALLOWED_ORIGIN, headers.getFirst(ALLOW_ORIGIN_HEADER)); } @Test - public void allowed_wildcard_origin_yields_origin_header_in_response() { + void allowed_wildcard_origin_yields_origin_header_in_response() { final String ALLOWED_ORIGIN = "http://allowed.origin"; HeaderFields headers = doFilterRequest(newRequestFilter("*"), ALLOWED_ORIGIN); assertEquals(ALLOWED_ORIGIN, headers.getFirst(ALLOW_ORIGIN_HEADER)); } @Test - public void disallowed_request_origin_does_not_yield_allow_origin_header_in_response() { + void disallowed_request_origin_does_not_yield_allow_origin_header_in_response() { HeaderFields headers = doFilterRequest(newRequestFilter("http://allowed.origin"), "http://disallowed.origin"); assertNull(headers.getFirst(ALLOW_ORIGIN_HEADER)); } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java index e3a3568700c..7762fde1a72 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java @@ -6,7 +6,7 @@ import com.yahoo.jdisc.http.filter.DiscFilterResponse; import com.yahoo.jdisc.http.filter.RequestView; import com.yahoo.jdisc.http.filter.SecurityResponseFilter; import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -16,9 +16,9 @@ import java.util.Optional; import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS; import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,27 +29,27 @@ import static org.mockito.Mockito.when; public class CorsResponseFilterTest { @Test - public void any_request_yields_access_control_headers_in_response() { + void any_request_yields_access_control_headers_in_response() { Map<String, String> headers = doFilterRequest(newResponseFilter(), "http://any.origin"); ACCESS_CONTROL_HEADERS.keySet().forEach( - header -> assertFalse("Empty header: " + header, headers.get(header).isEmpty())); + header -> assertFalse(headers.get(header).isEmpty(), "Empty header: " + header)); } @Test - public void allowed_request_origin_yields_allow_origin_header_in_response() { + void allowed_request_origin_yields_allow_origin_header_in_response() { final String ALLOWED_ORIGIN = "http://allowed.origin"; Map<String, String> headers = doFilterRequest(newResponseFilter(ALLOWED_ORIGIN), ALLOWED_ORIGIN); assertEquals(ALLOWED_ORIGIN, headers.get(ALLOW_ORIGIN_HEADER)); } @Test - public void disallowed_request_origin_does_not_yield_allow_origin_header_in_response() { + void disallowed_request_origin_does_not_yield_allow_origin_header_in_response() { Map<String, String> headers = doFilterRequest(newResponseFilter("http://allowed.origin"), "http://disallowed.origin"); assertNull(headers.get(ALLOW_ORIGIN_HEADER)); } @Test - public void any_request_origin_yields_allow_origin_header_in_response_when_wildcard_is_allowed() { + void any_request_origin_yields_allow_origin_header_in_response_when_wildcard_is_allowed() { Map<String, String> headers = doFilterRequest(newResponseFilter("*"), "http://any.origin"); assertEquals("http://any.origin", headers.get(ALLOW_ORIGIN_HEADER)); } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/LocalhostFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/LocalhostFilterTest.java index 676c3e23ad7..aaf6ebf1aee 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/LocalhostFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/LocalhostFilterTest.java @@ -4,13 +4,13 @@ package com.yahoo.jdisc.http.filter.security.misc; import com.yahoo.container.jdisc.RequestHandlerTestDriver; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.net.URI; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; /** @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; public class LocalhostFilterTest { @Test - public void filter() { + void filter() { // Reject from non-loopback assertUnauthorized(createRequest("1.2.3.4", null)); diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/VespaTlsFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/VespaTlsFilterTest.java index d1d74d30572..95bc1f92572 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/VespaTlsFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/misc/VespaTlsFilterTest.java @@ -9,7 +9,7 @@ import com.yahoo.security.KeyAlgorithm; import com.yahoo.security.KeyUtils; import com.yahoo.security.SignatureAlgorithm; import com.yahoo.security.X509CertificateBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import javax.security.auth.x500.X500Principal; @@ -21,14 +21,14 @@ import java.time.temporal.ChronoUnit; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; public class VespaTlsFilterTest { @Test - public void testFilter() { + void testFilter() { assertSuccess(createRequest(List.of(createCertificate()))); assertForbidden(createRequest(Collections.emptyList())); } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilterTest.java index bb3408f0089..4ad593efe82 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilterTest.java @@ -11,7 +11,6 @@ import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig.DefaultRule; import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig.Rule; -import com.yahoo.test.json.JsonTestHelper; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -238,7 +237,7 @@ class RuleBasedRequestFilterTest { ObjectNode expectedJson = jsonMapper.createObjectNode(); expectedJson.put("message", expectedMessage).put("code", expectedCode); JsonNode actualJson = jsonMapper.readTree(handler.readAll().getBytes()); - JsonTestHelper.assertJsonEquals(expectedJson, actualJson); + assertEquals(expectedJson, actualJson); } }
\ No newline at end of file |