From 8fac3e21e581cd3e9dc9e67e6ab55039e351ba5b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 30 Dec 2019 21:17:49 +0100 Subject: [PATCH] Move YANGTOOLS-892 test As the test does not rely on anything XML, move it to yang-data-impl, where the tested implementation actually lives. Change-Id: I9d77734bc05e5c4b1033da5f32f9bc80f50bd827 Signed-off-by: Robert Varga --- .../yangtools/yang/data/impl/leafref/YT892Test.java} | 9 +++------ .../src/test/resources/yt892}/bgp-test-extensions.yang | 0 .../test/resources/yt892}/test-bgp-multiprotocol.yang | 0 .../src/test/resources/yt892}/test-bgp-types.yang | 0 .../src/test/resources/yt892}/test-bgp.yang | 0 .../src/test/resources/yt892}/test-network-instance.yang | 0 .../src/test/resources/yt892}/test-policy-types.yang | 0 7 files changed, 3 insertions(+), 6 deletions(-) rename yang/{yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java => yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java} (97%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/bgp-test-extensions.yang (100%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/test-bgp-multiprotocol.yang (100%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/test-bgp-types.yang (100%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/test-bgp.yang (100%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/test-network-instance.yang (100%) rename yang/{yang-data-codec-xml/src/test/resources/yangtools892 => yang-data-impl/src/test/resources/yt892}/test-policy-types.yang (100%) diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java similarity index 97% rename from yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java index 2cf64c8fb5..1e7c3d3a1e 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Yangtools892Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.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 com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -21,15 +21,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.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 Yangtools892Test { +public class YT892Test { private static final QName BGP = QName.create("urn:opendaylight:params:xml:ns:yang:test:bgp", "2018-08-14", "bgp"); private static final QName PEER_GROUPS = QName.create(BGP, "peer-groups"); private static final QName PEER_GROUP = QName.create(BGP, "peer-group"); @@ -64,13 +62,12 @@ public class Yangtools892Test { private static final YangInstanceIdentifier NETWORK_INSTANCES_ID = YangInstanceIdentifier.of(NETWORK_INSTANCES); - private SchemaContext schemaContext; private LeafRefContext leafRefContext; private DataTree dataTree; @Before public void setup() { - schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yangtools892"); + final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yt892"); leafRefContext = LeafRefContext.create(schemaContext); dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); } diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/bgp-test-extensions.yang b/yang/yang-data-impl/src/test/resources/yt892/bgp-test-extensions.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/bgp-test-extensions.yang rename to yang/yang-data-impl/src/test/resources/yt892/bgp-test-extensions.yang diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp-multiprotocol.yang b/yang/yang-data-impl/src/test/resources/yt892/test-bgp-multiprotocol.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp-multiprotocol.yang rename to yang/yang-data-impl/src/test/resources/yt892/test-bgp-multiprotocol.yang diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp-types.yang b/yang/yang-data-impl/src/test/resources/yt892/test-bgp-types.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp-types.yang rename to yang/yang-data-impl/src/test/resources/yt892/test-bgp-types.yang diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp.yang b/yang/yang-data-impl/src/test/resources/yt892/test-bgp.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/test-bgp.yang rename to yang/yang-data-impl/src/test/resources/yt892/test-bgp.yang diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/test-network-instance.yang b/yang/yang-data-impl/src/test/resources/yt892/test-network-instance.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/test-network-instance.yang rename to yang/yang-data-impl/src/test/resources/yt892/test-network-instance.yang diff --git a/yang/yang-data-codec-xml/src/test/resources/yangtools892/test-policy-types.yang b/yang/yang-data-impl/src/test/resources/yt892/test-policy-types.yang similarity index 100% rename from yang/yang-data-codec-xml/src/test/resources/yangtools892/test-policy-types.yang rename to yang/yang-data-impl/src/test/resources/yt892/test-policy-types.yang -- 2.36.6