X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftest%2Fsal%2Fbinding%2Fit%2FNoficationTest.java;h=b23ceaaf15b69c0bed04977b97e3bcefb7eab50a;hp=2f86ee4cc2e9e34c4db55b803b565f090c7962b5;hb=fd8c7a6e7445ca9788c2557caa9da5af8c8a2153;hpb=1dd1433d1e2f30855b098cca7cc48039a9747df8 diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NoficationTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NoficationTest.java index 2f86ee4cc2..b23ceaaf15 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NoficationTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NoficationTest.java @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2014 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.controller.test.sal.binding.it; import static org.junit.Assert.assertEquals; @@ -12,7 +19,6 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; @@ -31,8 +37,8 @@ import org.opendaylight.yangtools.yang.binding.RpcService; public class NoficationTest extends AbstractTest { - private FlowListener listener1 = new FlowListener(); - private FlowListener listener2 = new FlowListener(); + private final FlowListener listener1 = new FlowListener(); + private final FlowListener listener2 = new FlowListener(); private Registration listener1Reg; private Registration listener2Reg; @@ -46,9 +52,9 @@ public class NoficationTest extends AbstractTest { @Test public void notificationTest() throws Exception { /** - * + * * The registration of the Provider 1. - * + * */ AbstractTestProvider provider1 = new AbstractTestProvider() { @Override @@ -62,10 +68,10 @@ public class NoficationTest extends AbstractTest { assertNotNull(notifyProviderService); /** - * + * * The registration of the Consumer 1. It retrieves Notification Service * from MD-SAL and registers SalFlowListener as notification listener - * + * */ BindingAwareConsumer consumer1 = new BindingAwareConsumer() { @Override @@ -90,7 +96,7 @@ public class NoficationTest extends AbstractTest { /** * Check that one notification was delivered and has correct cookie. - * + * */ assertEquals(1, listener1.addedFlows.size()); assertEquals(0, listener1.addedFlows.get(0).getCookie().intValue()); @@ -100,31 +106,31 @@ public class NoficationTest extends AbstractTest { * registered as notification listener. */ BindingAwareProvider provider = new BindingAwareProvider() { - + @Override public void onSessionInitiated(ProviderContext session) { listener2Reg = session.getSALService(NotificationProviderService.class).registerNotificationListener( listener2); } - + @Override public void onSessionInitialized(ConsumerContext session) { // TODO Auto-generated method stub - + } - + @Override public Collection getImplementations() { // TODO Auto-generated method stub return null; } - + @Override public Collection getFunctionality() { // TODO Auto-generated method stub return null; } - + }; // registerConsumer method calls onSessionInitialized method above @@ -146,19 +152,19 @@ public class NoficationTest extends AbstractTest { /** * Check that 3 notification was delivered to both listeners (first one * received 4 in total, second 3 in total). - * + * */ assertEquals(4, listener1.addedFlows.size()); assertEquals(3, listener2.addedFlows.size()); /** * The second listener is closed (unregistered) - * + * */ listener2Reg.close(); /** - * + * * The notification 5 is published */ notifyProviderService.publish(flowAdded(10)); @@ -173,7 +179,7 @@ public class NoficationTest extends AbstractTest { * Check that first consumer received 5 notifications in total, second * consumer received only three. Last notification was never received by * second consumer because its listener was unregistered. - * + * */ assertEquals(5, listener1.addedFlows.size()); assertEquals(3, listener2.addedFlows.size()); @@ -183,7 +189,7 @@ public class NoficationTest extends AbstractTest { /** * Creates instance of the type FlowAdded. Only cookie value is set. It is * used only for testing purpose. - * + * * @param i * cookie value * @return instance of the type FlowAdded @@ -195,7 +201,7 @@ public class NoficationTest extends AbstractTest { } /** - * + * * Implements * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowListener * SalFlowListener} and contains attributes which keep lists of objects of @@ -218,7 +224,7 @@ public class NoficationTest extends AbstractTest { @Override public void onFlowRemoved(FlowRemoved notification) { removedFlows.add(notification); - }; + }; @Override public void onFlowUpdated(FlowUpdated notification) { @@ -228,20 +234,20 @@ public class NoficationTest extends AbstractTest { @Override public void onSwitchFlowRemoved(SwitchFlowRemoved notification) { // TODO Auto-generated method stub - + } @Override public void onNodeErrorNotification(NodeErrorNotification notification) { // TODO Auto-generated method stub - + } @Override public void onNodeExperimenterErrorNotification( NodeExperimenterErrorNotification notification) { // TODO Auto-generated method stub - + } }