X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FRestDeleteOperationTest.java;h=b5435e149a1c25ae48646a4662f039a80168646f;hb=573cccc17981fa8d003e76fd57ad36c8dc0a29a5;hp=53b37fb29cd83dec2d5d2e72c1c724de6f603a8a;hpb=81f7cd4488ec8902ea34382748fb07b1f726f1c1;p=netconf.git diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java index 53b37fb29c..b5435e149a 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java @@ -13,7 +13,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.Futures; import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; import java.util.Set; @@ -72,12 +72,11 @@ public class RestDeleteOperationTest extends JerseyTest { return resourceConfig; } - @SuppressWarnings("unchecked") @Test public void deleteConfigStatusCodes() throws UnsupportedEncodingException { final String uri = "/config/test-interface:interfaces"; when(brokerFacade.commitConfigurationDataDelete(any(YangInstanceIdentifier.class))).thenReturn( - mock(CheckedFuture.class)); + Futures.immediateCheckedFuture(null)); Response response = target(uri).request(MediaType.APPLICATION_XML).delete(); assertEquals(200, response.getStatus());