From 74adbcf9aa2c1d0c69773de563e83989364e0957 Mon Sep 17 00:00:00 2001 From: Peter Suna Date: Fri, 29 Jul 2022 16:21:19 +0200 Subject: [PATCH] Add test for statement prerequisites and materialization Add test to Building SchemaContext when augmenting submodel container with unique leafs inside list. JIRA: YANGTOOLS-1434 Change-Id: I8e1984bc00ca94f72a264d20925ab55721cb0ccc Signed-off-by: Peter Suna Signed-off-by: Robert Varga --- .../yangtools/yang/stmt/YT1434Test.java | 6 +++++ .../resources/bugs/YT1434/main-module.yang | 9 +++++++ .../test/resources/bugs/YT1434/submodule.yang | 8 +++++++ .../test/resources/bugs/YT1434/test-bug.yang | 24 +++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/main-module.yang create mode 100644 parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/submodule.yang create mode 100644 parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/test-bug.yang diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1434Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1434Test.java index 44123b7799..418c71ced4 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1434Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1434Test.java @@ -19,4 +19,10 @@ public class YT1434Test extends AbstractYangTest { public void testUniqueViaUses() { assertEffectiveModel("/bugs/YT1434/bar.yang"); } + + @Test + public void testUniqueViaSubmoduleUses() { + assertEffectiveModel("/bugs/YT1434/main-module.yang", "/bugs/YT1434/submodule.yang", + "/bugs/YT1434/test-bug.yang"); + } } diff --git a/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/main-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/main-module.yang new file mode 100644 index 0000000000..a7362dabef --- /dev/null +++ b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/main-module.yang @@ -0,0 +1,9 @@ +module main-module { + yang-version 1.1; + namespace "main:module"; + prefix mm; + include submodule; + include test-bug; + + revision 2020-02-04; +} diff --git a/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/submodule.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/submodule.yang new file mode 100644 index 0000000000..b1e7e0a0ea --- /dev/null +++ b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/submodule.yang @@ -0,0 +1,8 @@ +submodule submodule { + yang-version 1.1; + belongs-to main-module { + prefix mm; + } + + container services; +} diff --git a/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/test-bug.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/test-bug.yang new file mode 100644 index 0000000000..5664c0dc0b --- /dev/null +++ b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1434/test-bug.yang @@ -0,0 +1,24 @@ +submodule test-bug { + yang-version 1.1; + belongs-to main-module { + prefix mm; + } + + augment "/mm:services" { + container plan-notifications { + list subscription { + key name; + unique "service-type component-type"; + leaf name { + type string; + } + leaf service-type { + type string; + } + leaf component-type { + type string; + } + } + } + } +} -- 2.36.6