Bug 7159: Add yang-test-util artifact

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / codec / xml / Bug2964Test.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java
index 3ab0ecc0387a76385f22c98f2793ed22be143b12..8cfc79f2920c08a92ea80358e275e0aa06ba571c 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java
@@ -11,25 +11,26 @@ package org.opendaylight.yangtools.yang.data.impl.codec.xml;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import com.google.common.base.Charsets;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.impl.TestUtils;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.DomUtils;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -59,12 +60,12 @@ public class Bug2964Test {
 
     @Before
     public void setUp() throws Exception {
-        File leafRefTestYang = new File(getClass().getResource("/leafref-test.yang").toURI());
-        schema = TestUtils.parseYangSources(leafRefTestYang);
+        final File leafRefTestYang = new File(getClass().getResource("/leafref-test.yang").toURI());
+        schema = YangParserTestUtils.parseYangSources(leafRefTestYang);
     }
 
     public static Document readXmlToDocument(final String xmlContent) throws SAXException, IOException {
-        return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(Charsets.UTF_8)));
+        return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8)));
     }
 
     @Test
@@ -75,8 +76,10 @@ public class Bug2964Test {
         final Element identityLeafRefElement = (Element) document.getDocumentElement().getFirstChild().getNextSibling();
 
         final Module leafrefModule = schema.findModuleByNamespaceAndRevision(namespaceUri, null);
-        final ContainerSchemaNode cont2 = (ContainerSchemaNode) leafrefModule.getDataChildByName(CONT_2);
-        final DataSchemaNode identityLeafRefSchema = cont2.getDataChildByName(IDENTITY_LEAFREF);
+        final ContainerSchemaNode cont2 = (ContainerSchemaNode) leafrefModule.getDataChildByName(QName.create(
+                leafrefModule.getQNameModule(), CONT_2));
+        final DataSchemaNode identityLeafRefSchema = cont2.getDataChildByName(QName.create(
+                leafrefModule.getQNameModule(), IDENTITY_LEAFREF));
         final Object parsedValue = DomUtils.parseXmlValue(identityLeafRefElement, DomUtils.defaultValueCodecProvider(),
                 identityLeafRefSchema, ((LeafSchemaNode) identityLeafRefSchema).getType(), schema);