X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fcommands%2FModifyTransactionRequestTest.java;h=7d0164f8674f0fce70e258b6dcb0019862dfd7f5;hb=bc508ecac8deace58bf77a40124fc01e579db73c;hp=4e32c4a8537d2ce7dbc2c75b97884ba5df74fff5;hpb=f3000e5c03ea8836ac929c98497b4dd34057c356;p=controller.git

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 4e32c4a853..7d0164f867 100644
--- 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;
 
+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;
@@ -18,15 +21,16 @@ 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.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> {
-    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));
+            new TransactionWrite(YangInstanceIdentifier.empty(), NODE));
 
     private static final PersistenceProtocol PROTOCOL = PersistenceProtocol.ABORT;
 
@@ -39,44 +43,44 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest
     }
 
     @Test
-    public void getPersistenceProtocolTest() throws Exception {
+    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() throws Exception {
+    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));
-        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
-    public void cloneAsVersionTest() throws Exception {
+    public void cloneAsVersionTest() {
         final ModifyTransactionRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON);
         Assert.assertEquals(OBJECT, clone);
     }
 
     @Override
     protected void doAdditionalAssertions(final Object deserialize) {
-        Assert.assertTrue(deserialize instanceof ModifyTransactionRequest);
+        assertTrue(deserialize instanceof ModifyTransactionRequest);
         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);
-        Assert.assertEquals(YangInstanceIdentifier.EMPTY, modification.getPath());
-        Assert.assertEquals(TYPE_WRITE, modification.getType());
+        assertEquals(YangInstanceIdentifier.empty(), modification.getPath());
+        assertEquals(TYPE_WRITE, modification.getType());
     }
-}
\ No newline at end of file
+}