commit 800a8e799e96ca48c2d19da6496791fb3a732d83
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Fri Feb 19 12:57:13 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 19 19:55:50 2016 +0000
tree 73131cc0c61746a1f43ca1c3f44c35ddb774f8d9
parent dedf9f8a11e822d424c954278a0476687d3851c3

[ONOS-3880, 3881] Change to static import for lesser indentation.

Change-Id: I93a39f9b0ccd019ace5900bf8ba68f7d60f228a0

src/test/java/org/onosproject/yangutils/parser/parseutils/ListenerValidationTest.java

diff --git a/src/test/java/org/onosproject/yangutils/parser/parseutils/ListenerValidationTest.java b/src/test/java/org/onosproject/yangutils/parser/parseutils/ListenerValidationTest.java
index 85eb48d..d39b0ae 100644
--- a/src/test/java/org/onosproject/yangutils/parser/parseutils/ListenerValidationTest.java
+++ b/src/test/java/org/onosproject/yangutils/parser/parseutils/ListenerValidationTest.java
@@ -20,13 +20,15 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.onosproject.yangutils.datamodel.YangRevision;
-import org.onosproject.yangutils.parser.ParsableDataType;
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation;
+
+import static org.onosproject.yangutils.parser.ParsableDataType.YANGBASE_DATA;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.EXIT;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.MISSING_HOLDER;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation.checkStackIsEmpty;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation.checkStackIsNotEmpty;
 
 /**
  * Test case for testing listener validation util.
@@ -43,9 +45,7 @@
     @Test
     public void validateStackIsNotEmptyForEmptyStack() {
 
-        String expectedError = ListenerErrorMessageConstruction
-                .constructListenerErrorMessage(ListenerErrorType.MISSING_HOLDER, ParsableDataType.YANGBASE_DATA, "",
-                        ListenerErrorLocation.EXIT);
+        String expectedError = constructListenerErrorMessage(MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
 
         // Get the exception occurred during parsing.
         thrown.expect(ParserException.class);
@@ -54,13 +54,12 @@
         // Create test walker and assign test error to it.
         TreeWalkListener testWalker = new TreeWalkListener();
 
-        ListenerValidation.checkStackIsNotEmpty(testWalker, ListenerErrorType.MISSING_HOLDER,
-                ParsableDataType.YANGBASE_DATA, "", ListenerErrorLocation.EXIT);
+        checkStackIsNotEmpty(testWalker, MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
     }
 
     /**
-     * Checks if there is no exception in case parsable stack is not empty while validating
-     * for not empty scenario.
+     * Checks if there is no exception in case parsable stack is not empty while
+     * validating for not empty scenario.
      */
     @Test
     public void validateStackIsNotEmptyForNonEmptyStack() {
@@ -72,8 +71,7 @@
         YangRevision tmpNode = new YangRevision();
         testWalker.getParsedDataStack().push(tmpNode);
 
-        ListenerValidation.checkStackIsNotEmpty(testWalker, ListenerErrorType.MISSING_HOLDER,
-                                                ParsableDataType.YANGBASE_DATA, "", ListenerErrorLocation.EXIT);
+        checkStackIsNotEmpty(testWalker, MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
     }
 
     /**
@@ -83,9 +81,7 @@
     @Test
     public void validateStackIsEmptyForNonEmptyStack() {
 
-        String expectedError = ListenerErrorMessageConstruction
-                .constructListenerErrorMessage(ListenerErrorType.MISSING_HOLDER, ParsableDataType.YANGBASE_DATA, "",
-                        ListenerErrorLocation.EXIT);
+        String expectedError = constructListenerErrorMessage(MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
 
         // Get the exception occurred during parsing.
         thrown.expect(ParserException.class);
@@ -98,13 +94,12 @@
         YangRevision tmpNode = new YangRevision();
         testWalker.getParsedDataStack().push(tmpNode);
 
-        ListenerValidation.checkStackIsEmpty(testWalker, ListenerErrorType.MISSING_HOLDER,
-                                             ParsableDataType.YANGBASE_DATA, "", ListenerErrorLocation.EXIT);
+        checkStackIsEmpty(testWalker, MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
     }
 
     /**
-     * Checks if there is no exception in case parsable stack is empty while validating
-     * for empty scenario.
+     * Checks if there is no exception in case parsable stack is empty while
+     * validating for empty scenario.
      */
     @Test
     public void validateStackIsEmptyForEmptyStack() {
@@ -112,7 +107,6 @@
         // Create test walker and assign test error to it.
         TreeWalkListener testWalker = new TreeWalkListener();
 
-        ListenerValidation.checkStackIsEmpty(testWalker, ListenerErrorType.MISSING_HOLDER,
-                                             ParsableDataType.YANGBASE_DATA, "", ListenerErrorLocation.EXIT);
+        checkStackIsEmpty(testWalker, MISSING_HOLDER, YANGBASE_DATA, "", EXIT);
     }
-}
\ No newline at end of file
+}