Bump MRI upstreams

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

diff --git a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
index 9cd7ae780de9462b8958df8cb17bd8b5321ba249..f86856b537ef7f1bc1f415fca8f024ad2cabd510 100644 (file)
--- a/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
+++ b/restconf/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGenTestHelper.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.controller.sal.rest.doc.impl;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -18,25 +20,25 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import org.mockito.ArgumentCaptor;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class DocGenTestHelper {
 
-    private Set<Module> modules;
+    private Collection<? extends Module> modules;
     private ObjectMapper mapper;
-    private SchemaContext schemaContext;
+    private EffectiveModelContext schemaContext;
 
-    public Set<Module> loadModules(final String resourceDirectory) throws URISyntaxException, FileNotFoundException {
+    public Collection<? extends Module> loadModules(final String resourceDirectory)
+            throws URISyntaxException, FileNotFoundException {
 
         final URI resourceDirUri = getClass().getResource(resourceDirectory).toURI();
         final File testDir = new File(resourceDirUri);
@@ -53,7 +55,7 @@ public class DocGenTestHelper {
         return this.schemaContext.getModules();
     }
 
-    public Collection<Module> getModules() {
+    public Collection<? extends Module> getModules() {
         return this.modules;
     }
 
@@ -63,32 +65,32 @@ public class DocGenTestHelper {
         this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
     }
 
-    public SchemaContext getSchemaContext() {
+    public EffectiveModelContext getSchemaContext() {
         return this.schemaContext;
     }
 
-    public SchemaService createMockSchemaService(SchemaContext mockContext) {
+    public DOMSchemaService createMockSchemaService(EffectiveModelContext mockContext) {
         if (mockContext == null) {
             mockContext = createMockSchemaContext();
         }
 
-        final SchemaService mockSchemaService = mock(SchemaService.class);
+        final DOMSchemaService mockSchemaService = mock(DOMSchemaService.class);
         when(mockSchemaService.getGlobalContext()).thenReturn(mockContext);
         return mockSchemaService;
     }
 
-    public SchemaContext createMockSchemaContext() {
-        final SchemaContext mockContext = mock(SchemaContext.class);
-        when(mockContext.getModules()).thenReturn(this.modules);
+    public EffectiveModelContext createMockSchemaContext() {
+        final EffectiveModelContext mockContext = mock(EffectiveModelContext.class);
+        doReturn(this.modules).when(mockContext).getModules();
 
         final ArgumentCaptor<String> moduleCapture = ArgumentCaptor.forClass(String.class);
         final ArgumentCaptor<Optional> dateCapture = ArgumentCaptor.forClass(Optional.class);
-        final ArgumentCaptor<URI> namespaceCapture = ArgumentCaptor.forClass(URI.class);
+        final ArgumentCaptor<XMLNamespace> namespaceCapture = ArgumentCaptor.forClass(XMLNamespace.class);
         when(mockContext.findModule(moduleCapture.capture(), dateCapture.capture())).then(
             invocation -> {
                 final String module = moduleCapture.getValue();
                 final Optional<?> date = dateCapture.getValue();
-                for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
+                for (final Module m : DocGenTestHelper.this.modules) {
                     if (m.getName().equals(module) && m.getRevision().equals(date)) {
                         return Optional.of(m);
                     }
@@ -97,9 +99,9 @@ public class DocGenTestHelper {
             });
         when(mockContext.findModule(namespaceCapture.capture(), dateCapture.capture())).then(
             invocation -> {
-                final URI namespace = namespaceCapture.getValue();
+                final XMLNamespace namespace = namespaceCapture.getValue();
                 final Optional<?> date = dateCapture.getValue();
-                for (final Module m : Collections.unmodifiableSet(DocGenTestHelper.this.modules)) {
+                for (final Module m : DocGenTestHelper.this.modules) {
                     if (m.getNamespace().equals(namespace) && m.getRevision().equals(date)) {
                         return Optional.of(m);
                     }
@@ -121,6 +123,7 @@ public class DocGenTestHelper {
         final UriInfo info = mock(UriInfo.class);
 
         when(info.getRequestUriBuilder()).thenReturn(mockBuilder);
+        when(mockBuilder.replaceQuery(any())).thenReturn(mockBuilder);
         when(info.getBaseUri()).thenReturn(uri);
         return info;
     }