diff options
author | liamfallon <liam.fallon@est.tech> | 2023-01-31 10:42:45 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2023-01-31 12:46:37 +0000 |
commit | 21fabae24d4f78799d6d15a9d067645eb84a70f9 (patch) | |
tree | 39ae72e5bda0170c8e32669fa45bd90e9baf47de /services/services-onappf/src/test/java | |
parent | a54acdf24961cc816b6a2a176968a2354dba4a12 (diff) |
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: Ie004dcc5303e92f6e2c2154967c3537b91868dd5
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'services/services-onappf/src/test/java')
2 files changed, 11 insertions, 7 deletions
diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java index ab20f4b0c..f1a2a089c 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019,2023 Nordix Foundation. * Modifications Copyright (C) 2020 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +23,8 @@ package org.onap.policy.apex.services.onappf; import static org.assertj.core.api.Assertions.assertThatCode; +import java.lang.reflect.Constructor; import org.junit.Test; -import org.powermock.reflect.Whitebox; /** * Class to perform unit test of {@link ApexStarterConstants}}. @@ -35,6 +35,10 @@ public class TestApexStarterConstants { @Test public void test() throws Exception { // verify that constructor does not throw an exception - assertThatCode(() -> Whitebox.invokeConstructor(ApexStarterConstants.class)).doesNotThrowAnyException(); + assertThatCode(() -> { + Constructor<ApexStarterConstants> c = ApexStarterConstants.class.getDeclaredConstructor(); + c.setAccessible(true); + c.newInstance(); + }).doesNotThrowAnyException(); } } diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java index 7313f9168..67aae3392 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019,2023 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,9 +54,9 @@ import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.common.utils.security.SelfSignedKeyStore; import org.onap.policy.common.utils.services.Registry; -import org.powermock.reflect.Whitebox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.test.util.ReflectionTestUtils; /** * Class to perform unit test of {@link ApexStarterRestServer}. @@ -208,9 +208,9 @@ public class CommonApexStarterRestServer { } private void markActivator(final boolean wasAlive) { - final Object manager = Whitebox.getInternalState( + final Object manager = ReflectionTestUtils.getField( Registry.get(ApexStarterConstants.REG_APEX_STARTER_ACTIVATOR, ApexStarterActivator.class), "manager"); - AtomicBoolean running = Whitebox.getInternalState(manager, "running"); + AtomicBoolean running = (AtomicBoolean) ReflectionTestUtils.getField(manager, "running"); running.set(wasAlive); } |