summaryrefslogtreecommitdiffstats
path: root/adaptors/sql-resource
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-01-31 08:15:34 -0500
committerDan Timoney <dtimoney@att.com>2023-02-07 10:24:42 -0500
commit72aef3a6324c78a62d0eff65217d4861440841f5 (patch)
tree7a208d5d4630a046e05768e004956c4c9cffa253 /adaptors/sql-resource
parent8393d347d303d70e4ff4c7c91b7454467545cab3 (diff)
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
Diffstat (limited to 'adaptors/sql-resource')
-rwxr-xr-xadaptors/sql-resource/provider/pom.xml14
-rwxr-xr-xadaptors/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceProviderTest.java21
2 files changed, 15 insertions, 20 deletions
diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml
index 4a53413cb..c6d256d34 100755
--- a/adaptors/sql-resource/provider/pom.xml
+++ b/adaptors/sql-resource/provider/pom.xml
@@ -79,4 +79,18 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <SDNC_CONFIG_DIR>${basedir}/src/test/resources</SDNC_CONFIG_DIR>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/adaptors/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceProviderTest.java b/adaptors/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceProviderTest.java
index 6436f1ef1..4b97e1d5a 100755
--- a/adaptors/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceProviderTest.java
+++ b/adaptors/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceProviderTest.java
@@ -36,16 +36,7 @@ public class SqlResourceProviderTest {
@Test
public void testSqlResourceProvider() {
- try{
- Map<String, String> env = System.getenv();
- Class<?> cl = env.getClass();
- Field field = cl.getDeclaredField("m");
- field.setAccessible(true);
- Map<String, String> writableEnv = (Map<String, String>) field.get(env);
- writableEnv.put(SDNC_CONFIG_DIR, "./src/test/resources");
- } catch (Exception e) {
- throw new IllegalStateException("Failed to set environment variable", e);
- }
+
provider = new SqlResourcePropertiesProviderImpl();
assertNotNull(provider);
@@ -59,16 +50,6 @@ public class SqlResourceProviderTest {
@Test
public void testReportSuccess() {
- try{
- Map<String, String> env = System.getenv();
- Class<?> cl = env.getClass();
- Field field = cl.getDeclaredField("m");
- field.setAccessible(true);
- Map<String, String> writableEnv = (Map<String, String>) field.get(env);
- writableEnv.put(SDNC_CONFIG_DIR, "./src/test/resources");
- } catch (Exception e) {
- throw new IllegalStateException("Failed to set environment variable", e);
- }
provider = new SqlResourcePropertiesProviderImpl();
Properties properties = provider.getProperties();