X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Futil%2FInterfacesHelperTest.java;h=ba105bc09e4fb7b7757614c7e7d526d06db0afd8;hp=34039ce8d04303338cca59f0d49b2793d8f5b5c5;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=ebb4158697741bc88fde22ac5f75edf65869506f diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java index 34039ce8d0..ba105bc09e 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2013, 2017 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, @@ -25,52 +25,57 @@ import org.opendaylight.yangtools.concepts.Identifiable; public class InterfacesHelperTest { - interface SuperA { + public interface SuperA { } - interface SuperBMXBean { + public interface SuperBMXBean { } - interface SuperC extends SuperA, SuperBMXBean { + public interface SuperC extends SuperA, SuperBMXBean { } - class SuperClass implements SuperC { + public class SuperClass implements SuperC { } @MXBean - interface SubA { + public interface SubA { } - @ServiceInterfaceAnnotation(value = "a", osgiRegistrationType = SuperA.class, namespace = "n", revision = "r", localName = "l") - interface Service extends AbstractServiceInterface{} - @ServiceInterfaceAnnotation(value = "b", osgiRegistrationType = SuperC.class, namespace = "n", revision = "r", localName = "l") - interface SubService extends Service{} + @ServiceInterfaceAnnotation(value = "a", osgiRegistrationType = + SuperA.class, namespace = "n", revision = "r", localName = "l") + public interface Service extends AbstractServiceInterface { + } + + @ServiceInterfaceAnnotation(value = "b", osgiRegistrationType = + SuperC.class, namespace = "n", revision = "r", localName = "l") + public interface SubService extends Service { + } - abstract class SubClass extends SuperClass implements SubA, Module { + public abstract class SubClass extends SuperClass implements SubA, Module { } - abstract class SubClassWithService implements SubService, Module { + public abstract class SubClassWithService implements SubService, Module { } @Test public void testGetAllInterfaces() { - Set> expected = Sets.> newHashSet(SuperA.class, SuperBMXBean.class, SuperC.class, - SubA.class, Identifiable.class, Module.class); - assertEquals(expected, - InterfacesHelper.getAllInterfaces(SubClass.class)); + Set> expected = Sets.>newHashSet(SuperA.class, SuperBMXBean.class, SuperC.class, SubA.class, + Identifiable.class, Module.class); + assertEquals(expected, InterfacesHelper.getAllInterfaces(SubClass.class)); } @Test public void testGetServiceInterfaces() throws Exception { assertEquals(Collections.>emptySet(), InterfacesHelper.getServiceInterfaces(SubClass.class)); - assertEquals(Sets.>newHashSet(Service.class, SubService.class), InterfacesHelper.getServiceInterfaces(SubClassWithService.class)); + assertEquals(Sets.>newHashSet(Service.class, SubService.class), + InterfacesHelper.getServiceInterfaces(SubClassWithService.class)); } @Test @@ -82,21 +87,20 @@ public class InterfacesHelperTest { @Test public void testGetMXInterfaces() { - Set> expected = Sets.> newHashSet(SuperBMXBean.class, SubA.class); + Set> expected = Sets.>newHashSet(SuperBMXBean.class, SubA.class); assertEquals(expected, InterfacesHelper.getMXInterfaces(SubClass.class)); } @Test - public void testGetAllAbstractServiceInterfaceClasses(){ + public void testGetAllAbstractServiceInterfaceClasses() { Class clazz = TestingScheduledThreadPoolServiceInterface.class; Set> input = new HashSet<>(); input.add(clazz); - Set> result = InterfacesHelper.getAllAbstractServiceInterfaceClasses(input); + Set> result = InterfacesHelper + .getAllAbstractServiceInterfaceClasses(input); Set> expected = ImmutableSet.of((Class) TestingScheduledThreadPoolServiceInterface.class, - TestingThreadPoolServiceInterface.class - ); + TestingThreadPoolServiceInterface.class); assertEquals(expected, result); } - }