Clean-up AbstractRestconfStreamRegistryTest

Remove unused methods from AbstractRestconfStreamRegistryTest.
Test which was using these methods was removed by:
https://git.opendaylight.org/gerrit/c/netconf/+/107210
also with the tested method/class.

The tested method was marked as @VisibleForTesting and the
original functionality is no longer present.

JIRA: NETCONF-1196
Change-Id: I05933b916af0019e0f07927b3658f198aaea1741
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java
index 034a6815cdaab540f44726a5150940dc92adfc64..0882a5297075b75a07fa3bb94b4ba79e355e7bf6 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java
@@ -11,19 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opendaylight.restconf.server.spi.RestconfStream.EncodingName;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.module.list.Module;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.module.list.module.Deviation;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.slf4j.Logger;
@@ -76,77 +70,4 @@ class AbstractRestconfStreamRegistryTest {
             }
         }
     }
-
-    /**
-     * Verify whether the loaded modules contain any deviations.
-     *
-     * @param containerNode
-     *             modules
-     */
-    // FIXME: what is this supposed to verify?
-    private static void verifyDeviations(final ContainerNode containerNode) {
-        int deviationsFound = 0;
-        for (var child : containerNode.body()) {
-            if (child instanceof MapNode mapChild) {
-                for (var mapEntryNode : mapChild.body()) {
-                    for (var dataContainerChild : mapEntryNode.body()) {
-                        if (dataContainerChild.name().getNodeType().equals(Deviation.QNAME)) {
-                            deviationsFound++;
-                        }
-                    }
-                }
-            }
-        }
-        assertTrue(deviationsFound > 0);
-    }
-
-    /**
-     * Verify loaded modules.
-     *
-     * @param containerNode
-     *             modules
-     */
-    // FIXME: what is this supposed to verify?
-    private static void verifyLoadedModules(final ContainerNode containerNode) {
-        final var loadedModules = new HashMap<String, String>();
-
-        for (var child : containerNode.body()) {
-            if (child instanceof LeafNode) {
-                assertEquals(QName.create(Module.QNAME, "module-set-id"), child.name().getNodeType());
-            }
-            if (child instanceof MapNode mapChild) {
-                assertEquals(Module.QNAME, child.name().getNodeType());
-                for (var mapEntryNode : mapChild.body()) {
-                    String name = "";
-                    String revision = "";
-                    for (var dataContainerChild : mapEntryNode.body()) {
-                        switch (dataContainerChild.name().getNodeType().getLocalName()) {
-                            case "name":
-                                name = String.valueOf(dataContainerChild.body());
-                                break;
-                            case "revision":
-                                revision = String.valueOf(dataContainerChild.body());
-                                break;
-                            default :
-                                LOG.info("Unknown local name '{}' of node.",
-                                    dataContainerChild.name().getNodeType().getLocalName());
-                                break;
-                        }
-                    }
-                    loadedModules.put(name, revision);
-                }
-            }
-        }
-
-        final var expectedModules = CONTEXT.getModules();
-        assertEquals(expectedModules.size(), loadedModules.size());
-        for (var m : expectedModules) {
-            final String name = m.getName();
-            final String revision = loadedModules.get(name);
-            assertNotNull("Expected module not found", revision);
-            assertEquals(Revision.ofNullable(revision), m.getRevision());
-
-            loadedModules.remove(name);
-        }
-    }
 }