Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix CS warnings in sal-clustering-commons and enable enforcement
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
md
/
cluster
/
datastore
/
model
/
SampleModelsTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SampleModelsTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SampleModelsTest.java
index 68245917c608185d648c13a0ca8305eb1ce812ef..74017eae6c9baf8205fa4b2f0f6ffb47f987beae 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SampleModelsTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SampleModelsTest.java
@@
-8,29
+8,26
@@
package org.opendaylight.controller.md.cluster.datastore.model;
package org.opendaylight.controller.md.cluster.datastore.model;
-import
junit.framework
.Assert;
+import
org.junit
.Assert;
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
public class SampleModelsTest {
@Test
public void testPeopleModel(){
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
public class SampleModelsTest {
@Test
public void testPeopleModel(){
-
NormalizedNode<?, ?> expected = PeopleModel.emptyContainer
();
+
final NormalizedNode<?, ?> expected = PeopleModel.create
();
- NormalizedNodeMessages.Container node =
- new NormalizedNodeToNodeCodec(SchemaContextHelper.full())
- .encode(InstanceIdentifier.of(PeopleModel.BASE_QNAME),
- expected);
+ final NormalizedNodeMessages.Container node =
+ new NormalizedNodeToNodeCodec()
+ .encode(expected);
- NormalizedNodeMessages.Node normalizedNode =
+
final
NormalizedNodeMessages.Node normalizedNode =
node.getNormalizedNode();
node.getNormalizedNode();
- NormalizedNode<?,?> actual = new NormalizedNodeToNodeCodec(SchemaContextHelper.full()).decode(InstanceIdentifier.of(PeopleModel.BASE_QNAME),
- normalizedNode);
+ final NormalizedNode<?,?> actual = new NormalizedNodeToNodeCodec().decode(normalizedNode);
Assert.assertEquals(expected, actual);
Assert.assertEquals(expected, actual);
@@
-40,18
+37,17
@@
public class SampleModelsTest {
@Test
public void testCarsModel(){
@Test
public void testCarsModel(){
-
NormalizedNode<?, ?> expected = CarsModel.emptyContainer
();
+
final NormalizedNode<?, ?> expected = CarsModel.create
();
- NormalizedNodeMessages.Container node =
- new NormalizedNodeToNodeCodec(SchemaContextHelper.full())
- .encode(InstanceIdentifier.of(CarsModel.BASE_QNAME),
- expected);
+ final NormalizedNodeMessages.Container node =
+ new NormalizedNodeToNodeCodec()
+ .encode(expected);
- NormalizedNodeMessages.Node normalizedNode =
+
final
NormalizedNodeMessages.Node normalizedNode =
node.getNormalizedNode();
node.getNormalizedNode();
- NormalizedNode<?,?> actual = new NormalizedNodeToNodeCodec(SchemaContextHelper.full()).decode(InstanceIdentifier.of(CarsModel.BASE_QNAME),
+ final NormalizedNode<?,?> actual = new NormalizedNodeToNodeCodec().decode(
normalizedNode);
normalizedNode);