[ONOS-7331] YANG Runtime: Add UT to validate te-scheduler based anydata.
Change-Id: I73f68b1a1f083bc8daf98e998f7aa1e1d851dd54
diff --git a/serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java b/serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java
index 081ade2..6c96fec 100644
--- a/serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java
+++ b/serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java
@@ -62,7 +62,7 @@
private static YangSerializerContext context;
private static YangSerializer jsonSerializer;
- private static String outputIdTestJson = "{\"identity-test:con\":{\"inte" +
+ private static String outputIdTestJson = "{\"identity-test:con1\":{\"inte" +
"rface\":\"identity-types:physical\",\"interfaces\":{\"int-list" +
"\":[{\"iden\":\"identity-types-second:virtual\",\"available\":" +
"{\"ll\":[\"Loopback:identity-types\",\"Giga:identity-test\",\"" +
diff --git a/serializers/json/src/test/resources/id-test1.json b/serializers/json/src/test/resources/id-test1.json
index 95aabb9..b1ac531 100644
--- a/serializers/json/src/test/resources/id-test1.json
+++ b/serializers/json/src/test/resources/id-test1.json
@@ -1,5 +1,5 @@
{
- "identity-test:con": {
+ "identity-test:con1": {
"identity-test:interface": "identity-types:physical",
"identity-test:interfaces": {
"int-list": [
diff --git a/serializers/json/src/test/resources/id-test2.json b/serializers/json/src/test/resources/id-test2.json
index 296c4e9..bc1aba0 100644
--- a/serializers/json/src/test/resources/id-test2.json
+++ b/serializers/json/src/test/resources/id-test2.json
@@ -1,5 +1,5 @@
{
- "identity-test:con": {
+ "identity-test:con1": {
"identity-test:interface": "physical"
}
}
\ No newline at end of file
diff --git a/serializers/json/src/test/resources/identity-test.yang b/serializers/json/src/test/resources/identity-test.yang
index 960e1ef..20d4241 100644
--- a/serializers/json/src/test/resources/identity-test.yang
+++ b/serializers/json/src/test/resources/identity-test.yang
@@ -37,7 +37,7 @@
leaf l {
type string;
}
- container con {
+ container con1 {
leaf interface {
type identityref {
base "type:int-type";
diff --git a/serializers/xml/src/test/java/org/onosproject/yang/serializers/xml/XmlSerializerTest.java b/serializers/xml/src/test/java/org/onosproject/yang/serializers/xml/XmlSerializerTest.java
index 4d92437..fe5f4ce 100644
--- a/serializers/xml/src/test/java/org/onosproject/yang/serializers/xml/XmlSerializerTest.java
+++ b/serializers/xml/src/test/java/org/onosproject/yang/serializers/xml/XmlSerializerTest.java
@@ -63,7 +63,7 @@
private static YangSerializerContext context;
private static YangSerializer xmlSerializer;
private static String idXml = "<test xmlns=\"identity:ns:test:json:ser" +
- "\"><con><interface xmlns:yangid=\"identity:list:ns:test:jso" +
+ "\"><con1><interface xmlns:yangid=\"identity:list:ns:test:jso" +
"n:ser\">yangid:physical</interface><interfaces><int-list><ide" +
"n xmlns:yangid=\"identity:list:second:ns:test:json:ser\">ya" +
"ngid:virtual</iden><available><ll xmlns:yangid=\"identity:li" +
@@ -71,8 +71,8 @@
"\"identity:ns:test:json:ser\">yangid:Giga</ll><ll xmlns:yan" +
"gid=\"identity:list:second:ns:test:json:ser\">yangid:Ether" +
"net</ll></available></int-list><int-list><iden>optical</iden><av" +
- "ailable><ll>Giga</ll></available></int-list></interfaces></con><" +
- "/test>";
+ "ailable><ll>Giga</ll></available></int-list></interfaces></con1" +
+ "></test>";
@Rule
public ExpectedException thrown = ExpectedException.none();
diff --git a/serializers/xml/src/test/resources/id-test.xml b/serializers/xml/src/test/resources/id-test.xml
index ab3308b..9d7f639 100644
--- a/serializers/xml/src/test/resources/id-test.xml
+++ b/serializers/xml/src/test/resources/id-test.xml
@@ -1,5 +1,5 @@
<test xmlns="identity:ns:test:json:ser" operation="create">
- <con>
+ <con1>
<interface xmlns:types="identity:list:ns:test:json:ser">types:physical</interface>
<interfaces>
<int-list>
@@ -17,5 +17,5 @@
</available>
</int-list>
</interfaces>
- </con>
+ </con1>
</test>
\ No newline at end of file
diff --git a/serializers/xml/src/test/resources/id-test2.xml b/serializers/xml/src/test/resources/id-test2.xml
index be15bc9..4c303f0 100644
--- a/serializers/xml/src/test/resources/id-test2.xml
+++ b/serializers/xml/src/test/resources/id-test2.xml
@@ -7,7 +7,7 @@
-->
<test xmlns="identity:ns:test:json:ser" operation="create">
- <con>
+ <con1>
<interface>physical</interface>
- </con>
+ </con1>
</test>
\ No newline at end of file
diff --git a/serializers/xml/src/test/resources/identity-test.yang b/serializers/xml/src/test/resources/identity-test.yang
index 960e1ef..20d4241 100644
--- a/serializers/xml/src/test/resources/identity-test.yang
+++ b/serializers/xml/src/test/resources/identity-test.yang
@@ -37,7 +37,7 @@
leaf l {
type string;
}
- container con {
+ container con1 {
leaf interface {
type identityref {
base "type:int-type";