Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1392: Change ReadTransaction#read to return CheckedFuture"
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
sal
/
restconf
/
impl
/
xml
/
to
/
cnsn
/
test
/
XmlToCnSnTest.java
diff --git
a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
index e2621d635bc3dab04629beffcb15c3d111b9eb21..d0af29e913fa633381c176ff1796a2fbd3f41c29 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
+++ b/
opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
@@
-32,9
+32,12
@@
public class XmlToCnSnTest extends YangAndXmlAndDataSchemaLoader {
@Test
public void testXmlLeafrefToCnSn() {
@Test
public void testXmlLeafrefToCnSn() {
-
CompositeNode compositeN
ode = TestUtils.readInputToCnSn("/xml-to-cnsn/leafref/xml/data.xml", false,
+
Node<?> n
ode = TestUtils.readInputToCnSn("/xml-to-cnsn/leafref/xml/data.xml", false,
XmlToCompositeNodeProvider.INSTANCE);
XmlToCompositeNodeProvider.INSTANCE);
- assertNotNull(compositeNode);
+ assertTrue(node instanceof CompositeNode);
+ CompositeNode compositeNode = (CompositeNode)node;
+
+
assertNotNull(dataSchemaNode);
TestUtils.normalizeCompositeNode(compositeNode, modules, schemaNodePath);
assertNotNull(dataSchemaNode);
TestUtils.normalizeCompositeNode(compositeNode, modules, schemaNodePath);
@@
-58,10
+61,10
@@
public class XmlToCnSnTest extends YangAndXmlAndDataSchemaLoader {
@Test
public void testXmlBlankInput() throws Exception {
InputStream inputStream = new ByteArrayInputStream("".getBytes());
@Test
public void testXmlBlankInput() throws Exception {
InputStream inputStream = new ByteArrayInputStream("".getBytes());
- CompositeNode compositeNode = XmlToCompositeNodeProvider.INSTANCE.readFrom(null, null, null, null, null,
- inputStream);
+ Node<?> node =
+
XmlToCompositeNodeProvider.INSTANCE.readFrom(null, null, null, null, null,
inputStream);
- assertNull(
compositeNode
);
+ assertNull(
node
);
}
@Test
}
@Test
@@
-72,10
+75,10
@@
public class XmlToCnSnTest extends YangAndXmlAndDataSchemaLoader {
return false;
}
};
return false;
}
};
- CompositeNode compositeNode = XmlToCompositeNodeProvider.INSTANCE.readFrom(null, null, null, null, null,
- inputStream);
+ Node<?> node =
+
XmlToCompositeNodeProvider.INSTANCE.readFrom(null, null, null, null, null,
inputStream);
- assertNull(
compositeNode
);
+ assertNull(
node
);
}
}
}
}