X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Fxml%2Fto%2Fcnsn%2Ftest%2FXmlAugmentedElementToCnSnTest.java;h=5a5a621d930b68fc240140f76b086a0d57bc0a3c;hb=69eca29208f36b9a02992319cc36d1d221189ff0;hp=4a4f9f1bbff9bfbcef8af7253aeebede8bfbcc35;hpb=730db233aa71642f0aa8a70f30fcd5bbbbbabac9;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java index 4a4f9f1bbf..5a5a621d93 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java @@ -1,9 +1,15 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.controller.sal.restconf.impl.xml.to.cnsn.test; import static org.junit.Assert.assertNotNull; import java.util.Set; - import org.junit.Test; import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; import org.opendaylight.controller.sal.restconf.impl.test.TestUtils; @@ -14,13 +20,12 @@ public class XmlAugmentedElementToCnSnTest { @Test public void loadDataAugmentedSchemaMoreEqualNamesTest() { - loadAndNormalizeData("/common/augment/xml/dataa.xml", "/common/augment/yang", "main","cont"); - loadAndNormalizeData("/common/augment/xml/datab.xml", "/common/augment/yang", "main","cont"); + loadAndNormalizeData("/common/augment/xml/dataa.xml", "/common/augment/yang", "main", "cont"); + loadAndNormalizeData("/common/augment/xml/datab.xml", "/common/augment/yang", "main", "cont"); } - + private void loadAndNormalizeData(String xmlPath, String yangPath, String topLevelElementName, String moduleName) { - CompositeNode compNode = TestUtils.readInputToCnSn(xmlPath, false, - XmlToCompositeNodeProvider.INSTANCE); + CompositeNode compNode = TestUtils.readInputToCnSn(xmlPath, false, XmlToCompositeNodeProvider.INSTANCE); assertNotNull(compNode); Set modules = TestUtils.loadModulesFrom(yangPath); @@ -28,5 +33,4 @@ public class XmlAugmentedElementToCnSnTest { TestUtils.normalizeCompositeNode(compNode, modules, topLevelElementName + ":" + moduleName); } - }