commit | 0c32d71d3fd43cd6ae3b33d08a04b758c917faac | [log] [tgz] |
---|---|---|
author | chengfan <chengfannature@gmail.com> | Tue Oct 11 21:03:23 2016 +0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Thu Nov 10 19:42:48 2016 +0000 |
tree | bff4c03179b0fa1e02355e3b69cf442146478332 | |
parent | 528007c085b2a62190ccb817318a9ea7b9077eac [diff] |
Mock YdtBuilder and YdtNode to do UT for Restconf fix the java code problems. add more test cases Change-Id: I034d35e8a41a6c12e293fad867d6540dd5f37e95
diff --git a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java index 7c59e11..1118116 100755 --- a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java +++ b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
@@ -110,21 +110,26 @@ @Override public void exitJsonNode(JsonNode jsonNode) { - if (jsonNode.getNodeType() == ARRAY && nameStack.empty()) { + + if (isListArray) { + isListArray = false; + ydtBuilder.traverseToParent(); return; } - if (jsonNode.getNodeType() == ARRAY && !isListArray) { + if (jsonNode.getNodeType() == ARRAY) { + //check empty before pop + if (nameStack.empty()) { + return; + } nameStack.pop(); + //check empty after pop if (nameStack.empty()) { return; } defaultMultiInsNode = nameStack.get(nameStack.size() - 1); return; } - if (isListArray) { - isListArray = false; - } ydtBuilder.traverseToParent(); }