Remove redundant modifiers

[yangtools.git] / yang / yang-maven-plugin-it / src / test / java / org / opendaylight / yangtools / yang2sources / plugin / it / YangToSourcesPluginTestIT.java

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 41d561313df6eeac1a3f5f3e1d91ca4614c79414..1365e560c72a04e425f156d902f9ef76a0f293a5 100644 (file)
--- 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
@@ -17,12 +17,10 @@ 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.Ignore;
 import org.junit.Test;
 
 public class YangToSourcesPluginTestIT {
@@ -71,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");
@@ -108,7 +92,6 @@ public class YangToSourcesPluginTestIT {
     }
 
     @Test
-    @Ignore
     public void testInvalidVersion() throws Exception {
         Verifier v = setUp("test-parent/InvalidVersion/", false);
         v.verifyErrorFreeLog();