From b830606fbb6d76757f4b3c66e612a7f0f4dee331 Mon Sep 17 00:00:00 2001 From: HOCKLA Date: Mon, 20 Jan 2020 16:37:27 -0600 Subject: policy/distribution jdk11 upgrades Issue-ID: POLICY-1585 Change-Id: I4aa879656c039d9de9c288f0309105c21f4bf285 Signed-off-by: HOCKLA --- .../forwarding/file/FilePolicyForwarderTest.java | 10 ++-- .../pdp/engine/XacmlPdpPolicyForwarderTest.java | 60 +++++++++------------- .../xacml/pdp/testclasses/DummyDecoder.java | 4 +- .../pdp/testclasses/DummyReceptionHandler.java | 7 ++- 4 files changed, 39 insertions(+), 42 deletions(-) (limited to 'plugins/forwarding-plugins/src') diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java index 5eae7df3..247334db 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Intel Corp. All rights reserved. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. + * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,11 +39,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; + /** * Class to perform unit test of {@link FilePolicyForwarder}. * @@ -94,13 +95,14 @@ public class FilePolicyForwarderTest { } @Test - @SuppressWarnings("unchecked") public void testForwardPolicyError() { final Collection policies = new ArrayList<>(); final ToscaPolicy policy = createPolicy(policies, "test", "test"); final ToscaPolicy spy = Mockito.spy(policy); - Mockito.when(spy.toString()).thenThrow(IOException.class); + Mockito.when(spy.toString()).thenAnswer(invocation -> { + throw new IOException(); + }); policies.add(spy); final FilePolicyForwarder forwarder = new FilePolicyForwarder(); diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java index 03adc0e1..222614d9 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,9 +23,9 @@ package org.onap.policy.distribution.forwarding.xacml.pdp.engine; import static org.junit.Assert.assertSame; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -38,10 +38,9 @@ import java.util.HashMap; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Response; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.ArgumentMatcher; import org.onap.policy.api.PolicyParameters; import org.onap.policy.api.PushPolicyParameters; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; @@ -83,8 +82,8 @@ public class XacmlPdpPolicyForwarderTest { final HttpClient httpClientMock = mock(HttpClient.class); headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE); - when(httpClientMock.put(eq("createPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); - when(httpClientMock.put(eq("pushPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class); when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock); @@ -118,8 +117,8 @@ public class XacmlPdpPolicyForwarderTest { final HttpClient httpClientMock = mock(HttpClient.class); headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE); - when(httpClientMock.put(eq("createPolicy"), anyObject(), eq(headers))).thenReturn(Response.status(400).build()); - when(httpClientMock.put(eq("pushPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build()); + when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class); when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock); @@ -132,7 +131,7 @@ public class XacmlPdpPolicyForwarderTest { forwarder.forward(policies); verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy)), eq(headers)); - verify(httpClientMock, times(0)).put(eq("pushPolicy"), anyObject(), anyObject()); + verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any()); } @Test @@ -140,8 +139,8 @@ public class XacmlPdpPolicyForwarderTest { final HttpClient httpClientMock = mock(HttpClient.class); headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE); - when(httpClientMock.put(eq("createPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); - when(httpClientMock.put(eq("pushPolicy"), anyObject(), eq(headers))).thenReturn(Response.status(400).build()); + when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build()); final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class); when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock); @@ -163,8 +162,8 @@ public class XacmlPdpPolicyForwarderTest { final HttpClient httpClientMock = mock(HttpClient.class); headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE); - when(httpClientMock.put(eq("createPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); - when(httpClientMock.put(eq("pushPolicy"), anyObject(), eq(headers))).thenReturn(Response.status(400).build()); + when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build()); final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class); when(httpClientFactoryMock.build(argThat(matcher))).thenThrow(new HttpClientConfigException()); @@ -178,8 +177,8 @@ public class XacmlPdpPolicyForwarderTest { assertSame(policy, policies.iterator().next()); - verify(httpClientMock, times(0)).put(eq("createPolicy"), anyObject(), anyObject()); - verify(httpClientMock, times(0)).put(eq("pushPolicy"), anyObject(), anyObject()); + verify(httpClientMock, times(0)).put(eq("createPolicy"), any(), any()); + verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any()); } @Test @@ -187,8 +186,8 @@ public class XacmlPdpPolicyForwarderTest { final HttpClient httpClientMock = mock(HttpClient.class); headers.put(CLIENT_AUTH, CLIENT_AUTH_VALUE); - when(httpClientMock.put(eq("createPolicy"), anyObject(), eq(headers))).thenReturn(Response.ok().build()); - when(httpClientMock.put(eq("pushPolicy"), anyObject(), eq(headers))).thenReturn(Response.status(400).build()); + when(httpClientMock.put(eq("createPolicy"), any(), eq(headers))).thenReturn(Response.ok().build()); + when(httpClientMock.put(eq("pushPolicy"), any(), eq(headers))).thenReturn(Response.status(400).build()); final HttpClientFactory httpClientFactoryMock = mock(HttpClientFactory.class); when(httpClientFactoryMock.build(argThat(matcher))).thenReturn(httpClientMock) @@ -202,10 +201,10 @@ public class XacmlPdpPolicyForwarderTest { forwarder.forward(policies); verify(httpClientMock).put(eq("createPolicy"), argThat(new PolicyParametersEntityMatcher(policy)), eq(headers)); - verify(httpClientMock, times(0)).put(eq("pushPolicy"), anyObject(), anyObject()); + verify(httpClientMock, times(0)).put(eq("pushPolicy"), any(), any()); } - class BusTopicParamsMatcher extends BaseMatcher { + class BusTopicParamsMatcher implements ArgumentMatcher { private BusTopicParams busTopicParams; @@ -214,7 +213,7 @@ public class XacmlPdpPolicyForwarderTest { } @Override - public boolean matches(final Object arg0) { + public boolean matches(final BusTopicParams arg0) { if (arg0 instanceof BusTopicParams) { final BusTopicParams toCompareTo = (BusTopicParams) arg0; return toCompareTo.isUseHttps() == busTopicParams.isUseHttps() @@ -226,12 +225,9 @@ public class XacmlPdpPolicyForwarderTest { } return false; } - - @Override - public void describeTo(final Description arg0) {} } - class PolicyParametersEntityMatcher extends BaseMatcher> { + class PolicyParametersEntityMatcher implements ArgumentMatcher> { private ToscaPolicy policy; @@ -241,19 +237,16 @@ public class XacmlPdpPolicyForwarderTest { @SuppressWarnings("unchecked") @Override - public boolean matches(final Object arg0) { + public boolean matches(final Entity arg0) { if (arg0 instanceof Entity) { final PolicyParameters toCompareTo = ((Entity) arg0).getEntity(); return toCompareTo.getPolicyName().equals(policy.getName()); } return false; } - - @Override - public void describeTo(final Description arg0) {} } - class PushPolicyParametersEntityMatcher extends BaseMatcher> { + class PushPolicyParametersEntityMatcher implements ArgumentMatcher> { private ToscaPolicy policy; @@ -263,7 +256,7 @@ public class XacmlPdpPolicyForwarderTest { @SuppressWarnings("unchecked") @Override - public boolean matches(final Object arg0) { + public boolean matches(final Entity arg0) { if (arg0 instanceof Entity) { final PushPolicyParameters toCompareTo = ((Entity) arg0).getEntity(); return toCompareTo.getPolicyName().equals(policy.getName()) @@ -272,9 +265,6 @@ public class XacmlPdpPolicyForwarderTest { } return false; } - - @Override - public void describeTo(final Description arg0) {} } class UnsupportedPolicy extends ToscaEntity { diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java index 4cd7e24c..f2fb144a 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyDecoder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,5 +59,6 @@ public class DummyDecoder implements PolicyDecoder { } @Override - public void configure(final String parameterGroupName) {} + public void configure(final String parameterGroupName) { + } } diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java index c0934812..f9bde3c3 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +31,10 @@ import org.onap.policy.distribution.reception.handling.AbstractReceptionHandler; public class DummyReceptionHandler extends AbstractReceptionHandler { @Override - public void initializeReception(final String parameterGroupName) {} + public void initializeReception(final String parameterGroupName) { + } @Override - public void destroy() {} + public void destroy() { + } } -- cgit 1.2.3-korg