X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Futil%2FOsgiRegistrationUtilTest.java;h=6763facae57247ce7bb149d544c175035537804e;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hp=f1efc4787dfc3320fc1017c88f6819caf9f2ad5d;hpb=660a4a4a51718896518b8c4deeeb6e0bb3637bde;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java index f1efc4787d..6763facae5 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java @@ -1,9 +1,18 @@ +/* + * 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, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + package org.opendaylight.controller.config.manager.impl.util; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; @@ -22,7 +31,8 @@ public class OsgiRegistrationUtilTest { ServiceRegistration registration2 = mockServiceRegistration(); doReturn(registration2).when(bundleContext).registerService(Object.class, "string", null); - AutoCloseable aggregatedRegister = OsgiRegistrationUtil.registerService(bundleContext, "string", String.class, Object.class); + AutoCloseable aggregatedRegister = OsgiRegistrationUtil.registerService(bundleContext, "string", String.class, + Object.class); aggregatedRegister.close(); InOrder inOrder = Mockito.inOrder(registration, registration2); @@ -47,7 +57,7 @@ public class OsgiRegistrationUtilTest { verify(sTracker).close(); } - private ServiceRegistration mockServiceRegistration() { + private static ServiceRegistration mockServiceRegistration() { ServiceRegistration mock = mock(ServiceRegistration.class); doNothing().when(mock).unregister(); return mock; @@ -55,6 +65,5 @@ public class OsgiRegistrationUtilTest { @Test public void testAggregate() throws Exception { - } -} \ No newline at end of file +}