X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fservices%2FSalGroupServiceImplTest.java;h=0b224bf95191b8e85121def50f5e5df652f3a830;hb=refs%2Fchanges%2F90%2F40490%2F1;hp=379754612f35c6af66f31dabab5361cdc62704ea;hpb=7092c47e25a93adbf92ab51769ae7ae6ae4639da;p=openflowplugin.git

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalGroupServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalGroupServiceImplTest.java
index 379754612f..0b224bf951 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalGroupServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/SalGroupServiceImplTest.java
@@ -1,57 +1,128 @@
 package org.opendaylight.openflowplugin.impl.services;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.junit.Test;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.opendaylight.openflowplugin.api.openflow.registry.group.DeviceGroupRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.*;
+import org.opendaylight.openflowplugin.api.openflow.rpc.listener.ItemLifecycleListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.OriginalGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.OriginalGroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
 public class SalGroupServiceImplTest extends ServiceMocking {
 
     private static final Long DUMMY_GROUP_ID = 15L;
-    public SalGroupService salGroupService;
 
     @Mock
     DeviceGroupRegistry mockedDeviceGroupRegistry;
 
+    SalGroupServiceImpl salGroupService;
+
     @Override
     public void initialization() {
         super.initialization();
-        salGroupService = new SalGroupServiceImpl(mockedRequestContextStack, mockedDeviceContext);
         when(mockedDeviceContext.getDeviceGroupRegistry()).thenReturn(mockedDeviceGroupRegistry);
+        salGroupService = new SalGroupServiceImpl(mockedRequestContextStack, mockedDeviceContext);
     }
 
     @Test
     public void testAddGroup() throws Exception {
+        addGroup(null);
+    }
+
+    @Test
+    public void testAddGroupWithItemLifecycle() throws Exception {
+        addGroup(mock(ItemLifecycleListener.class));
+    }
+
+    private void addGroup(final ItemLifecycleListener itemLifecycleListener) {
         final GroupId dummyGroupId = new GroupId(DUMMY_GROUP_ID);
         AddGroupInput addGroupInput = new AddGroupInputBuilder().setGroupId(dummyGroupId).build();
 
+        this.<AddGroupOutput>mockSuccessfulFuture();
+
+        salGroupService.setItemLifecycleListener(itemLifecycleListener);
+
         salGroupService.addGroup(addGroupInput);
         verify(mockedRequestContextStack).createRequestContext();
         verify(mockedDeviceGroupRegistry).store(eq(dummyGroupId));
+
+        if (itemLifecycleListener != null) {
+            verify(itemLifecycleListener).onAdded(Matchers.<KeyedInstanceIdentifier<Group, GroupKey>>any(),Matchers.<Group>any());
+        }
     }
 
     @Test
     public void testUpdateGroup() throws Exception {
-        UpdatedGroup mockedUptatedGroup = mock(UpdatedGroup.class);
-        final UpdateGroupInput updateGroupInput = new UpdateGroupInputBuilder().setUpdatedGroup(mockedUptatedGroup).build();
+        updateGroup(null);
+    }
+
+    @Test
+    public void testUpdateGroupWithItemLifecycle() throws Exception {
+        updateGroup(mock(ItemLifecycleListener.class));
+    }
+
+    private void updateGroup(final ItemLifecycleListener itemLifecycleListener) {
+        final UpdatedGroup updatedGroup = new UpdatedGroupBuilder().setGroupId(new GroupId(DUMMY_GROUP_ID)).build();
+        final OriginalGroup originalGroup = new OriginalGroupBuilder().setGroupId(new GroupId(DUMMY_GROUP_ID)).build();
+        final UpdateGroupInput updateGroupInput = new UpdateGroupInputBuilder().setUpdatedGroup(updatedGroup).setOriginalGroup(originalGroup).build();
+
+        this.<UpdateGroupOutput>mockSuccessfulFuture();
+
+        salGroupService.setItemLifecycleListener(itemLifecycleListener);
+
         salGroupService.updateGroup(updateGroupInput);
         verify(mockedRequestContextStack).createRequestContext();
+
+        if (itemLifecycleListener != null) {
+            verify(itemLifecycleListener).onAdded(Matchers.<KeyedInstanceIdentifier<Group, GroupKey>>any(),Matchers.<Group>any());
+            verify(itemLifecycleListener).onRemoved(Matchers.<KeyedInstanceIdentifier<Group, GroupKey>>any());
+        }
     }
 
     @Test
     public void testRemoveGroup() throws Exception {
+        removeGroup(null);
+    }
+
+    @Test
+    public void testRemoveGroupWithItemLifecycle() throws Exception {
+        removeGroup(mock(ItemLifecycleListener.class));
+    }
+
+    private void removeGroup(final ItemLifecycleListener itemLifecycleListener) throws Exception {
         final GroupId dummyGroupId = new GroupId(DUMMY_GROUP_ID);
         RemoveGroupInput removeGroupInput = new RemoveGroupInputBuilder().setGroupId(dummyGroupId).build();
 
+        this.<RemoveGroupOutput>mockSuccessfulFuture();
+
+        salGroupService.setItemLifecycleListener(itemLifecycleListener);
+
         salGroupService.removeGroup(removeGroupInput);
         verify(mockedRequestContextStack).createRequestContext();
         verify(mockedDeviceGroupRegistry).markToBeremoved(eq(dummyGroupId));
+
+        if (itemLifecycleListener != null) {
+            verify(itemLifecycleListener).onRemoved(Matchers.<KeyedInstanceIdentifier<Group, GroupKey>>any());
+        }
     }
 }
\ No newline at end of file