X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fpersisted%2FShardDataTreeSnapshotTest.java;h=9c50f1669c4d355a371f5c8b1128c5a31f8fc033;hb=8e1d3c4f9001fbc8a5d3d3bea57916c5099078b2;hp=28fe35e9dd3c2e523642993dd99db12029285238;hpb=55ac0d700c4b20f145924b169b938321dc10a476;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java index 28fe35e9dd..9c50f1669c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.cluster.datastore.persisted; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -24,7 +23,6 @@ import org.junit.Test; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; @@ -55,9 +53,7 @@ public class ShardDataTreeSnapshotTest { deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } - Optional actualNode = deserialized.getRootNode(); - assertTrue("rootNode present", actualNode.isPresent()); - assertEquals("rootNode", expectedNode, actualNode.get()); + assertEquals("rootNode", Optional.of(expectedNode), deserialized.getRootNode()); assertEquals("Deserialized type", MetadataShardDataTreeSnapshot.class, deserialized.getClass()); assertEquals("Metadata size", 0, ((MetadataShardDataTreeSnapshot)deserialized).getMetadata().size()); } @@ -84,9 +80,7 @@ public class ShardDataTreeSnapshotTest { deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } - Optional actualNode = deserialized.getRootNode(); - assertTrue("rootNode present", actualNode.isPresent()); - assertEquals("rootNode", expectedNode, actualNode.get()); + assertEquals("rootNode", Optional.of(expectedNode), deserialized.getRootNode()); assertEquals("Deserialized type", MetadataShardDataTreeSnapshot.class, deserialized.getClass()); assertEquals("Metadata", expMetadata, ((MetadataShardDataTreeSnapshot)deserialized).getMetadata()); }