diff options
author | liamfallon <liam.fallon@est.tech> | 2023-01-31 10:39:50 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2023-01-31 11:16:31 +0000 |
commit | 987b9f7a030a2389216c998225abb2602ef2dba3 (patch) | |
tree | c3973249317b67b1a258a765703730d8421a8a62 /integrity-audit/src | |
parent | 6c4fc8693221990eca8000d07c208749c635a769 (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: Iec5ba1283acd506c9f3c7fe7b5d7858db6abbaa7
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'integrity-audit/src')
-rw-r--r-- | integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java index 13939412..28ca9c01 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java @@ -3,6 +3,7 @@ * Integrity Audit * ================================================================================ * Copyright (C) 2017-2019, 2021 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. @@ -46,8 +47,8 @@ import org.onap.policy.common.utils.jpa.EntityTransCloser; import org.onap.policy.common.utils.test.log.logback.ExtractAppender; import org.onap.policy.common.utils.time.CurrentTime; import org.onap.policy.common.utils.time.TestTime; -import org.powermock.reflect.Whitebox; import org.slf4j.LoggerFactory; +import org.springframework.test.util.ReflectionTestUtils; /** * All JUnits are designed to run in the local development environment where they have write @@ -177,6 +178,7 @@ public class IntegrityAuditTestBase { * @param dbUrl the URL to the DB * @throws IOException if an IO error occurs */ + @SuppressWarnings("unchecked") protected static void setUpBeforeClass(String dbUrl) throws IOException { // truncate the logs @@ -188,7 +190,7 @@ public class IntegrityAuditTestBase { IntegrityAuditTestBase.dbUrl = dbUrl; // save data that we have to restore at the end of the test - savedTime = Whitebox.getInternalState(AuditorTime.class, TIME_SUPPLY_FIELD); + savedTime = (Supplier<CurrentTime>) ReflectionTestUtils.getField(AuditorTime.class, TIME_SUPPLY_FIELD); savedDebugLevel = debugLogger.getLevel(); savedErrorLevel = errorLogger.getLevel(); @@ -208,7 +210,7 @@ public class IntegrityAuditTestBase { // done em = emf.createEntityManager(); - Whitebox.setInternalState(AuditorTime.class, TIME_SUPPLY_FIELD, timeSupplier); + ReflectionTestUtils.setField(AuditorTime.class, TIME_SUPPLY_FIELD, timeSupplier); debugLogger.setLevel(Level.DEBUG); errorLogger.setLevel(Level.ERROR); } @@ -220,7 +222,7 @@ public class IntegrityAuditTestBase { IntegrityAudit.setUnitTesting(false); - Whitebox.setInternalState(AuditorTime.class, TIME_SUPPLY_FIELD, savedTime); + ReflectionTestUtils.setField(AuditorTime.class, TIME_SUPPLY_FIELD, savedTime); debugLogger.setLevel(savedDebugLevel); errorLogger.setLevel(savedErrorLevel); |