X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FMediaTypesTest.java;h=3dd3101a2e2a325f8da94cdacef60dbaa0c0add0;hp=5a2c964b8b15a8eb46c6fea2cc46e77c350cdcdf;hb=a9533db1d57a2729772ee192a2f96d358c71bede;hpb=8f15fef884bc20239625850c4a2fcdaf36395526 diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java index 5a2c964b8b..3dd3101a2e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java @@ -19,12 +19,10 @@ import static org.opendaylight.controller.sal.restconf.impl.test.RestOperationUt import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; - import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; - import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.BeforeClass; @@ -38,11 +36,11 @@ import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; import org.opendaylight.yangtools.yang.data.api.CompositeNode; public class MediaTypesTest extends JerseyTest { - + private static RestconfService restconfService; private static String jsonData; private static String xmlData; - + @BeforeClass public static void init() throws IOException { restconfService = mock(RestconfService.class); @@ -51,100 +49,100 @@ public class MediaTypesTest extends JerseyTest { InputStream xmlStream = RestconfImplTest.class.getResourceAsStream("/parts/ietf-interfaces_interfaces.xml"); xmlData = TestUtils.getDocumentInPrintableForm(TestUtils.loadDocumentFrom(xmlStream)); } - + @Override protected Application configure() { /* enable/disable Jersey logs to console */ -// enable(TestProperties.LOG_TRAFFIC); -// enable(TestProperties.DUMP_ENTITY); -// enable(TestProperties.RECORD_LOG_LEVEL); -// set(TestProperties.RECORD_LOG_LEVEL, Level.ALL.intValue()); + // enable(TestProperties.LOG_TRAFFIC); + // enable(TestProperties.DUMP_ENTITY); + // enable(TestProperties.RECORD_LOG_LEVEL); + // set(TestProperties.RECORD_LOG_LEVEL, Level.ALL.intValue()); ResourceConfig resourceConfig = new ResourceConfig(); resourceConfig = resourceConfig.registerInstances(restconfService, StructuredDataToXmlProvider.INSTANCE, StructuredDataToJsonProvider.INSTANCE, XmlToCompositeNodeProvider.INSTANCE, JsonToCompositeNodeProvider.INSTANCE); return resourceConfig; } - - @Test - public void testPostOperationsWithInputDataMediaTypes() throws UnsupportedEncodingException { - String uriPrefix = "/operations/"; - String uriPath = "ietf-interfaces:interfaces"; - String uri = uriPrefix + uriPath; - when(restconfService.invokeRpc(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - post(uri, Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+JSON, jsonData); - verify(restconfService, times(1)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, Draft02.MediaTypes.OPERATION+XML, Draft02.MediaTypes.OPERATION+XML, xmlData); - verify(restconfService, times(2)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON, jsonData); - verify(restconfService, times(3)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.APPLICATION_XML, MediaType.APPLICATION_XML, xmlData); - verify(restconfService, times(4)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.TEXT_XML, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(5)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, null, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - - // negative tests - post(uri, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.TEXT_XML, MediaType.TEXT_PLAIN, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - } - + + @Test + public void testPostOperationsWithInputDataMediaTypes() throws UnsupportedEncodingException { + String uriPrefix = "/operations/"; + String uriPath = "ietf-interfaces:interfaces"; + String uri = uriPrefix + uriPath; + when(restconfService.invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class))).thenReturn(null); + post(uri, Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + JSON, jsonData); + verify(restconfService, times(1)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, Draft02.MediaTypes.OPERATION + XML, Draft02.MediaTypes.OPERATION + XML, xmlData); + verify(restconfService, times(2)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON, jsonData); + verify(restconfService, times(3)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.APPLICATION_XML, MediaType.APPLICATION_XML, xmlData); + verify(restconfService, times(4)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.TEXT_XML, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(5)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, null, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + + // negative tests + post(uri, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.TEXT_XML, MediaType.TEXT_PLAIN, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + } + @Test public void testGetConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; - when(restconfService.readConfigurationData(uriPath)).thenReturn(null); - get(uri, Draft02.MediaTypes.DATA+JSON); - verify(restconfService, times(1)).readConfigurationData(uriPath); - get(uri, Draft02.MediaTypes.DATA+XML); - verify(restconfService, times(2)).readConfigurationData(uriPath); + when(restconfService.readConfigurationData(eq(uriPath), any(UriInfo.class))).thenReturn(null); + get(uri, Draft02.MediaTypes.DATA + JSON); + verify(restconfService, times(1)).readConfigurationData(eq(uriPath), any(UriInfo.class)); + get(uri, Draft02.MediaTypes.DATA + XML); + verify(restconfService, times(2)).readConfigurationData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_JSON); - verify(restconfService, times(3)).readConfigurationData(uriPath); + verify(restconfService, times(3)).readConfigurationData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_XML); - verify(restconfService, times(4)).readConfigurationData(uriPath); + verify(restconfService, times(4)).readConfigurationData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.TEXT_XML); - verify(restconfService, times(5)).readConfigurationData(uriPath); - + verify(restconfService, times(5)).readConfigurationData(eq(uriPath), any(UriInfo.class)); + // negative tests get(uri, MediaType.TEXT_PLAIN); - verify(restconfService, times(5)).readConfigurationData(uriPath); + verify(restconfService, times(5)).readConfigurationData(eq(uriPath), any(UriInfo.class)); } - + @Test public void testGetOperationalMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/operational/"; String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; - when(restconfService.readOperationalData(uriPath)).thenReturn(null); - get(uri, Draft02.MediaTypes.DATA+JSON); - verify(restconfService, times(1)).readOperationalData(uriPath); - get(uri, Draft02.MediaTypes.DATA+XML); - verify(restconfService, times(2)).readOperationalData(uriPath); + when(restconfService.readOperationalData(eq(uriPath), any(UriInfo.class))).thenReturn(null); + get(uri, Draft02.MediaTypes.DATA + JSON); + verify(restconfService, times(1)).readOperationalData(eq(uriPath), any(UriInfo.class)); + get(uri, Draft02.MediaTypes.DATA + XML); + verify(restconfService, times(2)).readOperationalData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_JSON); - verify(restconfService, times(3)).readOperationalData(uriPath); + verify(restconfService, times(3)).readOperationalData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_XML); - verify(restconfService, times(4)).readOperationalData(uriPath); + verify(restconfService, times(4)).readOperationalData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.TEXT_XML); - verify(restconfService, times(5)).readOperationalData(uriPath); - + verify(restconfService, times(5)).readOperationalData(eq(uriPath), any(UriInfo.class)); + // negative tests get(uri, MediaType.TEXT_PLAIN); - verify(restconfService, times(5)).readOperationalData(uriPath); + verify(restconfService, times(5)).readOperationalData(eq(uriPath), any(UriInfo.class)); } - + @Test public void testPutConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.updateConfigurationData(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - put(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + put(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); - put(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + put(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); put(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); @@ -155,16 +153,16 @@ public class MediaTypesTest extends JerseyTest { put(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); } - + @Test public void testPostConfigWithPathMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.createConfigurationData(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - post(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + post(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); - post(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + post(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); post(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); @@ -175,15 +173,15 @@ public class MediaTypesTest extends JerseyTest { post(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); } - + @Test public void testPostConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; String uri = uriPrefix; when(restconfService.createConfigurationData(any(CompositeNode.class))).thenReturn(null); - post(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + post(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).createConfigurationData(any(CompositeNode.class)); - post(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + post(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).createConfigurationData(any(CompositeNode.class)); post(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).createConfigurationData(any(CompositeNode.class)); @@ -194,7 +192,7 @@ public class MediaTypesTest extends JerseyTest { post(uri, "fooMediaType", MediaType.TEXT_XML, xmlData); verify(restconfService, times(6)).createConfigurationData(any(CompositeNode.class)); } - + @Test public void testDeleteConfigMediaTypes() throws UnsupportedEncodingException { String uriPrefix = "/config/"; @@ -204,18 +202,18 @@ public class MediaTypesTest extends JerseyTest { target(uri).request("fooMediaType").delete(); verify(restconfService, times(1)).deleteConfigurationData(uriPath); } - + private int get(String uri, String acceptMediaType) { return target(uri).request(acceptMediaType).get().getStatus(); } - + private int put(String uri, String acceptMediaType, String contentTypeMediaType, String data) { if (acceptMediaType == null) { return target(uri).request().put(Entity.entity(data, contentTypeMediaType)).getStatus(); } return target(uri).request(acceptMediaType).put(Entity.entity(data, contentTypeMediaType)).getStatus(); } - + private int post(String uri, String acceptMediaType, String contentTypeMediaType, String data) { if (acceptMediaType == null) { if (contentTypeMediaType == null || data == null) {