From 987b9f7a030a2389216c998225abb2602ef2dba3 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 31 Jan 2023 10:39:50 +0000 Subject: Upgrade and clean up dependencies - Upgrade Hibernate - Upgrade Mockito - Upgrade Mockserver - Remove Powermock (no longer supported) and replace with spring-test ReflectionTestUtils - Upgrade Spring Framework - Add spring-security to allow authentication on unit tests using MockMVC Minor clean-up - Replace deprecated authorization configuraiton on spring boot applications with SecurityFilterChain bean - Change @LocalPort include on tests to use test include rather than runtime include - Remove unused imports - Remove unused constants and variables - Add deprecation annotations where required Issue-ID: POLICY-4482 Change-Id: Iec5ba1283acd506c9f3c7fe7b5d7858db6abbaa7 Signed-off-by: liamfallon --- .../common/gson/JacksonExclusionStrategyTest.java | 2 ++ .../onap/policy/common/gson/internal/AdapterTest.java | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'gson/src/test') diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java index 41933bc5..9d8d3495 100644 --- a/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java +++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonExclusionStrategyTest.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + * Modificaitons Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -175,6 +176,7 @@ public class JacksonExclusionStrategyTest { /** * Used to verify that JsonElements are not managed. */ + @SuppressWarnings("deprecation") public static class MyJson extends JsonElement { @Override public JsonElement deepCopy() { diff --git a/gson/src/test/java/org/onap/policy/common/gson/internal/AdapterTest.java b/gson/src/test/java/org/onap/policy/common/gson/internal/AdapterTest.java index 9d80c860..fd999951 100644 --- a/gson/src/test/java/org/onap/policy/common/gson/internal/AdapterTest.java +++ b/gson/src/test/java/org/onap/policy/common/gson/internal/AdapterTest.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +43,7 @@ import org.onap.policy.common.gson.annotation.GsonJsonProperty; import org.onap.policy.common.gson.internal.Adapter.Factory; import org.onap.policy.common.gson.internal.DataAdapterFactory.Data; import org.onap.policy.common.gson.internal.DataAdapterFactory.DerivedData; -import org.powermock.reflect.Whitebox; +import org.springframework.test.util.ReflectionTestUtils; public class AdapterTest { private static final String GET_INVALID_NAME = "get$InvalidName"; @@ -83,12 +84,12 @@ public class AdapterTest { @BeforeClass public static void setUpBeforeClass() { - saveFactory = Whitebox.getInternalState(Adapter.class, FACTORY_FIELD); + saveFactory = (Factory) ReflectionTestUtils.getField(Adapter.class, FACTORY_FIELD); } @After public void tearDown() { - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, saveFactory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, saveFactory); } @Test @@ -98,7 +99,7 @@ public class AdapterTest { // return an invalid field name Factory factory = mock(Factory.class); when(factory.getName(any(Field.class))).thenReturn("$invalidFieldName"); - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, factory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, factory); assertFalse(Adapter.isManaged(field(VALUE_NAME))); } @@ -108,7 +109,7 @@ public class AdapterTest { // return an invalid method name Factory factory = mock(Factory.class); - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, factory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, factory); when(factory.getName(any(Method.class))).thenReturn(GET_INVALID_NAME); assertFalse(Adapter.isManaged(mget(GET_VALUE_NAME))); @@ -240,7 +241,7 @@ public class AdapterTest { // return an invalid field name Factory factory = mock(Factory.class); when(factory.getName(any(Field.class))).thenReturn("$invalidFieldName"); - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, factory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, factory); assertEquals(null, Adapter.detmPropName(field(VALUE_NAME))); } @@ -257,7 +258,7 @@ public class AdapterTest { // return an invalid method name Factory factory = mock(Factory.class); - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, factory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, factory); when(factory.getName(any(Method.class))).thenReturn(GET_INVALID_NAME); assertEquals(null, Adapter.detmGetterPropName(mget(GET_VALUE_NAME))); @@ -273,7 +274,7 @@ public class AdapterTest { // return an invalid method name Factory factory = mock(Factory.class); - Whitebox.setInternalState(Adapter.class, FACTORY_FIELD, factory); + ReflectionTestUtils.setField(Adapter.class, FACTORY_FIELD, factory); when(factory.getName(any(Method.class))).thenReturn(SET_INVALID_NAME); assertEquals(null, Adapter.detmSetterPropName(mset(SET_VALUE_NAME))); -- cgit 1.2.3-korg