InstanceIdentifierContext does not take generics

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / RestPutConfigTest.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java
index 94a8284d82e980b8e6af0fd8970ec3a281888df6..9cd03d85407234238ae33d704f8d515347791d55 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java
@@ -5,11 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.sal.restconf.impl.test;
 
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
 import java.io.FileNotFoundException;
 import java.util.HashSet;
 import javax.ws.rs.core.MultivaluedMap;
@@ -21,27 +18,27 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.BrokerFacade;
 import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
 import org.opendaylight.netconf.sal.restconf.impl.PutResult;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfImpl;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
-import org.opendaylight.restconf.common.context.NormalizedNodeContext;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RestPutConfigTest {
 
-    private static SchemaContext schemaContext;
+    private static EffectiveModelContext schemaContext;
     private RestconfImpl restconfService;
     private ControllerContext controllerCx;
 
@@ -55,20 +52,19 @@ public class RestPutConfigTest {
 
     @Before
     public void init() {
-        this.controllerCx = TestRestconfUtils.newControllerContext(schemaContext);
-        this.restconfService = RestconfImpl.newInstance(brokerFacade, controllerCx);
+        controllerCx = TestRestconfUtils.newControllerContext(schemaContext);
+        restconfService = RestconfImpl.newInstance(brokerFacade, controllerCx);
     }
 
     @Test
     public void testPutConfigData() {
         final String identifier = "test-interface:interfaces/interface/key";
-        final InstanceIdentifierContext<?> iiCx = this.controllerCx.toInstanceIdentifier(identifier);
+        final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier);
         final MapEntryNode data = Mockito.mock(MapEntryNode.class);
         final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface");
         final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name");
         final NodeIdentifierWithPredicates identWithPredicates =
-                new NodeIdentifierWithPredicates(qName, qNameKey, "key");
-        Mockito.when(data.getNodeType()).thenReturn(qName);
+                NodeIdentifierWithPredicates.of(qName, qNameKey, "key");
         Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates);
         final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data);
 
@@ -78,19 +74,18 @@ public class RestPutConfigTest {
         final MultivaluedMap<String, String> value = Mockito.mock(MultivaluedMap.class);
         Mockito.when(value.entrySet()).thenReturn(new HashSet<>());
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(value);
-        this.restconfService.updateConfigurationData(identifier, payload, uriInfo);
+        restconfService.updateConfigurationData(identifier, payload, uriInfo);
     }
 
     @Test
     public void testPutConfigDataCheckOnlyLastElement() {
         final String identifier = "test-interface:interfaces/interface/key/sub-interface/subkey";
-        final InstanceIdentifierContext<?> iiCx = this.controllerCx.toInstanceIdentifier(identifier);
+        final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier);
         final MapEntryNode data = Mockito.mock(MapEntryNode.class);
         final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-interface");
         final QName qNameSubKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-name");
         final NodeIdentifierWithPredicates identWithPredicates =
-                new NodeIdentifierWithPredicates(qName, qNameSubKey, "subkey");
-        Mockito.when(data.getNodeType()).thenReturn(qName);
+                NodeIdentifierWithPredicates.of(qName, qNameSubKey, "subkey");
         Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates);
         final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data);
 
@@ -100,25 +95,24 @@ public class RestPutConfigTest {
         final MultivaluedMap<String, String> value = Mockito.mock(MultivaluedMap.class);
         Mockito.when(value.entrySet()).thenReturn(new HashSet<>());
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(value);
-        this.restconfService.updateConfigurationData(identifier, payload, uriInfo);
+        restconfService.updateConfigurationData(identifier, payload, uriInfo);
     }
 
     @Test(expected = RestconfDocumentedException.class)
     public void testPutConfigDataMissingUriKey() {
         final String identifier = "test-interface:interfaces/interface";
-        this.controllerCx.toInstanceIdentifier(identifier);
+        controllerCx.toInstanceIdentifier(identifier);
     }
 
     @Test(expected = RestconfDocumentedException.class)
     public void testPutConfigDataDiferentKey() {
         final String identifier = "test-interface:interfaces/interface/key";
-        final InstanceIdentifierContext<?> iiCx = this.controllerCx.toInstanceIdentifier(identifier);
+        final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier);
         final MapEntryNode data = Mockito.mock(MapEntryNode.class);
         final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface");
         final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name");
         final NodeIdentifierWithPredicates identWithPredicates =
-                new NodeIdentifierWithPredicates(qName, qNameKey, "notSameKey");
-        Mockito.when(data.getNodeType()).thenReturn(qName);
+                NodeIdentifierWithPredicates.of(qName, qNameKey, "notSameKey");
         Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates);
         final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data);
 
@@ -128,16 +122,14 @@ public class RestPutConfigTest {
         final MultivaluedMap<String, String> value = Mockito.mock(MultivaluedMap.class);
         Mockito.when(value.entrySet()).thenReturn(new HashSet<>());
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(value);
-        this.restconfService.updateConfigurationData(identifier, payload, uriInfo);
+        restconfService.updateConfigurationData(identifier, payload, uriInfo);
     }
 
-    private void mockingBrokerPut(final YangInstanceIdentifier yii, final NormalizedNode<?, ?> data) {
+    private void mockingBrokerPut(final YangInstanceIdentifier yii, final NormalizedNode data) {
         final PutResult result = Mockito.mock(PutResult.class);
-        final CheckedFuture<Void, TransactionCommitFailedException> checkedFuture =
-                Futures.immediateCheckedFuture(null);
-        Mockito.when(this.brokerFacade.commitConfigurationDataPut(this.schemaContext, yii, data, null, null))
+        Mockito.when(brokerFacade.commitConfigurationDataPut(schemaContext, yii, data, null, null))
                 .thenReturn(result);
-        Mockito.when(result.getFutureOfPutData()).thenReturn(checkedFuture);
+        Mockito.doReturn(CommitInfo.emptyFluentFuture()).when(result).getFutureOfPutData();
         Mockito.when(result.getStatus()).thenReturn(Status.OK);
     }
 }