Move YANGTOOLS-891 test

As the test does not rely on anything XML, move it to yang-data-impl,
where the tested implementation actually lives.

Change-Id: Ifdcc561f9fffb4b93e03a8e7538261046fd338d9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java
index e564b41a09f4f0344d68a5e8bad3c744e806ef5c..6f4c07f4b62d5f08f5c507fd4bc9de29d0858573 100644 (file)
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java
+++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java
@@ -78,7 +78,7 @@ public class Yangtools892Test {
     }
 
     private NormalizedNode<?, ?> readNode(final String filename, final ContainerSchemaNode node) throws Exception {
-        final InputStream resourceAsStream = Yangtools891Test.class.getResourceAsStream(filename);
+        final InputStream resourceAsStream = Yangtools892Test.class.getResourceAsStream(filename);
         final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
         final NormalizedNodeResult result = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools891Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java
similarity index 95%
rename from yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools891Test.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java
index 4a6846787c167ce2bd7865ed1b701d9bc7dbbb72..dfaee3fad1dfe902280e45ad767ab6caa8d8b3d7 100644 (file)
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools891Test.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java
@@ -5,7 +5,7 @@
  * 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.yangtools.yang.data.codec.xml;
+package org.opendaylight.yangtools.yang.data.impl.leafref;
 
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -20,16 +20,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext;
-import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefDataValidationFailedException;
-import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidation;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class Yangtools891Test {
+public class YT891Test {
     private static final QName FOO_TOP = QName.create("urn:opendaylight:params:xml:ns:yang:foo", "2018-07-27",
         "foo-top");
     private static final QName CONTAINER_IN_LIST = QName.create(FOO_TOP, "container-in-list");
@@ -55,7 +52,7 @@ public class Yangtools891Test {
 
     @BeforeClass
     public static void beforeClass() {
-        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yangtools891");
+        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yt891");
         leafRefContext = LeafRefContext.create(schemaContext);
     }
 

diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools891/bar.yang b/yang/yang-data-impl/src/test/resources/yt891/bar.yang
similarity index 100%
rename from yang/yang-data-codec-xml/src/test/resources/yangtools891/bar.yang
rename to yang/yang-data-impl/src/test/resources/yt891/bar.yang

diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools891/baz.yang b/yang/yang-data-impl/src/test/resources/yt891/baz.yang
similarity index 100%
rename from yang/yang-data-codec-xml/src/test/resources/yangtools891/baz.yang
rename to yang/yang-data-impl/src/test/resources/yt891/baz.yang

diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools891/foo.yang b/yang/yang-data-impl/src/test/resources/yt891/foo.yang
similarity index 100%
rename from yang/yang-data-codec-xml/src/test/resources/yangtools891/foo.yang
rename to yang/yang-data-impl/src/test/resources/yt891/foo.yang