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%2FAbstractConfigTest.java;h=d65133c783e4bf31ba97c90a8e71fef2a561938a;hb=refs%2Fchanges%2F73%2F46573%2F5;hp=30da27f1a1dee6951d05fe59b96b81e319d936c6;hpb=e631dc96f0461b2270377dc072b9f969a875667a;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java index 30da27f1a1..d65133c783 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java @@ -12,8 +12,9 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; - import com.google.common.base.Preconditions; +import java.io.File; +import java.io.IOException; import java.lang.management.ManagementFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -38,7 +39,7 @@ import org.opendaylight.controller.config.api.jmx.CommitStatus; import org.opendaylight.controller.config.manager.impl.factoriesresolver.ModuleFactoriesResolver; import org.opendaylight.controller.config.manager.impl.jmx.BaseJMXRegistrator; import org.opendaylight.controller.config.manager.impl.jmx.ConfigRegistryJMXRegistrator; -import org.opendaylight.controller.config.manager.impl.jmx.InternalJMXRegistrator; +import org.opendaylight.controller.config.manager.impl.jmx.JMXNotifierConfigRegistry; import org.opendaylight.controller.config.manager.impl.osgi.mapping.BindingContextProvider; import org.opendaylight.controller.config.manager.testingservices.scheduledthreadpool.TestingScheduledThreadPoolImpl; import org.opendaylight.controller.config.manager.testingservices.threadpool.TestingFixedThreadPool; @@ -60,30 +61,28 @@ import org.osgi.framework.ServiceRegistration; * {@link #initConfigTransactionManagerImpl(org.opendaylight.controller.config.manager.impl.factoriesresolver.ModuleFactoriesResolver)} * typically during setting up the each test. */ -public abstract class AbstractConfigTest extends - AbstractLockedPlatformMBeanServerTest { +public abstract class AbstractConfigTest extends AbstractLockedPlatformMBeanServerTest { protected ConfigRegistryJMXRegistrator configRegistryJMXRegistrator; protected ConfigRegistryImpl configRegistry; + private JMXNotifierConfigRegistry notifyingConfigRegistry; protected ConfigRegistryJMXClient configRegistryClient; protected BaseJMXRegistrator baseJmxRegistrator; - protected InternalJMXRegistrator internalJmxRegistrator; @Mock protected BundleContext mockedContext; @Mock protected ServiceRegistration mockedServiceRegistration; + protected BundleContextServiceRegistrationHandler currentBundleContextServiceRegistrationHandler; @Before public void setUpMocks() { MockitoAnnotations.initMocks(this); } - // Default handler for OSGi service registration protected static class RecordingBundleContextServiceRegistrationHandler implements BundleContextServiceRegistrationHandler { private final List registrations = new LinkedList<>(); @Override - public void handleServiceRegistration(Class clazz, Object serviceInstance, Dictionary props) { - + public void handleServiceRegistration(final Class clazz, final Object serviceInstance, final Dictionary props) { registrations.add(new RegistrationHolder(clazz, serviceInstance, props)); } @@ -96,33 +95,27 @@ public abstract class AbstractConfigTest extends protected final Object instance; protected final Dictionary props; - public RegistrationHolder(Class clazz, Object instance, Dictionary props) { + public RegistrationHolder(final Class clazz, final Object instance, final Dictionary props) { this.clazz = clazz; this.instance = instance; this.props = props; } } - } - protected BundleContextServiceRegistrationHandler currentBundleContextServiceRegistrationHandler; - - protected BundleContextServiceRegistrationHandler getBundleContextServiceRegistrationHandler(Class serviceType) { + protected BundleContextServiceRegistrationHandler getBundleContextServiceRegistrationHandler(final Class serviceType) { return currentBundleContextServiceRegistrationHandler; } // this method should be called in @Before - protected void initConfigTransactionManagerImpl( - ModuleFactoriesResolver resolver) { + protected void initConfigTransactionManagerImpl(final ModuleFactoriesResolver resolver) { - final MBeanServer platformMBeanServer = ManagementFactory - .getPlatformMBeanServer(); + final MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer(); configRegistryJMXRegistrator = new ConfigRegistryJMXRegistrator(platformMBeanServer); initBundleContext(); - internalJmxRegistrator = new InternalJMXRegistrator(platformMBeanServer); - baseJmxRegistrator = new BaseJMXRegistrator(internalJmxRegistrator); + baseJmxRegistrator = new BaseJMXRegistrator(platformMBeanServer); configRegistry = new ConfigRegistryImpl(resolver, platformMBeanServer, baseJmxRegistrator, new BindingContextProvider() { @Override @@ -135,9 +128,11 @@ public abstract class AbstractConfigTest extends return getBindingRuntimeContext(); } }); + notifyingConfigRegistry = new JMXNotifierConfigRegistry(this.configRegistry, platformMBeanServer); try { - configRegistryJMXRegistrator.registerToJMX(configRegistry); + configRegistryJMXRegistrator.registerToJMXNoNotifications(configRegistry); + configRegistryJMXRegistrator.registerToJMX(notifyingConfigRegistry); } catch (InstanceAlreadyExistsException e) { throw new RuntimeException(e); } @@ -155,6 +150,7 @@ public abstract class AbstractConfigTest extends @After public final void cleanUpConfigTransactionManagerImpl() { configRegistryJMXRegistrator.close(); + notifyingConfigRegistry.close(); configRegistry.close(); TestingFixedThreadPool.cleanUp(); TestingScheduledThreadPoolImpl.cleanUp(); @@ -176,19 +172,18 @@ public abstract class AbstractConfigTest extends transaction.commit(); } - protected void assertStatus(CommitStatus status, int expectedNewInstances, - int expectedRecreatedInstances, int expectedReusedInstances) { + protected void assertStatus(final CommitStatus status, final int expectedNewInstances, + final int expectedRecreatedInstances, final int expectedReusedInstances) { assertEquals("New instances mismatch in " + status, expectedNewInstances, status.getNewInstances().size()); - assertEquals("Recreated instances mismatch in " + status, expectedRecreatedInstances, status.getRecreatedInstances() - .size()); - assertEquals("Reused instances mismatch in " + status, expectedReusedInstances, status.getReusedInstances() - .size()); + assertEquals("Recreated instances mismatch in " + status, expectedRecreatedInstances, + status.getRecreatedInstances().size()); + assertEquals("Reused instances mismatch in " + status, expectedReusedInstances, + status.getReusedInstances().size()); } - protected void assertBeanCount(int i, String configMXBeanName) { - assertEquals(i, configRegistry.lookupConfigBeans(configMXBeanName) - .size()); + protected void assertBeanCount(final int i, final String configMXBeanName) { + assertEquals(i, configRegistry.lookupConfigBeans(configMXBeanName).size()); } /** @@ -199,8 +194,8 @@ public abstract class AbstractConfigTest extends * @param implementationName * @return */ - protected ClassBasedModuleFactory createClassBasedCBF( - Class configBeanClass, String implementationName) { + protected ClassBasedModuleFactory createClassBasedCBF(final Class configBeanClass, + final String implementationName) { return new ClassBasedModuleFactory(implementationName, configBeanClass); } @@ -208,29 +203,26 @@ public abstract class AbstractConfigTest extends return mock(BindingRuntimeContext.class); } - public static interface BundleContextServiceRegistrationHandler { - + public interface BundleContextServiceRegistrationHandler { void handleServiceRegistration(Class clazz, Object serviceInstance, Dictionary props); - } private class RegisterServiceAnswer implements Answer> { - @Override - public ServiceRegistration answer(InvocationOnMock invocation) throws Throwable { + public ServiceRegistration answer(final InvocationOnMock invocation) throws Throwable { Object[] args = invocation.getArguments(); Preconditions.checkArgument(args.length == 3, "Unexpected arguments size (expected 3 was %s)", args.length); Object serviceTypeRaw = args[0]; Object serviceInstance = args[1]; + @SuppressWarnings("unchecked") Dictionary props = (Dictionary) args[2]; if (serviceTypeRaw instanceof Class) { Class serviceType = (Class) serviceTypeRaw; invokeServiceHandler(serviceInstance, serviceType, props); - - } else if(serviceTypeRaw instanceof String[]) { + } else if (serviceTypeRaw instanceof String[]) { for (String className : (String[]) serviceTypeRaw) { invokeServiceHandler(serviceInstance, className, props); } @@ -240,11 +232,10 @@ public abstract class AbstractConfigTest extends throw new IllegalStateException("Not handling service registration of type, Unknown type" + serviceTypeRaw); } - return mockedServiceRegistration; } - public void invokeServiceHandler(Object serviceInstance, String className, Dictionary props) { + public void invokeServiceHandler(final Object serviceInstance, final String className, final Dictionary props) { try { Class serviceType = Class.forName(className); invokeServiceHandler(serviceInstance, serviceType, props); @@ -253,7 +244,7 @@ public abstract class AbstractConfigTest extends } } - private void invokeServiceHandler(Object serviceInstance, Class serviceType, Dictionary props) { + private void invokeServiceHandler(final Object serviceInstance, final Class serviceType, final Dictionary props) { BundleContextServiceRegistrationHandler serviceRegistrationHandler = getBundleContextServiceRegistrationHandler(serviceType); if (serviceRegistrationHandler != null) { @@ -268,11 +259,11 @@ public abstract class AbstractConfigTest extends * @param innerObject jmx proxy which will be wrapped and returned */ protected T rethrowCause(final T innerObject) { - - Object proxy = Proxy.newProxyInstance(innerObject.getClass().getClassLoader(), + @SuppressWarnings("unchecked") + final T proxy = (T)Proxy.newProxyInstance(innerObject.getClass().getClassLoader(), innerObject.getClass().getInterfaces(), new InvocationHandler() { @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { try { return method.invoke(innerObject, args); } catch (InvocationTargetException e) { @@ -285,7 +276,29 @@ public abstract class AbstractConfigTest extends } } ); - return (T) proxy; + return proxy; } + /** + * removes contents of the directory + * @param dir to be cleaned + * @throws IOException + */ + protected void cleanDirectory(final File dir) throws IOException { + if (!dir.isDirectory()) { + throw new IllegalStateException("dir must be a directory"); + } + + final File[] files = dir.listFiles(); + if (files == null) { + throw new IOException("Failed to list contents of " + dir); + } + + for (File file : files) { + if (file.isDirectory()) { + cleanDirectory(dir); + } + file.delete(); + } + } }