Code Review
/
yangtools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
55530eb
)
Clean up openconfig-version test resources
18/86618/1
author
Robert Varga
<robert.varga@pantheon.tech>
Sun, 29 Dec 2019 12:28:39 +0000
(13:28 +0100)
committer
Robert Varga
<robert.varga@pantheon.tech>
Sun, 29 Dec 2019 15:29:08 +0000
(16:29 +0100)
This moves the test resources so they are not scattered across
two directory hierarchies.
Change-Id: I202f415b8f7366047a691f80c1899b6d2875a4a7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
c005231c76c371a4b144993aa90a63d90587925b
)
14 files changed:
yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-03.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-04.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foo.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-01-31.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-02-28.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/openconfig-extensions.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-03.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-04.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foo.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-01-31.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-27.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-28.yang
with 100% similarity]
patch
|
blob
|
history
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang
[moved from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/openconfig-extensions.yang
with 100% similarity]
patch
|
blob
|
history
diff --git
a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
index 221e1f76d200ee3e1d0ed6873113593d9c1ab8be..1c047dd36133c3899dcce5c758c0145629f2925b 100644
(file)
--- a/
yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
+++ b/
yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
@@
-32,7
+32,7
@@
public class OpenconfigVersionComplexTest {
@Test
public void complexTest1Yang1_1() throws Exception {
@Test
public void complexTest1Yang1_1() throws Exception {
- final SchemaContext context = StmtTestUtils.parseYangSources("/
rfc7950/openconfig-version/complex-1
",
+ final SchemaContext context = StmtTestUtils.parseYangSources("/
openconfig-version/complex/complex-1-rfc7950
",
StatementParserMode.SEMVER_MODE);
verifySchemaContextTest1(context);
}
StatementParserMode.SEMVER_MODE);
verifySchemaContextTest1(context);
}
@@
-78,7
+78,7
@@
public class OpenconfigVersionComplexTest {
@Test
public void complexTest2Yang1_1() throws Exception {
@Test
public void complexTest2Yang1_1() throws Exception {
- final SchemaContext context = StmtTestUtils.parseYangSources("/
rfc7950/openconfig-version/complex-2
",
+ final SchemaContext context = StmtTestUtils.parseYangSources("/
openconfig-version/complex/complex-2-rfc7950
",
StatementParserMode.SEMVER_MODE);
verifySchemaContextTest2(context);
}
StatementParserMode.SEMVER_MODE);
verifySchemaContextTest2(context);
}
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-03.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-03.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-04.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/bar@2016-01-04.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foo.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foo.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-01-31.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-01-31.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-02-28.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/foobar@2016-02-28.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/openconfig-extensions.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-1/openconfig-extensions.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-03.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-03.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-04.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/bar@2016-01-04.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foo.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foo.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-01-31.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-01-31.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-27.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-27.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-28.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/foobar@2016-02-28.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang
diff --git
a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/openconfig-extensions.yang
b/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang
similarity index 100%
rename from
yang/yang-parser-rfc7950/src/test/resources/rfc7950/openconfig-version/complex-2/openconfig-extensions.yang
rename to
yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang