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>
public class YangToSourcesPluginTestIT {
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
// TODO Test yang files in transitive dependencies
@Test
if (ignoreF) {
verifier.addCliOption("-fn");
}
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("-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");
}
verifier.setMavenDebug(true);
verifier.executeGoal("generate-sources");