Decouple config and netconf subsystems.

[controller.git] / opendaylight / config / config-util / src / test / java / org / opendaylight / controller / config / util / xml / XmlElementTest.java

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 22210a394e6a344cdb66df27af19662777c65b59..28266bb5029bda2c88d4a7d377e226051418438f 100644 (file)
--- 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")));
         }
     }