Code Review / netconf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Modernize sal-rest-docgen tests a bit
[netconf.git] / restconf / sal-rest-docgen / src / test / java / org / opendaylight / controller / sal / rest / doc / impl / ApiDocGeneratorRFC8040Test.java
diff --git a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/ApiDocGeneratorRFC8040Test.java b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/ApiDocGeneratorRFC8040Test.java
index 822ed3f9bfdbd33682b3ce88fdb5a121eaffe53e..ff56d801a051bee5cc778fa87b25fb77feb300ee 100644 (file)
--- a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/ApiDocGeneratorRFC8040Test.java
+++ b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/ApiDocGeneratorRFC8040Test.java
@@ -14,62 +14,45 @@ import static org.junit.Assert.assertTrue;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.ArrayList;
-import java.util.Arrays;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-import java.util.Optional;
-import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.netconf.sal.rest.doc.impl.ApiDocGeneratorRFC8040;
 import org.opendaylight.netconf.sal.rest.doc.impl.ApiDocServiceImpl;
 import org.opendaylight.netconf.sal.rest.doc.impl.ApiDocServiceImpl.URIType;
 import org.opendaylight.netconf.sal.rest.doc.swagger.SwaggerObject;
 import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public final class ApiDocGeneratorRFC8040Test {
+public final class ApiDocGeneratorRFC8040Test extends AbstractApiDocTest {
     private static final String NAME = "toaster2";
     private static final String REVISION_DATE = "2009-11-20";
     private static final String NAME_2 = "toaster";
     private static final String REVISION_DATE_2 = "2009-11-20";
 
-    private EffectiveModelContext context;
-    private ApiDocGeneratorRFC8040 generator;
-
-    @Before
-    public void setUp() {
-        context = YangParserTestUtils.parseYangResourceDirectory("/yang");
-        generator = new ApiDocGeneratorRFC8040(DocGenTestHelper.createMockSchemaService(context));
-    }
+    private final ApiDocGeneratorRFC8040 generator = new ApiDocGeneratorRFC8040(SCHEMA_SERVICE);
 
     /**
      * Test that paths are generated according to the model.
      */
     @Test
     public void testPaths() {
-        final List<String> expectedPaths = Arrays.asList("/rests/data",
-                "/rests/data/toaster2:toaster",
-                "/rests/data/toaster2:toaster/toasterSlot={slotId}",
-                "/rests/data/toaster2:toaster/toasterSlot={slotId}/toaster-augmented:slotInfo",
-                "/rests/data/toaster2:lst",
-                "/rests/data/toaster2:lst/cont1",
-                "/rests/data/toaster2:lst/cont1/cont11",
-                "/rests/data/toaster2:lst/cont1/lst11",
-                "/rests/data/toaster2:lst/lst1={key1},{key2}",
-                "/rests/operations/toaster2:make-toast",
-                "/rests/operations/toaster2:cancel-toast",
-                "/rests/operations/toaster2:restock-toaster");
-
-        final Optional<? extends Module> module = context.findModule(NAME, Revision.of(REVISION_DATE));
-        assertTrue("Desired module not found", module.isPresent());
-        final SwaggerObject doc = generator.getSwaggerDocSpec(module.get(), "http","localhost:8181",
-                "/", "", context, URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
-        final List<String> actualPaths = new ArrayList<>();
-        doc.getPaths().fieldNames().forEachRemaining(actualPaths::add);
-
-        assertEquals(expectedPaths, actualPaths);
+        final var module = CONTEXT.findModule(NAME, Revision.of(REVISION_DATE)).orElseThrow();
+        final SwaggerObject doc = generator.getSwaggerDocSpec(module, "http", "localhost:8181", "/", "", CONTEXT,
+            URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
+
+        assertEquals(List.of("/rests/data",
+            "/rests/data/toaster2:toaster",
+            "/rests/data/toaster2:toaster/toasterSlot={slotId}",
+            "/rests/data/toaster2:toaster/toasterSlot={slotId}/toaster-augmented:slotInfo",
+            "/rests/data/toaster2:lst",
+            "/rests/data/toaster2:lst/cont1",
+            "/rests/data/toaster2:lst/cont1/cont11",
+            "/rests/data/toaster2:lst/cont1/lst11",
+            "/rests/data/toaster2:lst/lst1={key1},{key2}",
+            "/rests/operations/toaster2:make-toast",
+            "/rests/operations/toaster2:cancel-toast",
+            "/rests/operations/toaster2:restock-toaster"),
+            ImmutableList.copyOf(doc.getPaths().fieldNames()));
     }
 
     /**
@@ -77,16 +60,15 @@ public final class ApiDocGeneratorRFC8040Test {
      */
     @Test
     public void testConfigPaths() {
-        final List<String> configPaths = Arrays.asList("/rests/data/toaster2:lst",
+        final List<String> configPaths = List.of("/rests/data/toaster2:lst",
                 "/rests/data/toaster2:lst/cont1",
                 "/rests/data/toaster2:lst/cont1/cont11",
                 "/rests/data/toaster2:lst/cont1/lst11",
                 "/rests/data/toaster2:lst/lst1={key1},{key2}");
 
-        final Optional<? extends Module> module = context.findModule(NAME, Revision.of(REVISION_DATE));
-        assertTrue("Desired module not found", module.isPresent());
-        final SwaggerObject doc = generator.getSwaggerDocSpec(module.get(), "http","localhost:8181",
-                "/", "", context, URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
+        final var module = CONTEXT.findModule(NAME, Revision.of(REVISION_DATE)).orElseThrow();
+        final SwaggerObject doc = generator.getSwaggerDocSpec(module, "http", "localhost:8181", "/", "", CONTEXT,
+            URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
 
         for (final String path : configPaths) {
             final JsonNode node = doc.getPaths().get(path);
@@ -102,58 +84,49 @@ public final class ApiDocGeneratorRFC8040Test {
      */
     @Test
     public void testDefinitions() {
-        final Optional<? extends Module> module = context.findModule(NAME, Revision.of(REVISION_DATE));
-        assertTrue("Desired module not found", module.isPresent());
-        final SwaggerObject doc = generator.getSwaggerDocSpec(module.get(), "http","localhost:8181",
-                "/", "", context, URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
+        final var module = CONTEXT.findModule(NAME, Revision.of(REVISION_DATE)).orElseThrow();
+        final SwaggerObject doc = generator.getSwaggerDocSpec(module, "http", "localhost:8181", "/", "", CONTEXT,
+            URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
 
         final ObjectNode definitions = doc.getDefinitions();
         assertNotNull(definitions);
 
         final JsonNode configLstTop = definitions.get("toaster2_config_lst_TOP");
         assertNotNull(configLstTop);
-        DocGenTestHelper.containsReferences(configLstTop, "lst",
-                "#/definitions/toaster2_config_lst");
+        DocGenTestHelper.containsReferences(configLstTop, "lst", "#/definitions/toaster2_config_lst");
 
         final JsonNode configLst = definitions.get("toaster2_config_lst");
         assertNotNull(configLst);
-        DocGenTestHelper.containsReferences(configLst,
-                "lst1", "#/definitions/toaster2_lst_config_lst1");
-        DocGenTestHelper.containsReferences(configLst,
-                "cont1", "#/definitions/toaster2_lst_config_cont1");
+        DocGenTestHelper.containsReferences(configLst, "lst1", "#/definitions/toaster2_lst_config_lst1");
+        DocGenTestHelper.containsReferences(configLst, "cont1", "#/definitions/toaster2_lst_config_cont1");
 
         final JsonNode configLst1Top = definitions.get("toaster2_lst_config_lst1_TOP");
         assertNotNull(configLst1Top);
-        DocGenTestHelper.containsReferences(configLst1Top,
-                "lst1", "#/definitions/toaster2_lst_config_lst1");
+        DocGenTestHelper.containsReferences(configLst1Top, "lst1", "#/definitions/toaster2_lst_config_lst1");
 
         final JsonNode configLst1 = definitions.get("toaster2_lst_config_lst1");
         assertNotNull(configLst1);
 
         final JsonNode configCont1Top = definitions.get("toaster2_lst_config_cont1_TOP");
         assertNotNull(configCont1Top);
-        DocGenTestHelper.containsReferences(configCont1Top,
-                "cont1", "#/definitions/toaster2_lst_config_cont1");
+        DocGenTestHelper.containsReferences(configCont1Top, "cont1", "#/definitions/toaster2_lst_config_cont1");
 
         final JsonNode configCont1 = definitions.get("toaster2_lst_config_cont1");
         assertNotNull(configCont1);
-        DocGenTestHelper.containsReferences(configCont1,
-                "cont11", "#/definitions/toaster2_lst_cont1_config_cont11");
-        DocGenTestHelper.containsReferences(configCont1,
-                "lst11", "#/definitions/toaster2_lst_cont1_config_lst11");
+        DocGenTestHelper.containsReferences(configCont1, "cont11", "#/definitions/toaster2_lst_cont1_config_cont11");
+        DocGenTestHelper.containsReferences(configCont1, "lst11", "#/definitions/toaster2_lst_cont1_config_lst11");
 
         final JsonNode configCont11Top = definitions.get("toaster2_lst_cont1_config_cont11_TOP");
         assertNotNull(configCont11Top);
         DocGenTestHelper.containsReferences(configCont11Top,
-                "cont11", "#/definitions/toaster2_lst_cont1_config_cont11");
+            "cont11", "#/definitions/toaster2_lst_cont1_config_cont11");
 
         final JsonNode configCont11 = definitions.get("toaster2_lst_cont1_config_cont11");
         assertNotNull(configCont11);
 
         final JsonNode configLst11Top = definitions.get("toaster2_lst_cont1_config_lst11_TOP");
         assertNotNull(configLst11Top);
-        DocGenTestHelper.containsReferences(configLst11Top,
-                "lst11", "#/definitions/toaster2_lst_cont1_config_lst11");
+        DocGenTestHelper.containsReferences(configLst11Top, "lst11", "#/definitions/toaster2_lst_cont1_config_lst11");
 
         final JsonNode configLst11 = definitions.get("toaster2_lst_cont1_config_lst11");
         assertNotNull(configLst11);
@@ -164,10 +137,9 @@ public final class ApiDocGeneratorRFC8040Test {
      */
     @Test
     public void testRPC() {
-        final Optional<? extends Module> module = context.findModule(NAME_2, Revision.of(REVISION_DATE_2));
-        assertTrue("Desired module not found", module.isPresent());
-        final SwaggerObject doc = generator.getSwaggerDocSpec(module.get(), "http","localhost:8181",
-                "/", "", context, URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
+        final var module = CONTEXT.findModule(NAME_2, Revision.of(REVISION_DATE_2)).orElseThrow();
+        final SwaggerObject doc = generator.getSwaggerDocSpec(module, "http", "localhost:8181", "/", "", CONTEXT,
+            URIType.RFC8040, ApiDocServiceImpl.OAversion.V2_0);
         assertNotNull(doc);
 
         final ObjectNode definitions = doc.getDefinitions();
Netconf