DataBrokerTestModule: use AbstractDataBrokerTest without inheritance

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / test / Mdsal298Test.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Mdsal298Test.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Mdsal298Test.java
index e4dfc2a103d3c1530c08871aee1037e97daff1f6..a42a820adfd9d8ac3a628c10577f827d26bbf061 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Mdsal298Test.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Mdsal298Test.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -16,7 +16,6 @@ import static org.mockito.Mockito.verify;
 import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -96,11 +95,11 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
             Builders.orderedMapBuilder()
             .withNodeIdentifier(new NodeIdentifier(Keyed.QNAME))
             .addChild(Builders.mapEntryBuilder()
-                .withNodeIdentifier(new NodeIdentifierWithPredicates(Keyed.QNAME, ImmutableMap.of(FOO_QNAME, "foo")))
+                .withNodeIdentifier(NodeIdentifierWithPredicates.of(Keyed.QNAME, FOO_QNAME, "foo"))
                 .addChild(ImmutableNodes.leafNode(FOO_QNAME, "foo"))
                 .build())
             .addChild(Builders.mapEntryBuilder()
-                .withNodeIdentifier(new NodeIdentifierWithPredicates(Keyed.QNAME, ImmutableMap.of(FOO_QNAME, "bar")))
+                .withNodeIdentifier(NodeIdentifierWithPredicates.of(Keyed.QNAME, FOO_QNAME, "bar"))
                 .addChild(ImmutableNodes.leafNode(FOO_QNAME, "bar"))
                 .build())
             .build());
@@ -114,20 +113,20 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         final DataTreeModification<Container> change = capture.iterator().next();
         assertEquals(CONTAINER_TID, change.getRootPath());
         final DataObjectModification<Container> changedContainer = change.getRootNode();
-        assertEquals(new Item<>(Container.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(Container.class), changedContainer.getIdentifier());
         assertEquals(ModificationType.SUBTREE_MODIFIED, changedContainer.getModificationType());
 
         final Container containerAfter = changedContainer.getDataAfter();
         assertEquals(new ContainerBuilder()
             .setKeyed(ImmutableList.of(
-                new KeyedBuilder().setFoo("foo").setKey(new KeyedKey("foo")).build(),
-                new KeyedBuilder().setFoo("bar").setKey(new KeyedKey("bar")).build()))
+                new KeyedBuilder().setFoo("foo").withKey(new KeyedKey("foo")).build(),
+                new KeyedBuilder().setFoo("bar").withKey(new KeyedKey("bar")).build()))
             .build(), containerAfter);
 
-        final Collection<DataObjectModification<?>> changedChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> changedChildren = changedContainer.getModifiedChildren();
         assertEquals(2, changedChildren.size());
 
-        final Iterator<DataObjectModification<?>> it = changedChildren.iterator();
+        final Iterator<? extends DataObjectModification<?>> it = changedChildren.iterator();
         final DataObjectModification<?> changedChild1 = it.next();
         assertEquals(ModificationType.WRITE, changedChild1.getModificationType());
         assertEquals(Collections.emptyList(), changedChild1.getModifiedChildren());
@@ -169,7 +168,7 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         final DataTreeModification<Container> change = capture.iterator().next();
         assertEquals(CONTAINER_TID, change.getRootPath());
         final DataObjectModification<Container> changedContainer = change.getRootNode();
-        assertEquals(new Item<>(Container.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(Container.class), changedContainer.getIdentifier());
         assertEquals(ModificationType.WRITE, changedContainer.getModificationType());
 
         final Container containerAfter = changedContainer.getDataAfter();
@@ -179,7 +178,7 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
                     new UnkeyedBuilder().setFoo("bar").build()))
                 .build(), containerAfter);
 
-        final Collection<DataObjectModification<?>> changedChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> changedChildren = changedContainer.getModifiedChildren();
         assertEquals(0, changedChildren.size());
     }
 
@@ -202,15 +201,15 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         assertEquals(CHOICE_CONTAINER_TID, choiceChange.getRootPath());
         final DataObjectModification<WithChoice> changedContainer = choiceChange.getRootNode();
         assertEquals(ModificationType.SUBTREE_MODIFIED, changedContainer.getModificationType());
