From 72aef3a6324c78a62d0eff65217d4861440841f5 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 31 Jan 2023 08:15:34 -0500
Subject: Fix Java 17 jUnit errors

Add explicit lombok dependency to resolve compile error when compiling
under java 17

Fixed code issues in jUnit tests due to restrictions on reflection
in Java 17, which disallow jUnit from setting system properties
or environment variables.

Issue-ID: CCSDK-3813
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I278ee869d2ce0568b29ecc29c37d00d7fce757a8
---
 plugins/grToolkit/provider/pom.xml                                    | 2 ++
 .../org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java   | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugins/grToolkit')

diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml
index 87f2a789a..e39e17434 100755
--- a/plugins/grToolkit/provider/pom.xml
+++ b/plugins/grToolkit/provider/pom.xml
@@ -150,6 +150,7 @@
                     <environmentVariables>
                         <ODL_USER>admin</ODL_USER>
                         <ODL_PASSWORD>admin</ODL_PASSWORD>
+                        <SDNC_CONFIG_DIR>src/test/resources</SDNC_CONFIG_DIR>
                     </environmentVariables>
                 </configuration>
             </plugin>
@@ -160,6 +161,7 @@
                     <environmentVariables>
                         <ODL_USER>admin</ODL_USER>
                         <ODL_PASSWORD>admin</ODL_PASSWORD>
+                        <SDNC_CONFIG_DIR>src/test/resources</SDNC_CONFIG_DIR>
                     </environmentVariables>
                 </configuration>
             </plugin>
diff --git a/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
index 6495c89cf..98e55e50d 100644
--- a/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
+++ b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
@@ -46,7 +46,6 @@ import java.util.stream.Stream;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.onap.ccsdk.sli.core.dblib.DBLibConnection;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor;
@@ -80,14 +79,11 @@ public class GrToolkitProviderTest {
     DBLibConnection connection;
     Properties properties;
 
-    @Rule
-    public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(9999);
 
     @Before
     public void setup() {
-        environmentVariables.set("SDNC_CONFIG_DIR","src/test/resources");
         dataBroker = mock(DataBroker.class);
         notificationProviderService = mock(NotificationPublishService.class);
         rpcProviderRegistry = mock(RpcProviderService.class);
-- 
cgit 1.2.3-korg