X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-dg%2Fappc-dg-shared%2Fappc-dg-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fappc%2Fdg%2Fcommon%2Fimpl%2FIntermediateMessageSenderImplTest.java;h=33761f9fd3c4df2d4978922af0bbac7f0e45096a;hb=790ddb83355800cc037ea1ea3ca8610bb78018d5;hp=74c1ec7a59dc2e228b26108158f50234f5ef0b4a;hpb=1843caa854f58b133e2c97e5d75a4705f2942280;p=appc.git

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/IntermediateMessageSenderImplTest.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/IntermediateMessageSenderImplTest.java
index 74c1ec7a5..33761f9fd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/IntermediateMessageSenderImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/IntermediateMessageSenderImplTest.java
@@ -3,7 +3,9 @@
  * ONAP : APPC
  * ================================================================================
  * Copyright (C) 2018 Ericsson
- * =============================================================================
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
  * 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
@@ -24,58 +26,27 @@ package org.onap.appc.dg.common.impl;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.mockito.Spy;
-import org.onap.appc.adapter.message.MessageAdapterFactory;
-import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.srvcomm.messaging.MessagingConnector;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-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;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(FrameworkUtil.class)
 public class IntermediateMessageSenderImplTest {
 
     private SvcLogicContext ctx;
     private Map<String, String> params;
 
-    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 MessageAdapterFactory mockFactory = Mockito.mock(MessageAdapterFactory.class);
-    private final Producer mockProducer = Mockito.mock(Producer.class);
 
-    @InjectMocks
     private IntermediateMessageSenderImpl intermediateMessageSenderImpl;
 
-    @Spy
-    private EventSenderMock eventSender = new EventSenderMock();
 
-    @SuppressWarnings("unchecked")
-    @Before
-    public void setUp() throws NoSuchFieldException, IllegalAccessException {
-        PowerMockito.mockStatic(FrameworkUtil.class);
-        PowerMockito.when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
-        PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
-        PowerMockito.when(bundleContext.getServiceReference(Matchers.any(Class.class))).thenReturn(sref);
-        PowerMockito.when(bundleContext.<MessageAdapterFactory>getService(sref)).thenReturn(mockFactory);
-        PowerMockito.when(mockFactory.createProducer(Matchers.anyCollection(), Mockito.anyString(), Mockito.anyString(),
-                Mockito.anyString())).thenReturn(mockProducer);
-    }
 
     @Test
     public void testSendEmptyMessage() {
-        intermediateMessageSenderImpl.init();
+        intermediateMessageSenderImpl = new IntermediateMessageSenderImpl();
+        MessagingConnector msgConn = Mockito.mock(MessagingConnector.class);
+        Mockito.when(msgConn.publishMessage(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(false);
+        intermediateMessageSenderImpl.init(msgConn);
         ctx = new SvcLogicContext();
         params = new HashMap<>();
         intermediateMessageSenderImpl.sendMessage(params, ctx);
@@ -84,7 +55,10 @@ public class IntermediateMessageSenderImplTest {
 
     @Test
     public void testSendMessage() {
-        intermediateMessageSenderImpl.init();
+        intermediateMessageSenderImpl = new IntermediateMessageSenderImpl();
+        MessagingConnector msgConn = Mockito.mock(MessagingConnector.class);
+        Mockito.when(msgConn.publishMessage(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(true);
+        intermediateMessageSenderImpl.init(msgConn);
         ctx = new SvcLogicContext();
         ctx.setAttribute("input.common-header.request-id", "REQUEST-ID");
         params = new HashMap<>();