Reduce use of powermockito

[ovsdb.git] / southbound / southbound-impl / src / test / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / TransactCommandAggregatorTest.java

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactCommandAggregatorTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactCommandAggregatorTest.java
index 5d4787202e6a33645c0b1dae8c8b5848d2d8e461..3410bbecef7103fb8e6516dbc4a4415bd676d93e 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactCommandAggregatorTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactCommandAggregatorTest.java
@@ -15,26 +15,21 @@ import static org.mockito.Mockito.verify;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
 
-@PrepareForTest({})
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class TransactCommandAggregatorTest {
-    private List<TransactCommand> commands = new ArrayList<>();
+
+    private final List<TransactCommand> commands = new ArrayList<>();
     private TransactCommandAggregator transactCommandAggregator;
-    @Mock private AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes;
+    @Mock private DataChangeEvent changes;
     @Mock private BridgeOperationalState operationalState;
 
     @Before
@@ -66,11 +61,14 @@ public class TransactCommandAggregatorTest {
     public void testExecute() {
         TransactionBuilder transaction = mock(TransactionBuilder.class);
         for (TransactCommand command: commands) {
-            doNothing().when(command).execute(any(TransactionBuilder.class), any(BridgeOperationalState.class), any(AsyncDataChangeEvent.class));
+            doNothing().when(command).execute(any(TransactionBuilder.class), any(BridgeOperationalState.class),
+                    any(DataChangeEvent.class), any(InstanceIdentifierCodec.class));
         }
-        transactCommandAggregator.execute(transaction, mock(BridgeOperationalState.class), mock(AsyncDataChangeEvent.class));
+        transactCommandAggregator.execute(transaction, mock(BridgeOperationalState.class),
+                mock(DataChangeEvent.class), mock(InstanceIdentifierCodec.class));
         for (TransactCommand command: commands) {
-            verify(command).execute(any(TransactionBuilder.class), any(BridgeOperationalState.class), any(AsyncDataChangeEvent.class));
+            verify(command).execute(any(TransactionBuilder.class), any(BridgeOperationalState.class),
+                    any(DataChangeEvent.class), any(InstanceIdentifierCodec.class));
         }
     }
 }