-        assertEquals(new Item<>(WithChoice.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(WithChoice.class), changedContainer.getIdentifier());
 
-        final Collection<DataObjectModification<?>> choiceChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> choiceChildren = changedContainer.getModifiedChildren();
         assertEquals(1, choiceChildren.size());
 
         final DataObjectModification<Addressable> changedCase = (DataObjectModification<Addressable>) choiceChildren
                 .iterator().next();
         assertEquals(ModificationType.WRITE, changedCase.getModificationType());
-        assertEquals(new Item<>(Addressable.class), changedCase.getIdentifier());
+        assertEquals(Item.of(Addressable.class), changedCase.getIdentifier());
         assertEquals(new AddressableBuilder().build(), changedCase.getDataAfter());
     }
 
@@ -235,15 +234,15 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         assertEquals(ADDRESSABLE_CONTAINER_TID, contChange.getRootPath());
         final DataObjectModification<AddressableCont> changedContainer = contChange.getRootNode();
         assertEquals(ModificationType.SUBTREE_MODIFIED, changedContainer.getModificationType());
-        assertEquals(new Item<>(AddressableCont.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(AddressableCont.class), changedContainer.getIdentifier());
 
-        final Collection<DataObjectModification<?>> contChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> contChildren = changedContainer.getModifiedChildren();
         assertEquals(1, contChildren.size());
 
         final DataObjectModification<Addressable> changedChild = (DataObjectModification<Addressable>) contChildren
                 .iterator().next();
         assertEquals(ModificationType.WRITE, changedChild.getModificationType());
-        assertEquals(new Item<>(AddressableChild.class), changedChild.getIdentifier());
+        assertEquals(Item.of(AddressableChild.class), changedChild.getIdentifier());
         assertEquals(new AddressableChildBuilder().build(), changedChild.getDataAfter());
     }
 
@@ -269,9 +268,9 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         assertEquals(UNADDRESSABLE_CONTAINER_TID, contChange.getRootPath());
         final DataObjectModification<UnaddressableCont> changedContainer = contChange.getRootNode();
         assertEquals(ModificationType.WRITE, changedContainer.getModificationType());
-        assertEquals(new Item<>(UnaddressableCont.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(UnaddressableCont.class), changedContainer.getIdentifier());
 
-        final Collection<DataObjectModification<?>> contChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> contChildren = changedContainer.getModifiedChildren();
         assertEquals(0, contChildren.size());
     }
 
@@ -303,9 +302,9 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
 
         // Should be write
         assertEquals(ModificationType.WRITE, changedContainer.getModificationType());
-        assertEquals(new Item<>(WithChoice.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(WithChoice.class), changedContainer.getIdentifier());
 
-        final Collection<DataObjectModification<?>> choiceChildren = changedContainer.getModifiedChildren();
+        final Collection<? extends DataObjectModification<?>> choiceChildren = changedContainer.getModifiedChildren();
         assertEquals(0, choiceChildren.size());
     }
 
@@ -333,7 +332,7 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         assertEquals(dti, change.getRootPath());
         final DataObjectModification<T> changedContainer = change.getRootNode();
         assertEquals(ModificationType.WRITE, changedContainer.getModificationType());
-        assertEquals(new Item<>(bindingClass), changedContainer.getIdentifier());
+        assertEquals(Item.of(bindingClass), changedContainer.getIdentifier());
 
         final T containerAfter = changedContainer.getDataAfter();
         assertEquals(expected, containerAfter);
@@ -369,7 +368,7 @@ public class Mdsal298Test extends AbstractDataBrokerTest {
         assertEquals(CHOICE_CONTAINER_TID, change.getRootPath());
         final DataObjectModification<WithChoice> changedContainer = change.getRootNode();
         assertEquals(ModificationType.WRITE, changedContainer.getModificationType());
-        assertEquals(new Item<>(WithChoice.class), changedContainer.getIdentifier());
+        assertEquals(Item.of(WithChoice.class), changedContainer.getIdentifier());
 
         final WithChoice containerAfter = changedContainer.getDataAfter();
         assertEquals(new WithChoiceBuilder().build(), containerAfter);