From 6c2b81d1d39e734435cabd66518fff26bcd49aec Mon Sep 17 00:00:00 2001 From: Joss Armstrong Date: Fri, 22 Feb 2019 12:13:27 +0000 Subject: Test coverage in MessageAdapterImpl Added test cases for untested portions of code Issue-ID: APPC-1481 Change-Id: Id61ec5c5824c3d9fecbfb83d47bfa0164ae96759 Signed-off-by: Joss Armstrong --- .../messageadapter/impl/MessageAdapterImpl.java | 23 ++--- .../impl/MessageAdapterImplTest.java | 101 +++++++++++++++++++++ 2 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/messageadapter/impl/MessageAdapterImplTest.java diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/messageadapter/impl/MessageAdapterImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/messageadapter/impl/MessageAdapterImpl.java index c0a52b141..8c518fec4 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/messageadapter/impl/MessageAdapterImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/messageadapter/impl/MessageAdapterImpl.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs + * ================================================================================ + * Modifications Copyright (C) 2019 Ericsson * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +33,6 @@ import org.onap.appc.configuration.Configuration; import org.onap.appc.configuration.ConfigurationFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; - import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang.ObjectUtils; import org.onap.appc.domainmodel.lcm.ResponseContext; @@ -69,14 +70,14 @@ public class MessageAdapterImpl implements MessageAdapter{ private Producer getProducer() { configuration = ConfigurationFactory.getConfiguration(); - Properties properties=configuration.getProperties(); + Properties properties = configuration.getProperties(); updateProperties(properties); - + BundleContext ctx = FrameworkUtil.getBundle(MessageAdapterImpl.class).getBundleContext(); if (ctx != null) { ServiceReference svcRef = ctx.getServiceReference(MessageAdapterFactory.class.getName()); if (svcRef != null) { - producer = ((MessageAdapterFactory) ctx.getService(svcRef)).createProducer(pool, writeTopic,apiKey, apiSecret); + producer = ((MessageAdapterFactory) ctx.getService(svcRef)).createProducer(pool, writeTopic, apiKey, apiSecret); } } return producer; @@ -85,7 +86,7 @@ public class MessageAdapterImpl implements MessageAdapter{ private void updateProperties(Properties props) { if (logger.isTraceEnabled()) { - logger.trace("Entering to updateProperties with Properties = "+ ObjectUtils.toString(props)); + logger.trace("Entering to updateProperties with Properties = " + ObjectUtils.toString(props)); } pool = new HashSet<>(); if (props != null) { @@ -124,18 +125,18 @@ public class MessageAdapterImpl implements MessageAdapter{ logger.debug("DMaaP Response = " + jsonMessage); } logger.debug("Before Invoking producer.post(): jsonMessage is::" + jsonMessage); - success = producer.post(this.partition, jsonMessage); + success = producer.post(this.partition, jsonMessage); logger.debug("After Invoking producer.post()"); } catch (JsonProcessingException e1) { - logger.error("Error generating Json from DMaaP message "+ e1.getMessage()); - success= false; + logger.error("Error generating Json from DMaaP message " + e1.getMessage()); + success = false; }catch (Exception e){ - logger.error("Error sending message to DMaaP "+e.getMessage()); - success= false; + logger.error("Error sending message to DMaaP " + e.getMessage()); + success = false; } logger.debug("Exiting MesageAdapterImpl.post()"); if (logger.isTraceEnabled()) { - logger.trace("Exiting from post with (success = "+ ObjectUtils.toString(success)+")"); + logger.trace("Exiting from post with (success = " + ObjectUtils.toString(success) + ")"); } return success; } diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/messageadapter/impl/MessageAdapterImplTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/messageadapter/impl/MessageAdapterImplTest.java new file mode 100644 index 000000000..d5c3534b3 --- /dev/null +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/messageadapter/impl/MessageAdapterImplTest.java @@ -0,0 +1,101 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * Copyright (C) 2019 Ericsson + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END========================================================= + */ + +package org.onap.appc.messageadapter.impl; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.internal.util.reflection.Whitebox; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.requesthandler.conv.Converter; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.att.eelf.configuration.EELFLogger.Level; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({FrameworkUtil.class, Converter.class}) +public class MessageAdapterImplTest { + + private Configuration mockConfig = ConfigurationFactory.getConfiguration(); + private final BundleContext bundleContext = Mockito.mock(BundleContext.class); + private final Bundle bundleService = Mockito.mock(Bundle.class); + private final ServiceReference sref = Mockito.mock(ServiceReference.class); + private final Producer producer = Mockito.mock(Producer.class); + private static final EELFLogger logger = EELFManager.getInstance().getLogger(MessageAdapterImpl.class); + private MessageAdapterImpl impl; + + @Before + public void setUp() throws Exception { + logger.setLevel(Level.TRACE); + impl = PowerMockito.spy(new MessageAdapterImpl()); + //originalLogger = (EELFLogger) Whitebox.getInternalState(MessageAdapterImpl.class, "logger"); + Whitebox.setInternalState(impl, "configuration", mockConfig); + PowerMockito.mockStatic(FrameworkUtil.class); + PowerMockito.when(FrameworkUtil.getBundle(MessageAdapterImpl.class)).thenReturn(bundleService); + PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext); + PowerMockito.when(bundleContext.getServiceReference(MessageAdapterFactory.class.getName())).thenReturn(sref); + PowerMockito.when(bundleContext.getService(sref)).thenReturn(producer); + PowerMockito.mockStatic(Converter.class); + PowerMockito.when(Converter.convAsyncResponseToDmaapOutgoingMessageJsonString( + Mockito.any(), Mockito.any(), Mockito.any())).thenReturn("{}"); + } + + @Test + public void testSuccess() throws JsonProcessingException { + PowerMockito.when(Converter.convAsyncResponseToDmaapOutgoingMessageJsonString( + Mockito.any(), Mockito.any(), Mockito.any())).thenReturn("{}"); + Mockito.when(producer.post(Mockito.anyString(), Mockito.anyString())).thenReturn(true); + Whitebox.setInternalState(impl, "producer", producer); + Whitebox.setInternalState(impl, "partition", "PARTITION"); + assertTrue(impl.post(null, null, null)); + } + + @Test + public void testJsonException() throws JsonProcessingException { + PowerMockito.when(Converter.convAsyncResponseToDmaapOutgoingMessageJsonString( + Mockito.any(), Mockito.any(), Mockito.any())).thenThrow(new JsonProcessingException("TEST") {}); + Whitebox.setInternalState(impl, "partition", "PARTITION"); + assertFalse(impl.post(null, null, null)); + } + + @Test + public void testException() throws JsonProcessingException { + PowerMockito.when(Converter.convAsyncResponseToDmaapOutgoingMessageJsonString( + Mockito.any(), Mockito.any(), Mockito.any())).thenThrow(new RuntimeException()); + Whitebox.setInternalState(impl, "partition", "PARTITION"); + assertFalse(impl.post(null, null, null)); + } +} -- cgit 1.2.3-korg