commit e68bb1912b8d1dd9ae8b96057a57ab84135236bb
author Vidyashree Rama <vidyashree.rama@huawei.com> Tue Mar 15 10:18:25 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 21 19:21:23 2016 +0000
tree 194b55d4b8ea79c528ba486c3fea6f7e201bf1e6
parent c555302414f9ea8ed92d78710d02234cacaf85ea

string issue fix for few yang construct like config, mandatory + allowing yang constructs as identifers and string

Change-Id: I8dd01dc60d280a843b0a485681caa6bfcac013c2

src/test/java/org/onosproject/yangutils/parser/impl/listeners/ConfigListenerTest.java

diff --git a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/ConfigListenerTest.java b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/ConfigListenerTest.java
index fe20cad..7e693d5 100644
--- a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/ConfigListenerTest.java
+++ b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/ConfigListenerTest.java
@@ -115,7 +115,7 @@
     @Test
     public void processConfigInvalidValue() throws IOException, ParserException {
         thrown.expect(ParserException.class);
-        thrown.expectMessage("mismatched input 'invalid' expecting {'false', 'true'}");
+        thrown.expectMessage("YANG file error : config value invalid is not valid.");
         YangNode node = manager.getDataModel("src/test/resources/ConfigInvalidValue.yang");
     }
 
@@ -125,7 +125,7 @@
     @Test
     public void processConfigEmptyValue() throws IOException, ParserException {
         thrown.expect(ParserException.class);
-        thrown.expectMessage("missing {'false', 'true'} at ';'");
+        thrown.expectMessage("no viable alternative at input ';'");
         YangNode node = manager.getDataModel("src/test/resources/ConfigEmptyValue.yang");
     }
 

src/test/java/org/onosproject/yangutils/parser/impl/listeners/MandatoryListenerTest.java

diff --git a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MandatoryListenerTest.java b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MandatoryListenerTest.java
index 05ee69a..bc27dad 100644
--- a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MandatoryListenerTest.java
+++ b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MandatoryListenerTest.java
@@ -126,7 +126,7 @@
     @Test
     public void processMandatoryEmptyStatement() throws IOException, ParserException {
         thrown.expect(ParserException.class);
-        thrown.expectMessage("missing {'false', 'true'} at ';'");
+        thrown.expectMessage("no viable alternative at input ';'");
         YangNode node = manager.getDataModel("src/test/resources/MandatoryEmptyStatement.yang");
     }
 

src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java

diff --git a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
index b197557..7f4a6f6 100644
--- a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
+++ b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
@@ -111,7 +111,7 @@
     @Test
     public void processMinElementsInvalidValue() throws IOException, ParserException {
         thrown.expect(ParserException.class);
-        thrown.expectMessage("mismatched input 'asd' expecting INTEGER");
+        thrown.expectMessage("YANG file error : min-elements value asd is not valid.");
         YangNode node = manager.getDataModel("src/test/resources/MinElementsInvalidValue.yang");
     }
 

src/test/java/org/onosproject/yangutils/parser/impl/listeners/StatusListenerTest.java

diff --git a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/StatusListenerTest.java b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/StatusListenerTest.java
index 6850425..984b0f2 100644
--- a/src/test/java/org/onosproject/yangutils/parser/impl/listeners/StatusListenerTest.java
+++ b/src/test/java/org/onosproject/yangutils/parser/impl/listeners/StatusListenerTest.java
@@ -141,7 +141,7 @@
     @Test
     public void processStatusInvalidValue() throws IOException, ParserException {
         thrown.expect(ParserException.class);
-        thrown.expectMessage("mismatched input 'invalid' expecting {'current', 'deprecated', 'obsolete'}");
+        thrown.expectMessage("Invalid content in status \"invalid\" before processing.");
         YangNode node = manager.getDataModel("src/test/resources/StatusInvalidValue.yang");
     }