OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / services / sal / SalMeterServiceImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImplTest.java
old mode 100644 (file)
new mode 100755 (executable)
index 75debf6..68ca0c0
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImplTest.java
@@ -7,21 +7,14 @@
  */
 package org.opendaylight.openflowplugin.impl.services.sal;
 
-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.meter.DeviceMeterRegistry;
-import org.opendaylight.openflowplugin.api.openflow.rpc.listener.ItemLifecycleListener;
 import org.opendaylight.openflowplugin.impl.services.ServiceMocking;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutput;
@@ -35,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.met
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.UpdatedMeter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.UpdatedMeterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
-import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
 public class SalMeterServiceImplTest extends ServiceMocking {
 
@@ -48,93 +40,56 @@ public class SalMeterServiceImplTest extends ServiceMocking {
     SalMeterServiceImpl salMeterService;
 
     @Override
-    public void initialization() {
-        super.initialization();
-        when(mockedDeviceContext.getDeviceMeterRegistry()).thenReturn(mockedDeviceMeterRegistry);
+    protected void setup() {
         final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
         salMeterService = new SalMeterServiceImpl(mockedRequestContextStack, mockedDeviceContext, convertorManager);
     }
 
     @Test
     public void testAddMeter() throws Exception {
-        addMeter(null);
+        addMeter();
     }
 
-    @Test
-    public void testAddMeterWithItemLifecycle() throws Exception {
-        addMeter(mock(ItemLifecycleListener.class));
-    }
 
-    private void addMeter(final ItemLifecycleListener itemLifecycleListener) {
+    private void addMeter() {
         final MeterId dummyMeterId = new MeterId(DUMMY_METER_ID);
         AddMeterInput addMeterInput = new AddMeterInputBuilder().setMeterId(dummyMeterId).build();
-
         this.<AddMeterOutput>mockSuccessfulFuture();
-
-        salMeterService.setItemLifecycleListener(itemLifecycleListener);
-
         salMeterService.addMeter(addMeterInput);
         verify(mockedRequestContextStack).createRequestContext();
-        verify(mockedDeviceMeterRegistry).store(eq(dummyMeterId));
-
-        if (itemLifecycleListener != null) {
-            verify(itemLifecycleListener).onAdded(Matchers.<KeyedInstanceIdentifier<Meter, MeterKey>>any(),Matchers.<Meter>any());
-        }
     }
 
     @Test
     public void testUpdateMeter() throws Exception {
-        updateMeter(null);
+        updateMeter();
     }
 
-    @Test
-    public void testUpdateMeterWithItemLifecycle() throws Exception {
-        updateMeter(mock(ItemLifecycleListener.class));
-    }
 
-    private void updateMeter(final ItemLifecycleListener itemLifecycleListener) throws Exception {
-        final UpdatedMeter dummyUpdatedMeter = new UpdatedMeterBuilder().setMeterId(new MeterId(DUMMY_METTER_ID)).build();
-        final OriginalMeter dummyOriginalMeter = new OriginalMeterBuilder().setMeterId(new MeterId(DUMMY_METTER_ID)).build();
+    private void updateMeter() throws Exception {
+        final UpdatedMeter dummyUpdatedMeter =
+                new UpdatedMeterBuilder().setMeterId(new MeterId(DUMMY_METTER_ID)).build();
+        final OriginalMeter dummyOriginalMeter =
+                new OriginalMeterBuilder().setMeterId(new MeterId(DUMMY_METTER_ID)).build();
 
-        final UpdateMeterInput updateMeterInput = new UpdateMeterInputBuilder().setUpdatedMeter(dummyUpdatedMeter).setOriginalMeter(dummyOriginalMeter).build();
+        final UpdateMeterInput updateMeterInput = new UpdateMeterInputBuilder()
+                .setUpdatedMeter(dummyUpdatedMeter).setOriginalMeter(dummyOriginalMeter).build();
 
         this.<AddMeterOutput>mockSuccessfulFuture();
-
-        salMeterService.setItemLifecycleListener(itemLifecycleListener);
-
         salMeterService.updateMeter(updateMeterInput);
         verify(mockedRequestContextStack).createRequestContext();
-
-        if (itemLifecycleListener != null) {
-            verify(itemLifecycleListener).onAdded(Matchers.<KeyedInstanceIdentifier<Meter, MeterKey>>any(),Matchers.<Meter>any());
-            verify(itemLifecycleListener).onRemoved(Matchers.<KeyedInstanceIdentifier<Meter, MeterKey>>any());
-        }
     }
 
     @Test
     public void testRemoveMeter() throws Exception {
-        removeMeter(null);
+        removeMeter();
     }
 
-    @Test
-    public void testRemoveMeterWithItemLifecycle() throws Exception {
-        removeMeter(mock(ItemLifecycleListener.class));
-    }
 
-    private void removeMeter(final ItemLifecycleListener itemLifecycleListener) throws Exception {
+    private void removeMeter() throws Exception {
         final MeterId dummyMeterId = new MeterId(DUMMY_METER_ID);
         RemoveMeterInput removeMeterInput = new RemoveMeterInputBuilder().setMeterId(dummyMeterId).build();
-
         this.<RemoveMeterOutput>mockSuccessfulFuture();
-
-        salMeterService.setItemLifecycleListener(itemLifecycleListener);
-
         salMeterService.removeMeter(removeMeterInput);
         verify(mockedRequestContextStack).createRequestContext();
-        verify(mockedDeviceMeterRegistry).markToBeremoved(eq(dummyMeterId));
-
-        if (itemLifecycleListener != null) {
-            verify(itemLifecycleListener).onRemoved(Matchers.<KeyedInstanceIdentifier<Meter, MeterKey>>any());
-        }
     }
-}
+}
\ No newline at end of file