Refactor modulesGET() methods

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / RestconfSchemaSourceUrlProviderTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java
index 4a1fd2c6e43a3c3ce3b1ff28321dfa4e501aa673..4d022c335fa2c0b8a7692837b00bb4096b616119 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaSourceUrlProviderTest.java
@@ -10,20 +10,17 @@ package org.opendaylight.restconf.nb.rfc8040.rests.services.impl;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.opendaylight.restconf.nb.rfc8040.URLConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yangtools.yang.common.Revision;
 
 class RestconfSchemaSourceUrlProviderTest {
-    private static final String URL_PREFIX = "/" + URLConstants.BASE_PATH + "/modules";
-
     @Test
     @DisplayName("Unsupported module-set name.")
     void unsupportedModuleSet() {
@@ -37,14 +34,14 @@ class RestconfSchemaSourceUrlProviderTest {
     void getSchemaSourceUrl(final String moduleName, final Revision revision, final Uri expected) {
         final var urlProvider = new RestconfSchemaSourceUrlProvider();
         final var result = urlProvider.getSchemaSourceUrl("ODL_modules", moduleName, revision);
-        assertTrue(result.isPresent());
         assertEquals(Optional.of(expected), result);
     }
 
-    private static Stream<Arguments> getSchemaSourceUrlArgs() {
-        return Stream.of(
-            Arguments.of("odl-module", Revision.of("2023-02-23"), new Uri(URL_PREFIX + "/odl-module/2023-02-23")),
-            Arguments.of("module-no-revision", null, new Uri(URL_PREFIX + "/module-no-revision"))
+    private static List<Arguments> getSchemaSourceUrlArgs() {
+        return List.of(
+            Arguments.of("odl-module", Revision.of("2023-02-23"),
+                new Uri("/rests/modules/odl-module?revision=2023-02-23")),
+            Arguments.of("module-no-revision", null, new Uri("/rests/modules/module-no-revision"))
         );
     }
 }