1 files changed, 14 insertions, 13 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 1866bba0..f5a32777 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
@@ -2,7 +2,8 @@
  * ============LICENSE_START=======================================================
  * Integrity Audit
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -25,6 +26,10 @@ import static org.junit.Assert.fail;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Persistence;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,18 +41,14 @@ import java.util.Properties;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
 import org.onap.policy.common.utils.jpa.EntityMgrCloser;
 import org.onap.policy.common.utils.jpa.EntityMgrFactoryCloser;
 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);
 
@@ -243,7 +245,7 @@ public class IntegrityAuditTestBase {
 
         // Clean up the DB
         try (EntityTransCloser etc = new EntityTransCloser(em.getTransaction())) {
-            EntityTransaction et = etc.getTransation();
+            EntityTransaction et = etc.getTransaction();
 
             em.createQuery("Delete from IntegrityAuditEntity").executeUpdate();
 
@@ -290,7 +292,7 @@ public class IntegrityAuditTestBase {
                 EntityTransCloser etc = new EntityTransCloser(emc.getManager().getTransaction())) {
 
             EntityManager entmgr = emc.getManager();
-            EntityTransaction entrans = etc.getTransation();
+            EntityTransaction entrans = etc.getTransaction();
 
             // Clean up the DB
             entmgr.createQuery("Delete from " + tableName).executeUpdate();
@@ -304,8 +306,7 @@ public class IntegrityAuditTestBase {
      * Verifies that items appear within the log, in order. A given item may appear more than once.
      * In addition, the log may contain extra items; those are ignored.
      *
-     * @param textre regular expression used to extract an item from a line in the log. The first
-     *        "capture" group of the regular expression is assumed to contain the extracted item
+     * @param app where data has been logged
      * @param items items that should be matched by the items extracted from the log, in order
      * @throws IOException if an IO error occurs
      * @throws AssertionError if the desired items were not all found