Bug 7847: Implement YANG 1.1 XPath functions in YangFunctionContext

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
index d772e493c183ebcdf56b43702081b0b8b97134fd..0afba1b61f40d4b9d70de23083289be9e292278b 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
@@ -7,19 +7,19 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
-import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
 
 public class ListKeysTest {
@@ -27,11 +27,10 @@ public class ListKeysTest {
     @Test
     public void correctListKeysTest() throws ReactorException {
 
-        final YangStatementSourceImpl yangFile = new YangStatementSourceImpl(
-                "/list-keys-test/correct-list-keys-test.yang", false);
+        final StatementStreamSource yangFile = sourceForResource("/list-keys-test/correct-list-keys-test.yang");
 
         CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        addSources(reactor, yangFile);
+        reactor.addSources(yangFile);
 
         final EffectiveSchemaContext result = reactor.buildEffective();
         assertNotNull(result);
@@ -40,80 +39,69 @@ public class ListKeysTest {
     @Test
     public void incorrectListKeysTest1() throws IOException, YangSyntaxErrorException, URISyntaxException {
 
-        final YangStatementSourceImpl yangFile = new YangStatementSourceImpl(
-                "/list-keys-test/incorrect-list-keys-test.yang", false);
+        final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test.yang");
 
         CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        addSources(reactor, yangFile);
+        reactor.addSources(yangFile);
 
         try {
             reactor.buildEffective();
             fail("effective build should fail due to list instead of leaf referenced in list key");
         } catch (Exception e) {
-            assertEquals(InferenceException.class, e.getClass());
-            assertTrue(e.getMessage().startsWith("Key 'test1_key1 test1_key2' misses node 'test1_key2'"));
+            assertTrue(e instanceof ReactorException);
+            assertTrue(e.getCause().getMessage().startsWith("Key 'test1_key1 test1_key2' misses node 'test1_key2'"));
         }
     }
 
     @Test
     public void incorrectListKeysTest2() throws IOException, YangSyntaxErrorException, URISyntaxException {
 
-        final YangStatementSourceImpl yangFile = new YangStatementSourceImpl(
-                "/list-keys-test/incorrect-list-keys-test2.yang", false);
+        final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test2.yang");
 
         CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        addSources(reactor, yangFile);
+        reactor.addSources(yangFile);
 
         try {
             reactor.buildEffective();
             fail("effective build should fail due to missing leaf referenced in list key");
         } catch (Exception e) {
-            assertEquals(InferenceException.class, e.getClass());
-            assertTrue(e.getMessage().startsWith("Key 'test1_key1 test1_key2' misses node 'test1_key2'"));
+            assertTrue(e instanceof ReactorException);
+            assertTrue(e.getCause().getMessage().startsWith("Key 'test1_key1 test1_key2' misses node 'test1_key2'"));
         }
     }
 
     @Test
     public void incorrectListKeysTest3() throws IOException, YangSyntaxErrorException, URISyntaxException {
 
-        final YangStatementSourceImpl yangFile = new YangStatementSourceImpl(
-                "/list-keys-test/incorrect-list-keys-test3.yang", false);
+        final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test3.yang");
 
         CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        addSources(reactor, yangFile);
+        reactor.addSources(yangFile);
 
         try {
             reactor.buildEffective();
             fail("effective build should fail due to list instead of leaf in grouping referenced in list key");
         } catch (Exception e) {
-            assertEquals(InferenceException.class, e.getClass());
-            assertTrue(e.getMessage().startsWith("Key 'grp_list' misses node 'grp_list'"));
+            assertTrue(e instanceof ReactorException);
+            assertTrue(e.getCause().getMessage().startsWith("Key 'grp_list' misses node 'grp_list'"));
         }
     }
 
     @Test
     public void incorrectListKeysTest4() throws IOException, YangSyntaxErrorException, URISyntaxException {
 
-        final YangStatementSourceImpl yangFile = new YangStatementSourceImpl(
-                "/list-keys-test/incorrect-list-keys-test4.yang", false);
+        final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test4.yang");
 
         CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        addSources(reactor, yangFile);
+        reactor.addSources(yangFile);
 
         try {
             reactor.buildEffective();
             fail("effective build should fail due to list instead of leaf in grouping augmented to list referenced " +
                     "in list key");
         } catch (Exception e) {
-            assertEquals(InferenceException.class, e.getClass());
-            assertTrue(e.getMessage().startsWith("Key 'grp_leaf' misses node 'grp_leaf'"));
-        }
-    }
-
-    private static void addSources(final CrossSourceStatementReactor.BuildAction reactor,
-                                   final YangStatementSourceImpl... sources) {
-        for (YangStatementSourceImpl source : sources) {
-            reactor.addSource(source);
+            assertTrue(e instanceof ReactorException);
+            assertTrue(e.getCause().getMessage().startsWith("Key 'grp_leaf' misses node 'grp_leaf'"));
         }
     }
 }