X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Futil%2Fxml%2FXmlElementTest.java;fp=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2Fxml%2FXmlElementTest.java;h=28266bb5029bda2c88d4a7d377e226051418438f;hp=22210a394e6a344cdb66df27af19662777c65b59;hb=refs%2Fchanges%2F13%2F23413%2F26;hpb=071a641d7c12c0e6112d5ce0afe806b54f116ed2 diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/xml/XmlElementTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/xml/XmlElementTest.java similarity index 93% rename from opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/xml/XmlElementTest.java rename to opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/xml/XmlElementTest.java index 22210a394e..28266bb502 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/xml/XmlElementTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/xml/XmlElementTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.netconf.util.xml; +package org.opendaylight.controller.config.util.xml; import static org.hamcrest.CoreMatchers.both; import static org.hamcrest.CoreMatchers.containsString; @@ -21,8 +21,6 @@ import com.google.common.base.Optional; import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.netconf.api.NetconfDocumentedException; -import org.opendaylight.controller.netconf.util.exception.MissingNameSpaceException; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -58,17 +56,17 @@ public class XmlElementTest { try { XmlElement.fromString("notXml"); fail(); - } catch (final NetconfDocumentedException e) {} + } catch (final DocumentedException e) {} try { XmlElement.fromDomElementWithExpected(element, "notTop"); fail(); - } catch (final NetconfDocumentedException e) {} + } catch (final DocumentedException e) {} try { XmlElement.fromDomElementWithExpected(element, "top", "notNamespace"); fail(); - } catch (final NetconfDocumentedException e) {} + } catch (final DocumentedException e) {} } @Test @@ -136,7 +134,7 @@ public class XmlElementTest { try { xmlElement.checkUnrecognisedElements(xmlElement.getOnlyChildElement("inner")); fail(); - } catch (final NetconfDocumentedException e) { + } catch (final DocumentedException e) { assertThat(e.getMessage(), both(containsString("innerNamespace")).and(containsString("innerNamespace"))); } }