Modernize sal-rest-docgen tests a bit

[netconf.git] / restconf / sal-rest-docgen / src / test / java / org / opendaylight / controller / sal / rest / doc / impl / SwaggerObjectTest.java

diff --git a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/SwaggerObjectTest.java b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/SwaggerObjectTest.java
index f37b8ee692698b7a5f694bca6be2ac3894216f2e..45287530e403dfd9196d21bb3391d6e50275978f 100644 (file)
--- a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/SwaggerObjectTest.java
+++ b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/SwaggerObjectTest.java
@@ -7,57 +7,41 @@
  */
 package org.opendaylight.controller.sal.rest.doc.impl;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.Optional;
-import org.junit.Assert;
-import org.junit.Before;
+import java.io.IOException;
 import org.junit.Test;
 import org.opendaylight.netconf.sal.rest.doc.impl.ApiDocServiceImpl;
 import org.opendaylight.netconf.sal.rest.doc.impl.DefinitionGenerator;
 import org.opendaylight.netconf.sal.rest.doc.impl.DefinitionNames;
 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 SwaggerObjectTest {
-    private EffectiveModelContext context;
-
-    @Before
-    public void setUp() {
-        context = YangParserTestUtils.parseYangResourceDirectory("/yang");
-    }
 
+public final class SwaggerObjectTest extends AbstractApiDocTest {
     @Test
-    public void testConvertToJsonSchema() throws Exception {
-        final Optional<? extends Module> module = context.findModule("opflex", Revision.of("2014-05-28"));
-        assertTrue("Desired module not found", module.isPresent());
+    public void testConvertToJsonSchema() throws IOException {
+        final var module = CONTEXT.findModule("opflex", Revision.of("2014-05-28")).orElseThrow();
         final DefinitionGenerator generator = new DefinitionGenerator();
-        final ObjectNode jsonObject = generator.convertToJsonSchema(module.get(), context,
-                new DefinitionNames(), ApiDocServiceImpl.OAversion.V2_0, true);
-        Assert.assertNotNull(jsonObject);
+        final ObjectNode jsonObject = generator.convertToJsonSchema(module, CONTEXT, new DefinitionNames(),
+            ApiDocServiceImpl.OAversion.V2_0, true);
+        assertNotNull(jsonObject);
     }
 
     @Test
-    public void testActionTypes() throws Exception {
-        final Optional<? extends Module> module = context.findModule("action-types");
-        assertTrue("Desired module not found", module.isPresent());
+    public void testActionTypes() throws IOException {
+        final var module = CONTEXT.findModule("action-types").orElseThrow();
         final DefinitionGenerator generator = new DefinitionGenerator();
-        final ObjectNode jsonObject = generator.convertToJsonSchema(module.get(), context,
-                new DefinitionNames(), ApiDocServiceImpl.OAversion.V2_0, true);
-        Assert.assertNotNull(jsonObject);
+        final ObjectNode jsonObject = generator.convertToJsonSchema(module, CONTEXT, new DefinitionNames(),
+            ApiDocServiceImpl.OAversion.V2_0, true);
+        assertNotNull(jsonObject);
     }
 
     @Test
-    public void testStringTypes() throws Exception {
-        final Optional<? extends Module> module = context.findModule("string-types");
-        assertTrue("Desired module not found", module.isPresent());
+    public void testStringTypes() throws IOException {
+        final var module = CONTEXT.findModule("string-types").orElseThrow();
         final DefinitionGenerator generator = new DefinitionGenerator();
-        final ObjectNode jsonObject = generator.convertToJsonSchema(module.get(), context, new DefinitionNames(),
-                ApiDocServiceImpl.OAversion.V2_0, true);
-
-        Assert.assertNotNull(jsonObject);
+        final ObjectNode jsonObject = generator.convertToJsonSchema(module, CONTEXT, new DefinitionNames(),
+            ApiDocServiceImpl.OAversion.V2_0, true);
+        assertNotNull(jsonObject);
     }
 }