From e5a316e5c8aeaae1ba4aead0a71b6baf2f8cc5c1 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Tue, 15 Mar 2022 09:38:05 +0000 Subject: Clean up of test resources not used by ACM Issue-ID: POLICY-3945 Change-Id: I9d3b47a47288816f7ff3d60b21237a458b14cf68 Signed-off-by: adheli.tavares --- .../policy/clamp/common/acm/exception/ExceptionsTest.java | 6 +++--- .../common/acm/rest/CoderHttpMessageConverterTest.java | 15 ++++++--------- .../common/acm/rest/RequestResponseLoggingFilterTest.java | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'common/src/test/java/org/onap') diff --git a/common/src/test/java/org/onap/policy/clamp/common/acm/exception/ExceptionsTest.java b/common/src/test/java/org/onap/policy/clamp/common/acm/exception/ExceptionsTest.java index ef0472cdc..5c9db9073 100644 --- a/common/src/test/java/org/onap/policy/clamp/common/acm/exception/ExceptionsTest.java +++ b/common/src/test/java/org/onap/policy/clamp/common/acm/exception/ExceptionsTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. + * Copyright (C) 2021-2022 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package org.onap.policy.clamp.common.acm.exception; import static org.assertj.core.api.Assertions.assertThat; -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 java.io.IOException; import javax.ws.rs.core.Response; diff --git a/common/src/test/java/org/onap/policy/clamp/common/acm/rest/CoderHttpMessageConverterTest.java b/common/src/test/java/org/onap/policy/clamp/common/acm/rest/CoderHttpMessageConverterTest.java index 5c5bf3fbb..f172358c0 100644 --- a/common/src/test/java/org/onap/policy/clamp/common/acm/rest/CoderHttpMessageConverterTest.java +++ b/common/src/test/java/org/onap/policy/clamp/common/acm/rest/CoderHttpMessageConverterTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. + * Copyright (C) 2021-2022 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ package org.onap.policy.clamp.common.acm.rest; -import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -37,7 +37,7 @@ class CoderHttpMessageConverterTest { @Test - void coderHttpMesageConverterTest() throws AutomationCompositionRuntimeException, IOException { + void coderHttpMessageConverterTest() throws AutomationCompositionRuntimeException, IOException { var y = new CoderHttpMesageConverter<>("yaml"); var j = new CoderHttpMesageConverter<>("json"); @@ -46,15 +46,12 @@ class CoderHttpMessageConverterTest { var testInputStream = new ByteArrayInputStream("testdata".getBytes()); HttpInputMessage input = Mockito.mock(HttpInputMessage.class); Mockito.when(input.getBody()).thenReturn(testInputStream); - assertThrows(AutomationCompositionRuntimeException.class, () -> { - y.readInternal(RequestResponseLoggingFilterTest.class, input); - }); + assertThrows(AutomationCompositionRuntimeException.class, + () -> y.readInternal(RequestResponseLoggingFilterTest.class, input)); var testOutputStream = new ByteArrayOutputStream(); HttpOutputMessage output = Mockito.mock(HttpOutputMessage.class); Mockito.when(output.getBody()).thenReturn(testOutputStream); - assertThrows(AutomationCompositionRuntimeException.class, () -> { - j.writeInternal(String.class, output); - }); + assertThrows(AutomationCompositionRuntimeException.class, () -> j.writeInternal(String.class, output)); } } diff --git a/common/src/test/java/org/onap/policy/clamp/common/acm/rest/RequestResponseLoggingFilterTest.java b/common/src/test/java/org/onap/policy/clamp/common/acm/rest/RequestResponseLoggingFilterTest.java index ff6e1cd34..0fc77b139 100644 --- a/common/src/test/java/org/onap/policy/clamp/common/acm/rest/RequestResponseLoggingFilterTest.java +++ b/common/src/test/java/org/onap/policy/clamp/common/acm/rest/RequestResponseLoggingFilterTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. + * Copyright (C) 2021-2022 Nordix Foundation. * ================================================================================ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -35,7 +35,7 @@ import org.mockito.Mockito; class RequestResponseLoggingFilterTest { @Test - void initTest() throws IOException, ServletException { + void initTest() { var e = new RequestResponseLoggingFilter(); var res = Mockito.mock(HttpServletResponse.class); var req = Mockito.mock(HttpServletRequest.class); -- cgit 1.2.3-korg