X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FRestPostOperationTest.java;h=96e0132f5dcd0196d4c5192385b5e8354f60f947;hb=f3473ee42d45f1524dcafa6cc37e19e0393e9693;hp=47ca1ae8735aa453c94e09f5bc5bde5c9652a608;hpb=874a18a9ce5dc09bc49922754bf8fb3e981fffb9;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index 47ca1ae873..96e0132f5d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -9,8 +9,6 @@ package org.opendaylight.controller.sal.restconf.impl.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -19,16 +17,12 @@ import static org.opendaylight.controller.sal.restconf.impl.test.RestOperationUt import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.Futures; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import java.util.Set; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; @@ -40,6 +34,7 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; +import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; import org.opendaylight.controller.sal.rest.api.Draft02; @@ -49,15 +44,9 @@ import org.opendaylight.controller.sal.rest.impl.NormalizedNodeXmlBodyWriter; import org.opendaylight.controller.sal.rest.impl.RestconfDocumentedExceptionMapper; import org.opendaylight.controller.sal.rest.impl.XmlNormalizedNodeBodyReader; import org.opendaylight.controller.sal.restconf.impl.BrokerFacade; -import org.opendaylight.controller.sal.restconf.impl.CompositeNodeWrapper; import org.opendaylight.controller.sal.restconf.impl.ControllerContext; -import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; import org.opendaylight.controller.sal.restconf.impl.RestconfImpl; -import org.opendaylight.yangtools.yang.common.RpcError; -import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -70,7 +59,6 @@ public class RestPostOperationTest extends JerseyTest { private static String xmlDataRpcInput; private static String xmlBlockData; private static String xmlTestInterface; - private static CompositeNodeWrapper cnSnDataOutput; private static String xmlData3; private static String xmlData4; @@ -116,60 +104,6 @@ public class RestPostOperationTest extends JerseyTest { restconfImpl.setControllerContext(context); } - @Test - @Ignore //FIXME we don't wish to mock CompositeNode as result - public void postOperationsStatusCodes() throws IOException { - setSchemaControllerContext(schemaContextTestModule); - mockInvokeRpc(cnSnDataOutput, true); - String uri = "/operations/test-module:rpc-test"; - assertEquals(200, post(uri, MediaType.APPLICATION_XML, xmlDataRpcInput)); - - mockInvokeRpc(null, true); - assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataRpcInput)); - - mockInvokeRpc(null, false); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataRpcInput)); - - final List rpcErrors = new ArrayList<>(); - rpcErrors.add(RpcResultBuilder.newError(ErrorType.RPC, "tag1", "message1", "applicationTag1", "info1", null)); - rpcErrors.add(RpcResultBuilder.newWarning(ErrorType.PROTOCOL, "tag2", "message2", "applicationTag2", "info2", - null)); - mockInvokeRpc(null, false, rpcErrors); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataRpcInput)); - - uri = "/operations/test-module:rpc-wrongtest"; - assertEquals(400, post(uri, MediaType.APPLICATION_XML, xmlDataRpcInput)); - } - - @Test - @Ignore // TODO RestconfDocumentedExceptionMapper needs be fixed before - public void postConfigOnlyStatusCodes() throws UnsupportedEncodingException { - setSchemaControllerContext(schemaContextYangsIetf); - final String uri = "/config"; - mockCommitConfigurationDataPostMethod(true); - assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); - - mockCommitConfigurationDataPostMethod(false); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); - - assertEquals(400, post(uri, MediaType.APPLICATION_XML, "")); - } - - @Test - public void postConfigStatusCodes() throws UnsupportedEncodingException { - setSchemaControllerContext(schemaContextYangsIetf); - final String uri = "/config/ietf-interfaces:interfaces"; - - mockCommitConfigurationDataPostMethod(true); - assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); - - mockCommitConfigurationDataPostMethod(false); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); - - // FIXME : empty json input post value return NullPointerException by parsing -> err. code 500 -// assertEquals(400, post(uri, MediaType.APPLICATION_JSON, "")); - } - @Test @Ignore /// xmlData* need netconf-yang public void postDataViaUrlMountPoint() throws UnsupportedEncodingException { @@ -193,36 +127,8 @@ public class RestPostOperationTest extends JerseyTest { assertEquals(400, post(uri, MediaType.APPLICATION_JSON, "")); } - private void mockInvokeRpc(final CompositeNode result, final boolean sucessful, final Collection errors) { - - final DummyRpcResult.Builder builder = new DummyRpcResult.Builder().result(result) - .isSuccessful(sucessful); - if (!errors.isEmpty()) { - builder.errors(errors); - } - final RpcResult rpcResult = builder.build(); -// when(brokerFacade.invokeRpc(any(QName.class), any(CompositeNode.class))).thenReturn( -// Futures.> immediateFuture(rpcResult)); - } - - /** - * @deprecated has to be removed for lithium release - */ - @Deprecated - private void mockInvokeRpc(final CompositeNode result, final boolean sucessful) { - mockInvokeRpc(result, sucessful, Collections. emptyList()); - } - - private void mockCommitConfigurationDataPostMethod(final boolean succesfulComit) { - if (succesfulComit) { - doReturn(mock(CheckedFuture.class)).when(brokerFacade).commitConfigurationDataPost(any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - } else { - doThrow(RestconfDocumentedException.class).when(brokerFacade).commitConfigurationDataPost( - any(YangInstanceIdentifier.class), any(NormalizedNode.class)); - } - } - @Test + @Ignore //jenkins has problem with JerseyTest - we expecting problems with singletons ControllerContext as schemaContext holder public void createConfigurationDataTest() throws UnsupportedEncodingException, ParseException { initMocking(); final RpcResult rpcResult = new DummyRpcResult.Builder().result( @@ -256,8 +162,8 @@ public class RestPostOperationTest extends JerseyTest { public void createConfigurationDataNullTest() throws UnsupportedEncodingException { initMocking(); - when(brokerFacade.commitConfigurationDataPost(any(YangInstanceIdentifier.class), any(NormalizedNode.class))) - .thenReturn(null); + when(brokerFacade.commitConfigurationDataPost(any(YangInstanceIdentifier.class),any(NormalizedNode.class))) + .thenReturn(Futures.immediateCheckedFuture(null)); //FIXME : find who is set schemaContext // final String URI_1 = "/config"; @@ -297,18 +203,11 @@ public class RestPostOperationTest extends JerseyTest { final String xmlPathTestInterface = RestconfImplTest.class.getResource("/test-config-data/xml/test-interface.xml") .getPath(); xmlTestInterface = TestUtils.loadTextFile(xmlPathTestInterface); - cnSnDataOutput = prepareCnSnRpcOutput(); +// cnSnDataOutput = prepareCnSnRpcOutput(); final String data3Input = RestconfImplTest.class.getResource("/full-versions/test-data2/data3.xml").getPath(); xmlData3 = TestUtils.loadTextFile(data3Input); final String data4Input = RestconfImplTest.class.getResource("/full-versions/test-data2/data7.xml").getPath(); xmlData4 = TestUtils.loadTextFile(data4Input); } - private static CompositeNodeWrapper prepareCnSnRpcOutput() throws URISyntaxException { - final CompositeNodeWrapper cnSnDataOutput = new CompositeNodeWrapper(new URI("test:module"), "output"); - final CompositeNodeWrapper cont = new CompositeNodeWrapper(new URI("test:module"), "cont-output"); - cnSnDataOutput.addValue(cont); - cnSnDataOutput.unwrap(); - return cnSnDataOutput; - } }