Introduce restconf.server.{api,spi,mdsal}

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / server / spi / AbstractRestconfStreamRegistryTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/RestconfStateStreamsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java
similarity index 86%
rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/RestconfStateStreamsTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.java
index 4ba30ae3edaa57ebc34179b5e73134ceb969588f..034a6815cdaab540f44726a5150940dc92adfc64 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/RestconfStateStreamsTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistryTest.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.restconf.nb.rfc8040.streams;
+package org.opendaylight.restconf.server.spi;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
-import org.opendaylight.restconf.nb.rfc8040.streams.RestconfStream.EncodingName;
+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;
@@ -30,10 +30,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Unit tests for {@link RestconfStateStreams}.
+ * Unit tests for {@link AbstractRestconfStreamRegistry}.
  */
-class RestconfStateStreamsTest {
-    private static final Logger LOG = LoggerFactory.getLogger(RestconfStateStreamsTest.class);
+class AbstractRestconfStreamRegistryTest {
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractRestconfStreamRegistryTest.class);
     private static final EffectiveModelContext CONTEXT =
         // TODO: assemble these from dependencies?
         YangParserTestUtils.parseYangResourceDirectory("/modules/restconf-module-testing");
@@ -45,7 +45,8 @@ class RestconfStateStreamsTest {
         final var streamName = "/nested-module:depth1-cont/depth2-leaf1";
 
         assertMappedData(prepareMap(streamName, uri, outputType),
-            ListenersBroker.streamEntry(streamName, "description", "location", Set.of(new EncodingName(outputType))));
+            AbstractRestconfStreamRegistry.streamEntry(streamName, "description", "location",
+                Set.of(new EncodingName(outputType))));
     }
 
     @Test
@@ -54,15 +55,16 @@ class RestconfStateStreamsTest {
         final var uri = "uri";
 
         assertMappedData(prepareMap("notifi", uri, outputType),
-            ListenersBroker.streamEntry("notifi", "description", "location", Set.of(new EncodingName(outputType))));
+            AbstractRestconfStreamRegistry.streamEntry("notifi", "description", "location",
+                Set.of(new EncodingName(outputType))));
     }
 
     private static Map<QName, Object> prepareMap(final String name, final String uri, final String outputType) {
         return Map.of(
-            ListenersBroker.NAME_QNAME, name,
-            ListenersBroker.LOCATION_QNAME, uri,
-            ListenersBroker.ENCODING_QNAME, outputType,
-            ListenersBroker.DESCRIPTION_QNAME, "description");
+            AbstractRestconfStreamRegistry.NAME_QNAME, name,
+            AbstractRestconfStreamRegistry.LOCATION_QNAME, uri,
+            AbstractRestconfStreamRegistry.ENCODING_QNAME, outputType,
+            AbstractRestconfStreamRegistry.DESCRIPTION_QNAME, "description");
     }
 
     private static void assertMappedData(final Map<QName, Object> map, final MapEntryNode mappedData) {