Use a real NodeIdentifier instead of mocking, as PathArgument is getting
sealed.
Change-Id: I30a86490a4430226d14a5391ac13e1829fe4ebe5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
public class LazySerializedContainerNodeTest {
@Test
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
public class LazySerializedContainerNodeTest {
@Test
- public void basicTest() throws Exception {
+ public void basicTest() {
final DataObject dataObject = mock(DataObject.class);
final BindingNormalizedNodeSerializer codec = mock(BindingNormalizedNodeSerializer.class);
final ContainerNode containerNode = mock(ContainerNode.class);
final DataObject dataObject = mock(DataObject.class);
final BindingNormalizedNodeSerializer codec = mock(BindingNormalizedNodeSerializer.class);
final ContainerNode containerNode = mock(ContainerNode.class);
codec);
assertNotNull(lazySerializedContainerNode);
assertEquals(leafNode, lazySerializedContainerNode.childByArg(leafNode.getIdentifier()));
codec);
assertNotNull(lazySerializedContainerNode);
assertEquals(leafNode, lazySerializedContainerNode.childByArg(leafNode.getIdentifier()));
- assertNull(lazySerializedContainerNode.childByArg(mock(PathArgument.class)));
+ assertNull(lazySerializedContainerNode.childByArg(new NodeIdentifier(QName.create("", "mismatch"))));
assertTrue(lazySerializedContainerNode.body().isEmpty());
assertSame(name, lazySerializedContainerNode.getIdentifier());
assertTrue(lazySerializedContainerNode.body().isEmpty());
assertSame(name, lazySerializedContainerNode.getIdentifier());
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import com.google.common.collect.ImmutableList;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
public class AbstractRegistrationTreeTest extends AbstractRegistrationTree<Object> {
public class AbstractRegistrationTreeTest extends AbstractRegistrationTree<Object> {
@Test
public void basicTest() throws Exception {
@Test
public void basicTest() throws Exception {
- final PathArgument pathArgument = mock(PathArgument.class);
+ final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument"));
final RegistrationTreeNode<Object> registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeNode<Object> registrationTreeNode =
new RegistrationTreeNode<>(registrationTreeNodeParent, pathArgument);
final Object registration = new Object();
final RegistrationTreeNode<Object> registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeNode<Object> registrationTreeNode =
new RegistrationTreeNode<>(registrationTreeNodeParent, pathArgument);
final Object registration = new Object();
- this.takeLock();
- this.addRegistration(registrationTreeNode, registration);
+ takeLock();
+ addRegistration(registrationTreeNode, registration);
assertTrue(registrationTreeNode.getRegistrations().contains(registration));
assertTrue(registrationTreeNode.getRegistrations().contains(registration));
- this.removeRegistration(registrationTreeNode, registration);
+ removeRegistration(registrationTreeNode, registration);
assertFalse(registrationTreeNode.getRegistrations().contains(registration));
assertFalse(registrationTreeNode.getRegistrations().contains(registration));
- assertNotNull(this.findNodeFor(ImmutableList.of(pathArgument)));
- assertNotNull(this.takeSnapshot());
+ assertNotNull(findNodeFor(List.of(pathArgument)));
+ assertNotNull(takeSnapshot());
- @Test(expected = IllegalMonitorStateException.class)
public void unlockTest() throws Exception {
public void unlockTest() throws Exception {
+ assertThrows(IllegalMonitorStateException.class, this::releaseLock);
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
public class DOMDataTreePrefixTableEntryTest {
public class DOMDataTreePrefixTableEntryTest {
@Test
public void basicTest() throws Exception {
final DOMDataTreePrefixTableEntry<Object> domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<>();
@Test
public void basicTest() throws Exception {
final DOMDataTreePrefixTableEntry<Object> domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<>();
- final PathArgument pathArgument = mock(PathArgument.class);
+ final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument"));
final Object testObject = new Object();
final YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.of(QName.create("", "test"));
final Object testObject = new Object();
final YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.of(QName.create("", "test"));
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import java.util.Collections;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
public class RegistrationTreeNodeTest {
public class RegistrationTreeNodeTest {
@Test
public void basicTest() throws Exception {
@Test
public void basicTest() throws Exception {
- final PathArgument pathArgument = mock(PathArgument.class);
+ final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument"));
final RegistrationTreeNode<Object> registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeNode<Object> registrationTreeNode =
new RegistrationTreeNode<>(registrationTreeNodeParent, pathArgument);
final RegistrationTreeNode<Object> registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeNode<Object> registrationTreeNode =
new RegistrationTreeNode<>(registrationTreeNodeParent, pathArgument);
assertNotNull(registrationTreeNode.getExactChild(pathArgument));
final NodeWithValue<?> nodeWithValue = new NodeWithValue<>(QName.create("", "testNode"), new Object());
assertNotNull(registrationTreeNode.getExactChild(pathArgument));
final NodeWithValue<?> nodeWithValue = new NodeWithValue<>(QName.create("", "testNode"), new Object());
- assertEquals(Collections.emptyList(), registrationTreeNode.getInexactChildren(nodeWithValue));
- assertEquals(Collections.emptyList(), registrationTreeNode.getInexactChildren(pathArgument));
+ assertEquals(List.of(), registrationTreeNode.getInexactChildren(nodeWithValue));
+ assertEquals(List.of(), registrationTreeNode.getInexactChildren(pathArgument));
final NodeIdentifier nodeWithoutValue = new NodeIdentifier(QName.create("", "testNode"));
assertNotNull(registrationTreeNode.ensureChild(nodeWithoutValue));
assertFalse(registrationTreeNode.getInexactChildren(nodeWithValue).isEmpty());
final NodeIdentifier nodeWithoutValue = new NodeIdentifier(QName.create("", "testNode"));
assertNotNull(registrationTreeNode.ensureChild(nodeWithoutValue));
assertFalse(registrationTreeNode.getInexactChildren(nodeWithValue).isEmpty());
- doReturn("TestPathArgument").when(pathArgument).toString();
assertNotNull(registrationTreeNode.toString());
assertTrue(registrationTreeNode.toString().contains(pathArgument.toString()));
}
assertNotNull(registrationTreeNode.toString());
assertTrue(registrationTreeNode.toString().contains(pathArgument.toString()));
}
import java.util.concurrent.locks.Lock;
import org.junit.Test;
import java.util.concurrent.locks.Lock;
import org.junit.Test;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
public class RegistrationTreeSnapshotTest {
public class RegistrationTreeSnapshotTest {
@Test
public void basicTest() throws Exception {
final Lock lock = mock(Lock.class);
@Test
public void basicTest() throws Exception {
final Lock lock = mock(Lock.class);
- final PathArgument pathArgument = mock(PathArgument.class);
+ final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument"));
final RegistrationTreeNode<?> registrationTreeNode = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeSnapshot<?> registrationTreeSnapshot =
new RegistrationTreeSnapshot<>(lock, registrationTreeNode);
final RegistrationTreeNode<?> registrationTreeNode = new RegistrationTreeNode<>(null, pathArgument);
final RegistrationTreeSnapshot<?> registrationTreeSnapshot =
new RegistrationTreeSnapshot<>(lock, registrationTreeNode);