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%2Fwebsockets%2Ftest%2FRestStream.java;h=70f0f050dc9fdea84f186537eafbcad6779d7e53;hp=d9ef2ef243986bb63960f8212f4ab2bbf81346f6;hb=73c9fecf86aad02761df47fe0cc943af4ea1f2bc;hpb=4063669aa69554b0513aac11c7a4e20fa066fa06 diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java index d9ef2ef243..70f0f050dc 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java @@ -15,12 +15,10 @@ import static org.mockito.Mockito.mock; import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; import java.net.URI; - import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.BeforeClass; @@ -55,10 +53,10 @@ public class RestStream extends JerseyTest { @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(restconfImpl, StructuredDataToXmlProvider.INSTANCE, StructuredDataToJsonProvider.INSTANCE, XmlToCompositeNodeProvider.INSTANCE, @@ -72,13 +70,15 @@ public class RestStream extends JerseyTest { Response responseWithStreamName = post(uri, MediaType.APPLICATION_XML, getRpcInput()); String xmlResponse = responseWithStreamName.readEntity(String.class); assertNotNull(xmlResponse); - assertTrue(xmlResponse.contains("ietf-interfaces:interfaces/ietf-interfaces:interface/eth0")); + assertTrue(xmlResponse + .contains("ietf-interfaces:interfaces/ietf-interfaces:interface/eth0")); uri = "/streams/stream/ietf-interfaces:interfaces/ietf-interfaces:interface/eth0"; Response responseWithRedirectionUri = get(uri, MediaType.APPLICATION_XML); final URI websocketServerUri = responseWithRedirectionUri.getLocation(); assertNotNull(websocketServerUri); - assertEquals(websocketServerUri.toString(), "http://localhost:8181/ietf-interfaces:interfaces/ietf-interfaces:interface/eth0"); + assertEquals(websocketServerUri.toString(), + "http://localhost:8181/ietf-interfaces:interfaces/ietf-interfaces:interface/eth0"); } private Response post(String uri, String mediaType, String data) {