diff options
-rw-r--r-- | pom.xml | 24 | ||||
-rw-r--r-- | src/test/java/org/onap/clamp/flow/FlowLogOperationTestItCase.java | 34 |
2 files changed, 34 insertions, 24 deletions
@@ -27,12 +27,12 @@ <version>4.0.5-SNAPSHOT</version> <name>clamp</name> -<!-- --> -<!-- <parent> --> -<!-- <groupId>org.onap.oparent</groupId> --> -<!-- <artifactId>oparent</artifactId> --> -<!-- <version>1.2.3</version> --> -<!-- </parent> --> + + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + </parent> <description> This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part. @@ -921,18 +921,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/test/java/org/onap/clamp/flow/FlowLogOperationTestItCase.java b/src/test/java/org/onap/clamp/flow/FlowLogOperationTestItCase.java index 1abeb104..d8ab1bce 100644 --- a/src/test/java/org/onap/clamp/flow/FlowLogOperationTestItCase.java +++ b/src/test/java/org/onap/clamp/flow/FlowLogOperationTestItCase.java @@ -1,5 +1,30 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2019 Samsung. 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 + * + * 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.clamp.flow; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultExchange; @@ -10,9 +35,6 @@ import org.onap.clamp.clds.util.ONAPLogConstants; import org.onap.clamp.flow.log.FlowLogOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.util.ReflectionTestUtils; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - public class FlowLogOperationTestItCase { @@ -21,19 +43,19 @@ public class FlowLogOperationTestItCase { @Test public void testStratLog() { - //given + // given FlowLogOperation flowLogOperation = new FlowLogOperation(); Exchange exchange = new DefaultExchange(camelContext); LoggingUtils loggingUtils = mock(LoggingUtils.class); ReflectionTestUtils.setField(flowLogOperation, "util", loggingUtils); - //when + // when Mockito.when(loggingUtils.getProperties(ONAPLogConstants.MDCs.REQUEST_ID)).thenReturn("MockRequestId"); Mockito.when(loggingUtils.getProperties(ONAPLogConstants.MDCs.INVOCATION_ID)).thenReturn("MockInvocationId"); Mockito.when(loggingUtils.getProperties(ONAPLogConstants.MDCs.PARTNER_NAME)).thenReturn("MockPartnerName"); flowLogOperation.startLog(exchange, "serviceName"); - //then + // then assertThat(exchange.getProperty(ONAPLogConstants.Headers.REQUEST_ID)).isEqualTo("MockRequestId"); assertThat(exchange.getProperty(ONAPLogConstants.Headers.INVOCATION_ID)).isEqualTo("MockInvocationId"); assertThat(exchange.getProperty(ONAPLogConstants.Headers.PARTNER_NAME)).isEqualTo("MockPartnerName"); |