Mercurial > hg > release > thermostat-0.7
view client/command/src/test/java/com/redhat/thermostat/client/command/cli/PingCommandTest.java @ 1045:3526e4183714
Remove OSGIUtils
This commit removes OSGIUtils. This class duplicated a lot of
functionality from BundleContext, and hides some important details about
OSGi such as where the underlying BundleContext comes from. For
instance, when developing the Eclipse client, at first the common-core
bundle wasn't started. This lead to NPEs in OSGIUtils because it uses
the BundleContext of the common-core bundle and not the bundle of the
calling class or the bundle containing the requested service. Another
problem with OSGIUtils is from several cases in Thermostat where we are
using getService instead of getServiceAllowNull, which throws NPEs if
the requested service is not registered.
Uses of OSGIUtils have been replaced with either a ServiceTracker for
long-running tasks (e.g. GUI), or for shell commands using a
BundleContext and checking the ServiceReference for null and throwing a
meaningful exception.
Reviewed-by: jerboaa, vanaltj, neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-March/006104.html
author | Elliott Baron <ebaron@redhat.com> |
---|---|
date | Fri, 22 Mar 2013 12:01:35 -0400 |
parents | 186115da601f |
children |
line wrap: on
line source
/* * Copyright 2012, 2013 Red Hat, Inc. * * This file is part of Thermostat. * * Thermostat is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2, or (at your * option) any later version. * * Thermostat is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Thermostat; see the file COPYING. If not see * <http://www.gnu.org/licenses/>. * * Linking this code with other modules is making a combined work * based on this code. Thus, the terms and conditions of the GNU * General Public License cover the whole combination. * * As a special exception, the copyright holders of this code give * you permission to link this code with independent modules to * produce an executable, regardless of the license terms of these * independent modules, and to copy and distribute the resulting * executable under terms of your choice, provided that you also * meet, for each linked independent module, the terms and conditions * of the license of that module. An independent module is a module * which is not derived from or based on this code. If you modify * this code, you may extend this exception to your version of the * library, but you are not obligated to do so. If you do not wish * to do so, delete this exception statement from your version. */ package com.redhat.thermostat.client.command.cli; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; import org.junit.Test; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.storage.core.HostRef; import com.redhat.thermostat.storage.dao.AgentInfoDAO; import com.redhat.thermostat.storage.dao.HostInfoDAO; import com.redhat.thermostat.storage.model.AgentInformation; import com.redhat.thermostat.test.TestCommandContextFactory; import com.redhat.thermostat.testutils.StubBundleContext; public class PingCommandTest { private static final String KNOWN_AGENT_ID = "some-agent-id"; @Test public void testCommandName() { StubBundleContext context = new StubBundleContext(); PingCommand command = new PingCommand(context); assertEquals("ping", command.getName()); } @Test public void testCommandNeedsAgentId() throws CommandException { StubBundleContext context = new StubBundleContext(); PingCommand command = new PingCommand(context); TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); command.run(factory.createContext(args)); // TODO why doesn't ping throw an exception? assertEquals("Ping command accepts one and only one argument.\nUsage not available.\n", factory.getOutput()); } @Test public void testCommandWithoutHostDao() throws CommandException { StubBundleContext context = new StubBundleContext(); PingCommand command = new PingCommand(context); TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); args.addNonOptionArgument(KNOWN_AGENT_ID); try { command.run(factory.createContext(args)); fail("did not throw expected exception"); } catch (CommandException agentDaoServiceMissing) { assertEquals("Unable to access host information: service not available", agentDaoServiceMissing.getMessage()); } } @Test public void testCommandWithoutAgentDao() throws CommandException { HostRef host1 = mock(HostRef.class); when(host1.getAgentId()).thenReturn(KNOWN_AGENT_ID); HostInfoDAO hostInfoDao = mock(HostInfoDAO.class); when(hostInfoDao.getAliveHosts()).thenReturn(Arrays.asList(host1)); StubBundleContext context = new StubBundleContext(); context.registerService(HostInfoDAO.class, hostInfoDao, null); PingCommand command = new PingCommand(context); TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); args.addNonOptionArgument(KNOWN_AGENT_ID); try { command.run(factory.createContext(args)); fail("did not throw expected exception"); } catch (CommandException agentDaoServiceMissing) { assertEquals("Unable to access agent information: service not available", agentDaoServiceMissing.getMessage()); } } @Test public void testCommandWithoutRequestQueue() throws CommandException { HostRef host1 = mock(HostRef.class); when(host1.getAgentId()).thenReturn(KNOWN_AGENT_ID); HostInfoDAO hostInfoDao = mock(HostInfoDAO.class); when(hostInfoDao.getAliveHosts()).thenReturn(Arrays.asList(host1)); AgentInfoDAO agentInfoDao = mock(AgentInfoDAO.class); AgentInformation info = mock(AgentInformation.class); when(info.getConfigListenAddress()).thenReturn("myHost:9001"); when(agentInfoDao.getAgentInformation(any(HostRef.class))).thenReturn(info); StubBundleContext context = new StubBundleContext(); context.registerService(HostInfoDAO.class, hostInfoDao, null); context.registerService(AgentInfoDAO.class, agentInfoDao, null); PingCommand command = new PingCommand(context); TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); args.addNonOptionArgument(KNOWN_AGENT_ID); try { command.run(factory.createContext(args)); fail("did not throw expected exception"); } catch (CommandException e) { assertEquals("Unable to access command request queue: service not available", e.getMessage()); } } // TODO add more tests that check the actual behaviour under valid input }