From 9f62a560dd3b604c6b12bcfa5a670af93240d07b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 2 Feb 2021 19:09:10 +0100 Subject: [PATCH] Test SchemaNodeIdentifier instead of SchemaPath The SchemaNodeIdentifier path is not tested, whereas SchemaPath is. Deprecation situation points the other way around. Rather than duplicating tests, simply change the objects being tested. Change-Id: Idded0df5d21d8aa756c28e223c77a2ebec1a08af Signed-off-by: Robert Varga --- .../codec/binfmt/AbstractNormalizedNodeDataInput.java | 1 + .../codec/binfmt/AbstractNormalizedNodeDataOutput.java | 1 + .../codec/binfmt/ForwardingNormalizedNodeDataInput.java | 1 + .../binfmt/NormalizedNodeStreamReaderWriterTest.java | 8 ++++---- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataInput.java b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataInput.java index 60e48d74e9..1610e9ae4e 100644 --- a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataInput.java +++ b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataInput.java @@ -34,6 +34,7 @@ abstract class AbstractNormalizedNodeDataInput extends ForwardingDataInput imple } @Override + @Deprecated public final SchemaPath readSchemaPath() throws IOException { final boolean absolute = input.readBoolean(); return SchemaPath.create(readQNames(), absolute); diff --git a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java index fea4fd5594..c487dab542 100755 --- a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java +++ b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java @@ -166,6 +166,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } @Override + @Deprecated public final void writeSchemaPath(final SchemaPath path) throws IOException { writeSchemaNodeIdentifier(path.isAbsolute(), path.getPathFromRoot()); } diff --git a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/ForwardingNormalizedNodeDataInput.java b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/ForwardingNormalizedNodeDataInput.java index 20aaed7ffc..c725df17e4 100644 --- a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/ForwardingNormalizedNodeDataInput.java +++ b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/ForwardingNormalizedNodeDataInput.java @@ -54,6 +54,7 @@ abstract class ForwardingNormalizedNodeDataInput extends ForwardingDataInput imp } @Override + @Deprecated(forRemoval = true) public final SchemaPath readSchemaPath() throws IOException { return delegate().readSchemaPath(); } diff --git a/yang/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeStreamReaderWriterTest.java b/yang/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeStreamReaderWriterTest.java index 29b3f66f84..d03dfce000 100644 --- a/yang/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeStreamReaderWriterTest.java +++ b/yang/yang-data-codec-binfmt/src/test/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeStreamReaderWriterTest.java @@ -61,7 +61,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableCo import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; import org.w3c.dom.Node; import org.xml.sax.InputSource; @@ -286,18 +286,18 @@ public class NormalizedNodeStreamReaderWriterTest { @Test public void testSchemaPathSerialization() throws IOException { - final SchemaPath expected = SchemaPath.create(true, TestModel.ANY_XML_QNAME); + final Absolute expected = Absolute.of(TestModel.ANY_XML_QNAME); ByteArrayOutputStream bos = new ByteArrayOutputStream(); try (NormalizedNodeDataOutput nnout = version.newDataOutput(ByteStreams.newDataOutput(bos))) { - nnout.writeSchemaPath(expected); + nnout.writeSchemaNodeIdentifier(expected); } final byte[] bytes = bos.toByteArray(); assertEquals(schemaPathSize, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeDataInput.newDataInput(ByteStreams.newDataInput(bytes)); - assertEquals(expected, nnin.readSchemaPath()); + assertEquals(expected, nnin.readSchemaNodeIdentifier()); } @Test -- 2.36.6