Split transaction lifecycle

[netconf.git] / restconf / restconf-nb-rfc8040 / src / test / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / JSONRestconfServiceRfc8040ImplTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
index 521215356cad887aafd42368eef281e43fab018c..1271bb2396d57fc0ce76d27d1236afa30a598d59 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
@@ -49,6 +49,7 @@ import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
@@ -133,6 +134,9 @@ public class JSONRestconfServiceRfc8040ImplTest {
     @Mock
     private DOMDataTreeReadTransaction mockReadOnlyTx;
 
+    @Mock
+    private DOMDataTreeWriteTransaction mockWriteTx;
+
     @Mock
     private DOMMountPointService mockMountPointService;
 
@@ -167,16 +171,15 @@ public class JSONRestconfServiceRfc8040ImplTest {
 
         doReturn(immediateFluentFuture(Optional.empty())).when(mockReadOnlyTx).read(
                 eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class));
-
         doNothing().when(mockReadWriteTx).put(eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class),
                 any(NormalizedNode.class));
         doReturn(CommitInfo.emptyFluentFuture()).when(mockReadWriteTx).commit();
-        doReturn(immediateFalseFluentFuture()).when(mockReadWriteTx).exists(
+        doReturn(immediateFalseFluentFuture()).when(mockReadOnlyTx).exists(
                 eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class));
-
+        doReturn(immediateFalseFluentFuture()).when(mockReadWriteTx).exists(
+            eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class));
         doReturn(mockReadOnlyTx).when(mockTxChain).newReadOnlyTransaction();
         doReturn(mockReadWriteTx).when(mockTxChain).newReadWriteTransaction();
-
         doReturn(mockTxChain).when(mockDOMDataBroker).createTransactionChain(any());
 
         final TransactionChainHandler txChainHandler = new TransactionChainHandler(mockDOMDataBroker);
@@ -251,6 +254,7 @@ public class JSONRestconfServiceRfc8040ImplTest {
         verifyLeafNode(actualNode, TEST_LF12_QNAME, "lf12 data");
     }
 
+    @Test
     public void testPutFailure() throws IOException {
         doReturn(immediateFailedFluentFuture(new TransactionCommitFailedException("mock")))
                 .when(mockReadWriteTx).commit();
@@ -556,7 +560,6 @@ public class JSONRestconfServiceRfc8040ImplTest {
 
         doReturn(Optional.of(mockDOMDataBroker)).when(mockMountPoint).getService(DOMDataBroker.class);
         doReturn(Optional.empty()).when(mockMountPoint).getService(NetconfDataTreeService.class);
-
         doReturn(Optional.of(mockMountPoint)).when(mockMountPointService).getMountPoint(notNull());
 
         return mockMountPoint;