X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2FNetconfMappingTest.java;h=fe2fc1c5da9b43ff673fd7e8e780ea5285edd69d;hb=bc3d9508f699313c89843d3462443afc998c6933;hp=c72cb7498b709c2a2da727e0b5959fd8fb0ac0c9;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java index c72cb7498b..fe2fc1c5da 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java @@ -12,7 +12,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -27,7 +26,32 @@ import org.opendaylight.controller.config.manager.impl.jmx.RootRuntimeBeanRegist import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; import org.opendaylight.controller.config.yang.store.api.YangStoreSnapshot; import org.opendaylight.controller.config.yang.store.impl.MbeParser; -import org.opendaylight.controller.config.yang.test.impl.*; +import org.opendaylight.controller.config.yang.test.impl.Asdf; +import org.opendaylight.controller.config.yang.test.impl.ComplexDtoBInner; +import org.opendaylight.controller.config.yang.test.impl.ComplexList; +import org.opendaylight.controller.config.yang.test.impl.Deep; +import org.opendaylight.controller.config.yang.test.impl.Deep2; +import org.opendaylight.controller.config.yang.test.impl.Deep3; +import org.opendaylight.controller.config.yang.test.impl.Deep4; +import org.opendaylight.controller.config.yang.test.impl.DepTestImplModuleFactory; +import org.opendaylight.controller.config.yang.test.impl.DtoAInner; +import org.opendaylight.controller.config.yang.test.impl.DtoAInnerInner; +import org.opendaylight.controller.config.yang.test.impl.DtoC; +import org.opendaylight.controller.config.yang.test.impl.DtoD; +import org.opendaylight.controller.config.yang.test.impl.InnerInnerRunningDataRuntimeMXBean; +import org.opendaylight.controller.config.yang.test.impl.InnerRunningDataAdditionalRuntimeMXBean; +import org.opendaylight.controller.config.yang.test.impl.InnerRunningDataRuntimeMXBean; +import org.opendaylight.controller.config.yang.test.impl.InnerRunningDataRuntimeRegistration; +import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplModuleFactory; +import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplModuleMXBean; +import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplRuntimeMXBean; +import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplRuntimeRegistration; +import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplRuntimeRegistrator; +import org.opendaylight.controller.config.yang.test.impl.NotStateBean; +import org.opendaylight.controller.config.yang.test.impl.NotStateBeanInternal; +import org.opendaylight.controller.config.yang.test.impl.Peers; +import org.opendaylight.controller.config.yang.test.impl.RetValContainer; +import org.opendaylight.controller.config.yang.test.impl.RetValList; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfOperationRouter; @@ -59,10 +83,20 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; public class NetconfMappingTest extends AbstractConfigTest { private static final Logger logger = LoggerFactory.getLogger(NetconfMappingTest.class); @@ -286,8 +320,8 @@ public class NetconfMappingTest extends AbstractConfigTest { try { edit(file); } catch (NetconfDocumentedException e) { - Assert.assertThat(e.getMessage(), JUnitMatchers.containsString("Unrecognised elements")); - Assert.assertThat(e.getMessage(), JUnitMatchers.containsString("unknownAttribute")); + assertThat(e.getMessage(), JUnitMatchers.containsString("Unrecognised elements")); + assertThat(e.getMessage(), JUnitMatchers.containsString("unknownAttribute")); continue; } fail("Unrecognised test should throw exception " + file); @@ -312,8 +346,8 @@ public class NetconfMappingTest extends AbstractConfigTest { response = getConfigRunning(); final int afterReplace = response.getElementsByTagName("instance").getLength(); - Assert.assertEquals(4 + 4 /* Instances from services */, allInstances); - Assert.assertEquals(3 + 3, afterReplace); + assertEquals(4 + 4 /* Instances from services */, allInstances); + assertEquals(3 + 3, afterReplace); } @Test(expected = NetconfDocumentedException.class) @@ -407,12 +441,15 @@ public class NetconfMappingTest extends AbstractConfigTest { Element response = get(); + System.err.println(XmlUtil.toString(response)); + assertEquals(2, getElementsSize(response, "instance")); assertEquals(2, getElementsSize(response, "asdf")); assertEquals(5, getElementsSize(response, "inner-running-data")); assertEquals(5, getElementsSize(response, "deep2")); assertEquals(11, getElementsSize(response, "inner-inner-running-data")); assertEquals(11, getElementsSize(response, "deep3")); + assertEquals(11 * 2, getElementsSize(response, "list-of-strings")); assertEquals(4, getElementsSize(response, "inner-running-data-additional")); assertEquals(4, getElementsSize(response, "deep4")); // TODO assert keys @@ -427,6 +464,10 @@ public class NetconfMappingTest extends AbstractConfigTest { response = executeOp(netconf, "netconfMessages/rpcInnerInner.xml"); assertThat(XmlUtil.toString(response), JUnitMatchers.containsString("true")); + + response = executeOp(netconf, "netconfMessages/rpcInnerInner_complex_output.xml"); + assertThat(XmlUtil.toString(response), JUnitMatchers.containsString("1")); + assertThat(XmlUtil.toString(response), JUnitMatchers.containsString("2")); } private Element get() throws NetconfDocumentedException, ParserConfigurationException, SAXException, IOException { @@ -503,11 +544,31 @@ public class NetconfMappingTest extends AbstractConfigTest { return new Deep3(); } + @Override + public List getListOfStrings() { + return Lists.newArrayList("l1", "l2"); + } + + @Override + public List listOutput() { + return Lists.newArrayList(new RetValList()); + } + @Override public Boolean noArgInnerInner(Integer integer, Boolean aBoolean) { return aBoolean; } + @Override + public RetValContainer containerOutput() { + return new RetValContainer(); + } + + @Override + public List leafListOutput() { + return Lists.newArrayList("1", "2"); + } + } reg.register(new InnerInnerRunningDataRuntimeMXBeanTest(counter++));