Eliminate NormalizedNodePayload

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / jaxrs / AbstractRestconfTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/AbstractRestconfTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/AbstractRestconfTest.java
index b8b4a06725c9f691c68dcf155f7f60847c29f06d..5632434bfe4e8cdd051f672e9adb8554dc62e655 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/AbstractRestconfTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/jaxrs/AbstractRestconfTest.java
@@ -15,6 +15,9 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.List;
 import java.util.function.Consumer;
@@ -22,6 +25,7 @@ import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -32,19 +36,24 @@ import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
 import org.opendaylight.restconf.api.ApiPath;
+import org.opendaylight.restconf.api.FormattableBody;
+import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
 import org.opendaylight.restconf.common.errors.RestconfError;
 import org.opendaylight.restconf.nb.rfc8040.AbstractJukeboxTest;
-import org.opendaylight.restconf.nb.rfc8040.databind.DatabindContext;
-import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload;
+import org.opendaylight.restconf.nb.rfc8040.ErrorTagMapping;
+import org.opendaylight.restconf.server.mdsal.MdsalDatabindProvider;
 import org.opendaylight.restconf.server.mdsal.MdsalRestconfServer;
+import org.opendaylight.restconf.server.spi.NormalizedFormattableBody;
+import org.opendaylight.restconf.server.spi.OperationOutputBody;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
-// FIXME: hide this class
 @ExtendWith(MockitoExtension.class)
-public abstract class AbstractRestconfTest extends AbstractJukeboxTest {
+abstract class AbstractRestconfTest extends AbstractJukeboxTest {
     static final ApiPath JUKEBOX_API_PATH = apiPath("example-jukebox:jukebox");
 
     @Mock
@@ -64,20 +73,56 @@ public abstract class AbstractRestconfTest extends AbstractJukeboxTest {
 
     @BeforeEach
     final void setupRestconf() {
-        restconf = new JaxRsRestconf(new MdsalRestconfServer(() -> DatabindContext.ofModel(modelContext()), dataBroker,
-            rpcService, actionService, mountPointService));
+        restconf = new JaxRsRestconf(
+            new MdsalRestconfServer(new MdsalDatabindProvider(new FixedDOMSchemaService(modelContext())),
+                dataBroker, rpcService, actionService, mountPointService),
+            ErrorTagMapping.RFC8040, PrettyPrintParam.FALSE);
     }
 
     EffectiveModelContext modelContext() {
         return JUKEBOX_SCHEMA;
     }
 
-    static final NormalizedNode assertNormalizedNode(final int status, final Consumer<AsyncResponse> invocation) {
-        return assertEntity(NormalizedNodePayload.class, status, invocation).data();
+    static final void assertJson(final String expectedJson, final OperationOutputBody payload) {
+        final var baos = new ByteArrayOutputStream();
+        try {
+            payload.formatToJSON(PrettyPrintParam.FALSE, baos);
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+        assertEquals(expectedJson, baos.toString(StandardCharsets.UTF_8));
+    }
+
+    static final void assertXml(final String expectedXml, final OperationOutputBody payload) {
+        final var baos = new ByteArrayOutputStream();
+        try {
+            payload.formatToXML(PrettyPrintParam.FALSE, baos);
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+        assertEquals(expectedXml, baos.toString(StandardCharsets.UTF_8));
+    }
+
+    @NonNullByDefault
+    static final <N extends NormalizedNode> NormalizedFormattableBody<N> assertNormalizedBody(final int status,
+            final Consumer<AsyncResponse> invocation) {
+        return assertInstanceOf(NormalizedFormattableBody.class, assertFormattableBody(status, invocation));
+    }
+
+    static final FormattableBody assertFormattableBody(final int status, final Consumer<AsyncResponse> invocation) {
+        return assertEntity(JaxRsFormattableBody.class, status, invocation).body();
     }
 
-    // FIXME: hide this method
-    public static final <T> T assertEntity(final Class<T> expectedType, final int expectedStatus,
+    static final ContainerNode assertOperationOutput(final int status, final Consumer<AsyncResponse> invocation) {
+        return assertOperationOutputBody(status, invocation).output();
+    }
+
+    static final OperationOutputBody assertOperationOutputBody(final int status,
+            final Consumer<AsyncResponse> invocation) {
+        return assertEntity(OperationOutputBody.class, status, invocation);
+    }
+
+    static final <T> T assertEntity(final Class<T> expectedType, final int expectedStatus,
             final Consumer<AsyncResponse> invocation) {
         return assertInstanceOf(expectedType, assertEntity(expectedStatus, invocation));
     }
@@ -86,8 +131,7 @@ public abstract class AbstractRestconfTest extends AbstractJukeboxTest {
         return assertResponse(expectedStatus, invocation).getEntity();
     }
 
-    // FIXME: hide this method
-    public static final RestconfError assertError(final Consumer<AsyncResponse> invocation) {
+    static final RestconfError assertError(final Consumer<AsyncResponse> invocation) {
         final var errors = assertErrors(invocation);
         assertEquals(1, errors.size());
         final var error = errors.get(0);
@@ -95,22 +139,25 @@ public abstract class AbstractRestconfTest extends AbstractJukeboxTest {
         return error;
     }
 
-    // FIXME: hide this method
-    public static final List<RestconfError> assertErrors(final Consumer<AsyncResponse> invocation) {
+    static final List<RestconfError> assertErrors(final Consumer<AsyncResponse> invocation) {
         final var ar = mock(AsyncResponse.class);
-        final var captor = ArgumentCaptor.forClass(RestconfDocumentedException.class);
-        doReturn(true).when(ar).resume(captor.capture());
+        doReturn(true).when(ar).resume(any(RestconfDocumentedException.class));
+
         invocation.accept(ar);
-        verify(ar).resume(any(RestconfDocumentedException.class));
+
+        final var captor = ArgumentCaptor.forClass(RestconfDocumentedException.class);
+        verify(ar).resume(captor.capture());
         return captor.getValue().getErrors();
     }
 
     static final Response assertResponse(final int expectedStatus, final Consumer<AsyncResponse> invocation) {
         final var ar = mock(AsyncResponse.class);
-        final var captor = ArgumentCaptor.forClass(Response.class);
-        doReturn(true).when(ar).resume(captor.capture());
+        doReturn(true).when(ar).resume(any(Response.class));
+
         invocation.accept(ar);
-        verify(ar).resume(any(Response.class));
+
+        final var captor = ArgumentCaptor.forClass(Response.class);
+        verify(ar).resume(captor.capture());
         final var response = captor.getValue();
         assertEquals(expectedStatus, response.getStatus());
         return response;