From: Robert Varga Date: Thu, 18 May 2023 06:25:01 +0000 (+0200) Subject: Do not mock YangInstanceIdentifier.PathArgument X-Git-Tag: v12.0.0~125 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b63b01f091cff578f9ae4caf7f615e754b38f664;p=mdsal.git Do not mock YangInstanceIdentifier.PathArgument Use a real NodeIdentifier instead of mocking, as PathArgument is getting sealed. Change-Id: I30a86490a4430226d14a5391ac13e1829fe4ebe5 Signed-off-by: Robert Varga --- diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNodeTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNodeTest.java index 6d3599c8d5..f29001f97b 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNodeTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNodeTest.java @@ -25,14 +25,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll 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 - 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); @@ -53,7 +52,7 @@ public class LazySerializedContainerNodeTest { 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()); diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java index 83635854b5..9656d7a720 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java @@ -9,37 +9,37 @@ package org.opendaylight.mdsal.dom.spi; 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.mockito.Mockito.mock; -import com.google.common.collect.ImmutableList; +import java.util.List; 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 AbstractRegistrationTreeTest extends AbstractRegistrationTree { - @Test public void basicTest() throws Exception { - final PathArgument pathArgument = mock(PathArgument.class); + final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument")); final RegistrationTreeNode registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument); final RegistrationTreeNode 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)); - this.releaseLock(); + releaseLock(); - this.removeRegistration(registrationTreeNode, registration); + removeRegistration(registrationTreeNode, 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) + @Test public void unlockTest() throws Exception { - this.releaseLock(); + assertThrows(IllegalMonitorStateException.class, this::releaseLock); } } diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntryTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntryTest.java index 8fb54f81ef..f050b20c59 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntryTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntryTest.java @@ -9,19 +9,17 @@ package org.opendaylight.mdsal.dom.spi; 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.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; public class DOMDataTreePrefixTableEntryTest { - @Test public void basicTest() throws Exception { final DOMDataTreePrefixTableEntry 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")); diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java index 09350a224b..6e0d10c858 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java @@ -11,21 +11,17 @@ import static org.junit.Assert.assertEquals; 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 java.util.List; 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 { - @Test public void basicTest() throws Exception { - final PathArgument pathArgument = mock(PathArgument.class); + final NodeIdentifier pathArgument = new NodeIdentifier(QName.create("", "pathArgument")); final RegistrationTreeNode registrationTreeNodeParent = new RegistrationTreeNode<>(null, pathArgument); final RegistrationTreeNode registrationTreeNode = new RegistrationTreeNode<>(registrationTreeNodeParent, pathArgument); @@ -44,14 +40,13 @@ public class RegistrationTreeNodeTest { 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()); - doReturn("TestPathArgument").when(pathArgument).toString(); assertNotNull(registrationTreeNode.toString()); assertTrue(registrationTreeNode.toString().contains(pathArgument.toString())); } diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeSnapshotTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeSnapshotTest.java index 27be18a4a2..1903bbf8db 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeSnapshotTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeSnapshotTest.java @@ -15,14 +15,14 @@ import static org.mockito.Mockito.verify; 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 { - @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);