summaryrefslogtreecommitdiffstats
path: root/plugins/grToolkit
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/grToolkit')
-rwxr-xr-xplugins/grToolkit/provider/pom.xml2
-rw-r--r--plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java4
2 files changed, 2 insertions, 4 deletions
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;
@@ -81,13 +80,10 @@ public class GrToolkitProviderTest {
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);