X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=southbound%2Fsouthbound-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fsouthbound%2Fovsdb%2Ftransact%2FTransactUtilsTest.java;h=dba5cf5817387c2b9af3710a8190a91462c3f957;hb=50e7f939993fa9da3c80a1c8d166629a4868af9c;hp=8f5c7c9366fcdd1a39d8d0733b92aae3e7eeea21;hpb=9109c7e6816c815ae5a7768bcad49d0e55034946;p=ovsdb.git

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java
index 8f5c7c936..dba5cf581 100644
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java
@@ -80,7 +80,7 @@ public class TransactUtilsTest {
         Class<DataObject> klazz = DataObject.class;
         Map<InstanceIdentifier<?>, DataObject> map = new HashMap<>();
         when(changes.getCreatedData()).thenReturn(map);
-        when(TransactUtils.extract(any(Map.class),eq(DataObject.class))).thenReturn(map);
+        when(TransactUtils.extract(any(Map.class),eq(DataObject.class))).thenReturn(new HashMap<>());
 
         //test extractCreated()
         assertEquals(map, TransactUtils.extractCreated(changes, klazz));
@@ -99,7 +99,7 @@ public class TransactUtilsTest {
         PowerMockito.suppress(MemberMatcher.method(TransactUtils.class, "extractUpdated", AsyncDataChangeEvent.class, Class.class));
         PowerMockito.when(TransactUtils.extractUpdated(any(AsyncDataChangeEvent.class),eq(DataObject.class))).thenReturn(result);
 
-        Map<InstanceIdentifier<DataObject>, DataObject> map = new HashMap<InstanceIdentifier<DataObject>, DataObject>();
+        Map<InstanceIdentifier<DataObject>, DataObject> map = new HashMap<>();
         InstanceIdentifier<DataObject> iid = mock(InstanceIdentifier.class);
         DataObject db = mock(DataObject.class);
         map.put(iid, db);
@@ -121,7 +121,7 @@ public class TransactUtilsTest {
         PowerMockito.suppress(MemberMatcher.method(TransactUtils.class, "extractCreatedOrUpdated", AsyncDataChangeEvent.class, Class.class));
         PowerMockito.when(TransactUtils.extractCreatedOrUpdated(any(AsyncDataChangeEvent.class),eq(DataObject.class))).thenReturn(result);
 
-        Map<InstanceIdentifier<DataObject>, DataObject> map = new HashMap<InstanceIdentifier<DataObject>, DataObject>();
+        Map<InstanceIdentifier<DataObject>, DataObject> map = new HashMap<>();
         InstanceIdentifier<DataObject> iid = mock(InstanceIdentifier.class);
         DataObject db = mock(DataObject.class);
         map.put(iid, db);
@@ -140,7 +140,7 @@ public class TransactUtilsTest {
         Class<DataObject> klazz = DataObject.class;
         Map<InstanceIdentifier<?>, DataObject> map = new HashMap<>();
         when(changes.getOriginalData()).thenReturn(map);
-        when(TransactUtils.extract(any(Map.class),eq(DataObject.class))).thenReturn(map);
+        when(TransactUtils.extract(any(Map.class),eq(DataObject.class))).thenReturn(new HashMap<>());
 
         //test extractOriginal()
         assertEquals(map, TransactUtils.extractCreated(changes, klazz));
@@ -182,14 +182,14 @@ public class TransactUtilsTest {
         TransactionBuilder transaction = mock(TransactionBuilder.class);
         GenericTableSchema schema = mock(GenericTableSchema.class);
 
-        List<Operation> operations = new ArrayList<Operation>();
+        List<Operation> operations = new ArrayList<>();
         Operation operation = mock(Insert.class);
         operations.add(operation);
         when(transaction.getOperations()).thenReturn(operations);
         when(operation.getTableSchema()).thenReturn(schema);
 
         List<Insert> inserts = TransactUtils.extractInsert(transaction, schema);
-        assertEquals((Insert)operation, inserts.get(0));
+        assertEquals(operation, inserts.get(0));
     }
 
     @SuppressWarnings("rawtypes")
@@ -198,7 +198,7 @@ public class TransactUtilsTest {
         Insert insert = mock(Insert.class);
         when(insert.getUuidName()).thenReturn(UUID_NAME);
         PowerMockito.mockStatic(SouthboundMapper.class);
-        PowerMockito.when(SouthboundMapper.getRandomUUID()).thenReturn(UUID_NAME);
+        PowerMockito.when(SouthboundMapper.getRandomUuid()).thenReturn(UUID_NAME);
         doNothing().when(insert).setUuidName(anyString());
 
         UUID uuid = mock(UUID.class);
@@ -238,7 +238,7 @@ public class TransactUtilsTest {
 
         Mutate<GenericTableSchema> mutate = mock(Mutate.class);
         Operations op = (Operations) setField("op");
-        when(op.mutate(any(TableSchema.class))).thenReturn(mutate);
+        Mockito.<Mutate<GenericTableSchema>>when(op.mutate(any(TableSchema.class))).thenReturn(mutate);
         when(mutate.addMutation(any(ColumnSchema.class), any(Mutator.class), any(Map.class))).thenReturn(mutate);
 
         Mutation deleteIidMutation = mock(Mutation.class);