Improved code coverage.
Change-Id: I1a5170d16d64e95b759a576b56689164036370c1
Issue-ID: APPC-745
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
package org.onap.appc.listener.LCM.impl;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
import org.onap.appc.exceptions.APPCException;
import org.onap.appc.listener.EventHandler;
import org.onap.appc.listener.LCM.conv.Converter;
import org.onap.appc.listener.LCM.model.DmaapOutgoingMessage;
import org.onap.appc.listener.LCM.operation.ProviderOperations;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-
public class WorkerImpl implements Runnable {
private final EELFLogger LOG = EELFManager.getInstance().getLogger(WorkerImpl.class);
@Override
public void run() {
+
+ if (checkParametersForNull(event, dmaap, providerOperations)) {
+ throw new IllegalStateException("Cannot run worker. One of its parameters is null");
+ }
+
String requestIdWithSubId = extractRequestIdWithSubId(event.getBody());
LOG.debug(String.format("Started working on %s", requestIdWithSubId));
- // Run the dg in a try catch to handle all exceptions and update the
- // message at the end
+ // Run the dg in a try catch to handle all exceptions and update the message at the end
try {
+
JsonNode outputJsonNode = doDG(event.getRpcName(), event.getBody());
- DmaapOutgoingMessage dmaapOutgoingMessage= Converter.convertJsonNodeToDmaapOutgoingMessage(event, outputJsonNode);
- postMessageToDMaaP(dmaapOutgoingMessage,requestIdWithSubId);
+ DmaapOutgoingMessage dmaapOutgoingMessage = Converter
+ .convertJsonNodeToDmaapOutgoingMessage(event, outputJsonNode);
+ postMessageToDMaaP(dmaapOutgoingMessage, requestIdWithSubId);
Integer statusCode = extractStatusCode(dmaapOutgoingMessage.getBody());
if (ProviderOperations.isSucceeded(statusCode)) {
LOG.debug(String.format("Event %s finished successfully", requestIdWithSubId));
}
} catch (Exception e) {
- // Unknown exception from DG method. Fail and pass the exception
- // along
+ // Unknown exception from DG method. Fail and pass the exception along
String msg = "Exception: " + e.getMessage();
LOG.error(String.format("Event %s finished with failure. %s", requestIdWithSubId, msg));
- DmaapOutgoingMessage dmaapOutgoingMessage= Converter.buildDmaapOutgoingMessageWithUnexpectedError(event, e);
- postMessageToDMaaP(dmaapOutgoingMessage,requestIdWithSubId);
+ DmaapOutgoingMessage dmaapOutgoingMessage = Converter
+ .buildDmaapOutgoingMessageWithUnexpectedError(event, e);
+ postMessageToDMaaP(dmaapOutgoingMessage, requestIdWithSubId);
}
LOG.debug("Done working on " + requestIdWithSubId);
}
+ private boolean checkParametersForNull(DmaapMessage message, EventHandler dmaap,
+ ProviderOperations providerOperations) {
+
+ return message == null || dmaap == null || providerOperations == null;
+ }
private Integer extractStatusCode(JsonNode event) {
Integer statusCode = null;
}
- private String extractRequestIdWithSubId(JsonNode event){
+ private String extractRequestIdWithSubId(JsonNode event) {
String requestId = "";
try {
requestId = Converter.extractRequestIdWithSubId(event);
}
-
- private void postMessageToDMaaP(DmaapOutgoingMessage dmaapOutgoingMessage,String requestIdWithSubId) {
+ private void postMessageToDMaaP(DmaapOutgoingMessage dmaapOutgoingMessage, String requestIdWithSubId) {
String dmaapOutgoingMessageJsonString;
try {
dmaapOutgoingMessageJsonString = Converter.convertDmaapOutgoingMessageToJsonString(dmaapOutgoingMessage);
- dmaap.postStatus(dmaapOutgoingMessage.getCambriaPartition(),dmaapOutgoingMessageJsonString);
+ dmaap.postStatus(dmaapOutgoingMessage.getCambriaPartition(), dmaapOutgoingMessageJsonString);
} catch (JsonProcessingException e) {
- LOG.error("failed to postMessageToDMaaP requestIdWithSubId: "+requestIdWithSubId+" dmaapOutgoingMessage: "+dmaapOutgoingMessage, e);
+ LOG.error(
+ "failed to postMessageToDMaaP requestIdWithSubId: " + requestIdWithSubId + " dmaapOutgoingMessage: "
+ + dmaapOutgoingMessage, e);
}
}
private JsonNode doDG(String rpcName, JsonNode msg) throws APPCException {
- return providerOperations.topologyDG(rpcName,msg);
+ return providerOperations.topologyDG(rpcName, msg);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.appc.listener.impl;
+package org.onap.appc.listener.LCM.impl;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.util.Properties;
-
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.onap.appc.listener.demo.impl.ListenerImpl;
@Ignore
-public class TestListener {
+public class ListenerImplTest {
private static final String PROP_FILE = "/org/onap/appc/default.properties";
private Listener listener;
-
private Properties props;
@Before
listener = new ListenerImpl(new ListenerProperties("appc.ClosedLoop", props));
}
- @Test
- public void testListenerId() {
- String originalId = listener.getListenerId();
- String newId = originalId + "-new";
-
- listener.setListenerId(newId);
- assertEquals(newId, listener.getListenerId());
- }
-
@Test
public void testRun() {
try {
}
}
- @Test
- public void testUpdateProperties() {
-
- }
-
@Test
public void printSampleData() {
try {
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2018 Nokia Solutions and Networks
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.listener.LCM.impl;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.Test;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.listener.EventHandler;
+import org.onap.appc.listener.LCM.model.DmaapMessage;
+import org.onap.appc.listener.LCM.operation.ProviderOperations;
+import org.onap.appc.listener.util.Mapper;
+
+public class WorkerImplTest {
+
+ private static final String jsonInputBodyStr =
+ "{\"input\":{ \"common-header\": { \"timestamp\": \"2016-08-03T08:50:18.97Z\", "
+ + "\"api-ver\": \"1\", \"originator-id\": \"1\", \"request-id\": \"123\", \"sub-request-id\": \"1\", "
+ + "\"flags\": { \"force\":\"TRUE\", \"ttl\":\"9900\" } }, \"action\": \"Stop\", "
+ + "\"action-identifiers\": { \"vnf-id\": \"TEST\" } }}";
+
+ private static final String jsonOutputBodyStr = "{\"output\":{\"common-header\":{\"timestamp\":\"2016-08-03T08:50:18.97Z\","
+ + "\"api-ver\":\"1\",\"flags\":{\"force\":\"TRUE\",\"ttl\":\"9900\"},\"sub-request-id\":\"1\","
+ + "\"request-id\":\"123\",\"originator-id\":\"1\"},\"status\":{\"value\":\"TestException\",\"code\":200}}}";
+
+ private EventHandler mockEventHandler = mock(EventHandler.class);
+ private ProviderOperations mockProviderOperations = mock(ProviderOperations.class);
+
+
+ @Test(expected = IllegalStateException.class)
+ public void should_throw_when_one_of_worker_fields_is_null() {
+
+ WorkerImpl worker = new WorkerImpl(null, mockEventHandler, mockProviderOperations);
+ worker.run();
+ }
+
+ @Test
+ public void should_post_error_message_to_dmaap_on_exception() throws APPCException {
+
+ when(mockProviderOperations.topologyDG(anyString(), any(JsonNode.class)))
+ .thenThrow(new RuntimeException("test exception"));
+
+ WorkerImpl worker = new WorkerImpl(buildDmaapMessage(), mockEventHandler, mockProviderOperations);
+ worker.run();
+
+ verify(mockEventHandler).postStatus(anyString(), anyString());
+ }
+
+
+ @Test
+ public void should_post_message_to_dmaap_on_successful_run() throws APPCException {
+
+ JsonNode testOutputJsonNode = Mapper.toJsonNodeFromJsonString(jsonOutputBodyStr);
+ when(mockProviderOperations.topologyDG(anyString(), any(JsonNode.class)))
+ .thenReturn(testOutputJsonNode);
+
+ WorkerImpl worker = new WorkerImpl(buildDmaapMessage(), mockEventHandler, mockProviderOperations);
+ worker.run();
+
+ verify(mockEventHandler).postStatus(anyString(), anyString());
+ }
+
+
+ private DmaapMessage buildDmaapMessage() {
+
+ DmaapMessage dmaapMessage = new DmaapMessage();
+ dmaapMessage.setRpcName("test");
+ JsonNode jsonNode = Mapper.toJsonNodeFromJsonString(jsonInputBodyStr);
+ dmaapMessage.setBody(jsonNode);
+ return dmaapMessage;
+ }
+}
Code Review / appc.git / commitdiff