From: Robert Varga <rovarga@cisco.com>
Date: Wed, 23 Nov 2016 17:30:12 +0000 (+0100)
Subject: Eliminate use of environment variables
X-Git-Tag: release/carbon~230
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3f924bf51bce77949345a75e31b71b656a0e3435;p=yangtools.git

Eliminate use of environment variables

Change I1edbed691ac1a01c8bfc1c8178d4836781aba0a1
introduced a back-channel to move effective settings
into the IT test. Use that instead of magic properties,
as it is safer.

Change-Id: If1b2d6e91ca4e9dd0c15f1c8dc10fa64ad7cdcdf
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
index 770e327812..9ade2fdc6e 100644
--- a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
+++ b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
@@ -28,16 +28,6 @@ import org.junit.Test;
 
 public class YangToSourcesPluginTestIT {
 
-    private static String GLOBAL_SETTINGS_OVERRIDE;
-    private static String USER_SETTINGS_OVERRIDE;
-
-    @BeforeClass
-    public static void setupClass() {
-        // OpenDaylight Jenkins does not have settings at the default path, pick file locations from environment
-        GLOBAL_SETTINGS_OVERRIDE = System.getenv("GLOBAL_SETTINGS_FILE");
-        USER_SETTINGS_OVERRIDE = System.getenv("SETTINGS_FILE");
-    }
-
     // TODO Test yang files in transitive dependencies
 
     @Test
@@ -132,16 +122,11 @@ public class YangToSourcesPluginTestIT {
         if (ignoreF) {
             verifier.addCliOption("-fn");
         }
-        if (GLOBAL_SETTINGS_OVERRIDE != null) {
-            verifier.addCliOption("-gs");
-            verifier.addCliOption(GLOBAL_SETTINGS_OVERRIDE);
-        } else if (getEffectiveSettingsXML().isPresent()) {
+
+		final Optional<String> maybeSettings = getEffectiveSettingsXML();
+		if (maybeSettings.isPresent()) {
             verifier.addCliOption("-gs");
-            verifier.addCliOption(getEffectiveSettingsXML().get());
-        }
-        if (USER_SETTINGS_OVERRIDE != null) {
-            verifier.addCliOption("-s");
-            verifier.addCliOption(USER_SETTINGS_OVERRIDE);
+            verifier.addCliOption(maybeSettings.get());
         }
         verifier.setMavenDebug(true);
         verifier.executeGoal("generate-sources");