Bug 4540: Yang parser exceptions should follow consistent path

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / retest / YangParserWithContextTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/YangParserWithContextTest.java
index 9b299b996983821510649537568dad2648d93aef..8918a5adbbb1fa2254b8458ade6c6b3616817dec 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/YangParserWithContextTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/YangParserWithContextTest.java
@@ -94,21 +94,6 @@ public class YangParserWithContextTest {
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
         assertNotNull(module);
 
-//        String resource = "/ietf/ietf-inet-types@2010-09-24.yang";
-//        InputStream stream = new FileInputStream(new File(getClass()
-//                .getResource(resource).toURI()));
-//        SchemaContext context = parser.resolveSchemaContext(TestUtils
-//                .loadModules(Lists.newArrayList(stream)));
-//        stream.close();
-//
-//        resource = "/context-test/test1.yang";
-//        InputStream stream2 = new FileInputStream(new File(getClass()
-//                .getResource(resource).toURI()));
-//        Module module = TestUtils.loadModuleWithContext("test1", stream2,
-//                context);
-//        stream2.close();
-//        assertNotNull(module);
-
         LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName("id");
 
         assertTrue(leaf.getType() instanceof UnsignedIntegerTypeDefinition);
@@ -144,19 +129,6 @@ public class YangParserWithContextTest {
         StmtTestUtils.addSources(reactor, BAZ, FOO, BAR, SUBFOO, test2);
         SchemaContext context = reactor.buildEffective();
 
-        // Module testModule;
-        // try (InputStream stream = new FileInputStream(new
-        // File(getClass().getResource("/context-test/test2.yang")
-        // .toURI()))) {
-        // testModule = TestUtils.loadModuleWithContext("test2", stream,
-        // context);
-        // }
-        // assertNotNull(testModule);
-
-        // suffix _u = added by uses
-        // suffix _g = defined in grouping from context
-
-        // get grouping
         Module testModule = context.findModuleByName("test2",
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
         assertNotNull(testModule);
@@ -271,14 +243,6 @@ public class YangParserWithContextTest {
         StmtTestUtils.addSources(reactor, BAZ, FOO, BAR, SUBFOO, test2);
         SchemaContext context = reactor.buildEffective();
 
-        // Module module;
-        // try (InputStream stream = new FileInputStream(new
-        // File(getClass().getResource("/context-test/test2.yang")
-        // .toURI()))) {
-        // module = TestUtils.loadModuleWithContext("test2", stream, context);
-        // }
-        // assertNotNull(module);
-
         Module module = context.findModuleByName("test2",
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
         assertNotNull(module);
@@ -375,20 +339,6 @@ public class YangParserWithContextTest {
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
         assertNotNull(module);
 
-//        SchemaContext context;
-//        File yangFile = new File(getClass().getResource(
-//                "/types/custom-types-test@2012-4-4.yang").toURI());
-//        File dependenciesDir = new File(getClass().getResource("/ietf").toURI());
-//        YangContextParser parser = new YangParserImpl();
-//        context = parser.parseFile(yangFile, dependenciesDir);
-//
-//        Module module;
-//        try (InputStream stream = new FileInputStream(new File(getClass()
-//                .getResource("/context-test/test3.yang").toURI()))) {
-//            module = TestUtils.loadModuleWithContext("test3", stream, context);
-//        }
-//        assertNotNull(module);
-
         Set<IdentitySchemaNode> identities = module.getIdentities();
         assertEquals(1, identities.size());
 
@@ -429,19 +379,6 @@ public class YangParserWithContextTest {
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
         assertNotNull(module);
 
-//        SchemaContext context;
-//        File yangFile = new File(getClass().getResource(
-//                "/types/custom-types-test@2012-4-4.yang").toURI());
-//        File dependenciesDir = new File(getClass().getResource("/ietf").toURI());
-//        YangContextParser parser = new YangParserImpl();
-//        context = parser.parseFile(yangFile, dependenciesDir);
-//
-//        Module module;
-//        try (InputStream stream = new FileInputStream(new File(getClass()
-//                .getResource("/context-test/test3.yang").toURI()))) {
-//            module = TestUtils.loadModuleWithContext("test3", stream, context);
-//        }
-
         ContainerSchemaNode network = (ContainerSchemaNode) module
                 .getDataChildByName("network");
         List<UnknownSchemaNode> unknownNodes = network.getUnknownSchemaNodes();
@@ -522,29 +459,6 @@ public class YangParserWithContextTest {
                 SimpleDateFormatUtil.getRevisionFormat().parse("2013-02-27"));
         assertNotNull(testModule);
 
-        // load first module
-//        SchemaContext context;
-//        String resource = "/model/bar.yang";
-//
-//        try (InputStream stream = new FileInputStream(new File(getClass()
-//                .getResource(resource).toURI()))) {
-//            context = parser.resolveSchemaContext(TestUtils.loadModules(Lists
-//                    .newArrayList(stream)));
-//        }
-
-        // load another modules and parse them against already existing context
-//        Set<Module> modules;
-//        try (InputStream stream = new FileInputStream(new File(getClass()
-//                .getResource("/context-test/deviation-test.yang").toURI()))) {
-//            List<InputStream> input = Lists.newArrayList(stream);
-//            modules = TestUtils.loadModulesWithContext(input, context);
-//        }
-//        assertNotNull(modules);
-
-        // test deviation
-        //Module testModule = TestUtils.findModule(modules, "deviation-test");
-
-
         Set<Deviation> deviations = testModule.getDeviations();
         assertEquals(1, deviations.size());
         Deviation dev = deviations.iterator().next();