X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fbulk-o-matic%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Fbulk%2Fo%2Fmatic%2FTableWriterTest.java;h=6d359a555e808a0a32abb81b95ffcc1087078d98;hb=05f8db12159673d0e0a95642fe86e62c14b7dc7b;hp=775ecd08b47c8659f239218c58f46ee8efca6c30;hpb=c1eaf465f43b9cddf8065bafbc04af408cd134ee;p=openflowplugin.git

diff --git a/applications/bulk-o-matic/src/test/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriterTest.java b/applications/bulk-o-matic/src/test/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriterTest.java
index 775ecd08b4..6d359a555e 100644
--- a/applications/bulk-o-matic/src/test/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriterTest.java
+++ b/applications/bulk-o-matic/src/test/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriterTest.java
@@ -1,41 +1,33 @@
-/**
+/*
  * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.openflowplugin.applications.bulk.o.matic;
 
 import static org.mockito.Mockito.doReturn;
 
-import com.google.common.util.concurrent.Futures;
 import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test for {@link FlowWriterSequential}.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class TableWriterTest {
-    private static final Logger LOG = LoggerFactory.getLogger(TableWriterTest.class);
-
     private static final int TABLES_PER_DPN = 100;
     private static final int DPN_COUNT = 1;
     private static final short START_TABLE_ID = 0;
@@ -46,35 +38,37 @@ public class TableWriterTest {
     @Mock
     private ExecutorService mockTablePusher;
     @Mock
-    private WriteTransaction wTx;
+    private WriteTransaction writeTransaction;
 
     private TableWriter tableWriter;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
 
-        doReturn(wTx).when(mockDataBroker).newWriteOnlyTransaction();
-        Mockito.when(wTx.submit()).thenReturn(Futures.immediateCheckedFuture(null));
+        doReturn(writeTransaction).when(mockDataBroker).newWriteOnlyTransaction();
+        doReturn(CommitInfo.emptyFluentFuture()).when(writeTransaction).commit();
 
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                ((Runnable)invocation.getArguments()[0]).run();
-                return null;
-            }
-        }).when(mockTablePusher).execute(Matchers.<Runnable>any());
+        Mockito.doAnswer(invocation -> {
+            ((Runnable) invocation.getArguments()[0]).run();
+            return null;
+        }).when(mockTablePusher).execute(ArgumentMatchers.any());
 
         tableWriter = new TableWriter(mockDataBroker, mockTablePusher);
     }
+
     @Test
-    public void testAddTables() throws Exception {
+    public void testAddTables() {
         tableWriter.addTables(DPN_COUNT, START_TABLE_ID, END_TABLE_ID);
-        Mockito.verify(wTx, Mockito.times(TABLES_PER_DPN)).put(Matchers.<LogicalDatastoreType>any(), Matchers.<InstanceIdentifier<DataObject>>any(), Matchers.<DataObject>any(), Matchers.anyBoolean());
+        Mockito.verify(writeTransaction, Mockito.times(TABLES_PER_DPN))
+                .mergeParentStructurePut(ArgumentMatchers.any(),
+                        ArgumentMatchers.any(), ArgumentMatchers.any());
     }
 
     @Test
-    public void testDeleteTables() throws Exception {
+    public void testDeleteTables() {
         tableWriter.deleteTables(DPN_COUNT, START_TABLE_ID, END_TABLE_ID);
-        Mockito.verify(wTx, Mockito.times(TABLES_PER_DPN)).delete(Matchers.<LogicalDatastoreType>any(), Matchers.<InstanceIdentifier<DataObject>>any());
+        Mockito.verify(writeTransaction, Mockito.times(TABLES_PER_DPN))
+                .delete(ArgumentMatchers.any(),
+                        ArgumentMatchers.<InstanceIdentifier<DataObject>>any());
     }
-}
\ No newline at end of file
+}