Migrate test asserts

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / impl / YangModelValidationModuleTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationModuleTest.java
index 2edef0f40318202530c0a7ee5b8ed5167120d198..47dce2c29a31a642f469237b071a9e4865c009e1 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationModuleTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationModuleTest.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.parser.impl;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.containsString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -19,8 +20,6 @@ import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtCont
 import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtContext;
 import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtsContext;
 import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
-import org.opendaylight.yangtools.yang.parser.impl.BasicValidations;
-import org.opendaylight.yangtools.yang.parser.impl.YangModelBasicValidationListener;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationModuleTest {
@@ -162,8 +161,8 @@ public class YangModelValidationModuleTest {
         valid.enterYang_version_stmt(ctx);
     }
 
-    private static Revision_stmtContext mockModuleWithRevision(String date,
-            String moduleName) {
+    private static Revision_stmtContext mockModuleWithRevision(final String date,
+            final String moduleName) {
         Revision_stmtContext mockedRev = YangModelValidationTest.mockStatement(
                 Revision_stmtContext.class, date);
         Revision_stmtsContext revs = YangModelValidationTest.mockStatement(