assertThat() is part of Hamcrest, migrate legacy junit reference to its
MatcherAssert equivalent.
Change-Id: I837f6c5367bc662bdeaea20ec9073f66241c77e6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
package org.opendaylight.yangtools.yang.parser.impl;
import static org.hamcrest.CoreMatchers.instanceOf;
package org.opendaylight.yangtools.yang.parser.impl;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import java.util.Iterator;
import java.util.List;
import java.util.Iterator;
import java.util.List;
assertFalse(it.hasNext());
}
assertFalse(it.hasNext());
}
- private static void assertFooContainerReferences(DeclaredStatement<?> foo) {
+ private static void assertFooContainerReferences(final DeclaredStatement<?> foo) {
assertReference(foo, YangStmtMapping.CONTAINER, 13, 3);
final Iterator<? extends DeclaredStatement<?>> it = foo.declaredSubstatements().iterator();
assertReference(foo, YangStmtMapping.CONTAINER, 13, 3);
final Iterator<? extends DeclaredStatement<?>> it = foo.declaredSubstatements().iterator();
assertFalse(it.hasNext());
}
assertFalse(it.hasNext());
}
- private static void assertDeprLeafListReferences(DeclaredStatement<?> depr) {
+ private static void assertDeprLeafListReferences(final DeclaredStatement<?> depr) {
assertReference(depr, YangStmtMapping.LEAF_LIST, 28, 3);
final Iterator<? extends DeclaredStatement<?>> it = depr.declaredSubstatements().iterator();
assertReference(depr, YangStmtMapping.LEAF_LIST, 28, 3);
final Iterator<? extends DeclaredStatement<?>> it = depr.declaredSubstatements().iterator();
assertFalse(it.hasNext());
}
assertFalse(it.hasNext());
}
- private static void assertObsoTypedefReferences(DeclaredStatement<?> obso) {
+ private static void assertObsoTypedefReferences(final DeclaredStatement<?> obso) {
assertReference(obso, YangStmtMapping.TYPEDEF, 40, 3);
final Iterator<? extends DeclaredStatement<?>> it = obso.declaredSubstatements().iterator();
assertReference(obso, YangStmtMapping.TYPEDEF, 40, 3);
final Iterator<? extends DeclaredStatement<?>> it = obso.declaredSubstatements().iterator();