Bump odlparent/yangtools/mdsal

[controller.git] / opendaylight / md-sal / cds-access-api / src / test / java / org / opendaylight / controller / cluster / access / commands / ModifyTransactionRequestTest.java

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java
index d0e8401d985128d19bd4ccb14b46fcc94b0a2d74..7d0164f8674f0fce70e258b6dcb0019862dfd7f5 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.controller.cluster.access.commands;
 
  */
 package org.opendaylight.controller.cluster.access.commands;
 

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;

 import static org.opendaylight.controller.cluster.access.commands.TransactionModification.TYPE_WRITE;
 
 import com.google.common.base.MoreObjects;
 import static org.opendaylight.controller.cluster.access.commands.TransactionModification.TYPE_WRITE;
 
 import com.google.common.base.MoreObjects;


@@ -18,12 +21,13 @@ import org.junit.Test;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;

 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest<ModifyTransactionRequest> {
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest<ModifyTransactionRequest> {

-    private static final NormalizedNode<?, ?> NODE = Builders.containerBuilder().withNodeIdentifier(
-            YangInstanceIdentifier.NodeIdentifier.create(QName.create("namespace", "localName"))).build();
+    private static final ContainerNode NODE = Builders.containerBuilder().withNodeIdentifier(
+            NodeIdentifier.create(QName.create("namespace", "localName"))).build();

 
     private static final List<TransactionModification> MODIFICATIONS = Lists.newArrayList(
             new TransactionWrite(YangInstanceIdentifier.empty(), NODE));
 
     private static final List<TransactionModification> MODIFICATIONS = Lists.newArrayList(
             new TransactionWrite(YangInstanceIdentifier.empty(), NODE));


@@ -41,22 +45,22 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest
     @Test
     public void getPersistenceProtocolTest() {
         final Optional<PersistenceProtocol> result = OBJECT.getPersistenceProtocol();
     @Test
     public void getPersistenceProtocolTest() {
         final Optional<PersistenceProtocol> result = OBJECT.getPersistenceProtocol();

-        Assert.assertTrue(result.isPresent());
-        Assert.assertEquals(PROTOCOL, result.get());
+        assertTrue(result.isPresent());
+        assertEquals(PROTOCOL, result.get());

     }
 
     @Test
     public void getModificationsTest() {
         final List<TransactionModification> result = OBJECT.getModifications();
     }
 
     @Test
     public void getModificationsTest() {
         final List<TransactionModification> result = OBJECT.getModifications();

-        Assert.assertNotNull(result);
-        Assert.assertEquals(MODIFICATIONS, result);
+        assertNotNull(result);
+        assertEquals(MODIFICATIONS, result);

     }
 
     @Test
     public void addToStringAttributesTest() {
         final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT));
     }
 
     @Test
     public void addToStringAttributesTest() {
         final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT));

-        Assert.assertTrue(result.toString().contains("modifications=1"));
-        Assert.assertTrue(result.toString().contains("protocol=" + PROTOCOL));
+        assertTrue(result.toString().contains("modifications=1"));
+        assertTrue(result.toString().contains("protocol=" + PROTOCOL));

     }
 
     @Test
     }
 
     @Test


@@ -67,16 +71,16 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest
 
     @Override
     protected void doAdditionalAssertions(final Object deserialize) {
 
     @Override
     protected void doAdditionalAssertions(final Object deserialize) {

-        Assert.assertTrue(deserialize instanceof ModifyTransactionRequest);
+        assertTrue(deserialize instanceof ModifyTransactionRequest);

         final ModifyTransactionRequest casted = (ModifyTransactionRequest) deserialize;
 
         final ModifyTransactionRequest casted = (ModifyTransactionRequest) deserialize;
 

-        Assert.assertEquals(OBJECT.getReplyTo(), casted.getReplyTo());
-        Assert.assertEquals(OBJECT.getPersistenceProtocol(), casted.getPersistenceProtocol());
+        assertEquals(OBJECT.getReplyTo(), casted.getReplyTo());
+        assertEquals(OBJECT.getPersistenceProtocol(), casted.getPersistenceProtocol());

 
 

-        Assert.assertNotNull(casted.getModifications());
-        Assert.assertEquals(1, casted.getModifications().size());
+        assertNotNull(casted.getModifications());
+        assertEquals(1, casted.getModifications().size());

         final TransactionModification modification = casted.getModifications().get(0);
         final TransactionModification modification = casted.getModifications().get(0);

-        Assert.assertEquals(YangInstanceIdentifier.empty(), modification.getPath());
-        Assert.assertEquals(TYPE_WRITE, modification.getType());
+        assertEquals(YangInstanceIdentifier.empty(), modification.getPath());
+        assertEquals(TYPE_WRITE, modification.getType());

     }
 }
     }
 }