X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-maven-plugin-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang2sources%2Fplugin%2Fit%2FYangToSourcesPluginTestIT.java;h=1365e560c72a04e425f156d902f9ef76a0f293a5;hb=ded9e3c33f7138c7391caf5afb377dce76986f8f;hp=e2d889e78e58c5090c24151096279294621a7b70;hpb=5a0344e52dacf50bc5482e2aeb092848604dbd2e;p=yangtools.git

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 e2d889e78e..1365e560c7 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
@@ -10,23 +10,29 @@ package org.opendaylight.yangtools.yang2sources.plugin.it;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-
 import com.google.common.base.Joiner;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Properties;
-
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
+import org.junit.BeforeClass;
 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
 
@@ -63,28 +69,14 @@ public class YangToSourcesPluginTestIT {
         } catch (VerificationException e) {
             assertVerificationException(
                     e,
-                    "org.opendaylight.yangtools.yang.parser.util.YangValidationException: Not existing module imported:unknownDep:2013-02-27 by:private:2013-02-27");
+                    "org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException: Imported module " +
+                    "[ModuleIdentifierImpl{name='unknownDep', namespace=null, revision=2013-02-27}");
             return;
         }
 
         fail("Verification exception should have been thrown");
     }
 
-    @Test
-    public void testNamingConflict() throws Exception {
-        Verifier v = setUp("test-parent/NamingConflict/", false);
-        v.verifyErrorFreeLog();
-        String baseDir = v.getBasedir();
-        String fileName = v.getLogFileName();
-        List<String> lines = v.loadFile(baseDir, fileName, false);
-        for (String s : lines) {
-            if (s.contains("conflict")) {
-                System.err.println(s);
-            }
-        }
-        v.verifyTextInLog("[WARNING] Naming conflict for type 'org.opendaylight.yang.gen.v1.urn.yang.test.rev140303.NetworkTopologyRef': file with same name already exists and will not be generated.");
-    }
-
     static void verifyCorrectLog(final Verifier v) throws VerificationException {
         v.verifyErrorFreeLog();
         v.verifyTextInLog("[INFO] yang-to-sources: YANG files parsed from");
@@ -136,6 +128,14 @@ public class YangToSourcesPluginTestIT {
         if (ignoreF) {
             verifier.addCliOption("-fn");
         }
+        if (GLOBAL_SETTINGS_OVERRIDE != null) {
+            verifier.addCliOption("-gs");
+            verifier.addCliOption(GLOBAL_SETTINGS_OVERRIDE);
+        }
+        if (USER_SETTINGS_OVERRIDE != null) {
+            verifier.addCliOption("-s");
+            verifier.addCliOption(USER_SETTINGS_OVERRIDE);
+        }
         verifier.setMavenDebug(true);
         verifier.executeGoal("generate-sources");
         return verifier;