summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorraviteja.karumuri <raviteja.karumuri@est.tech>2023-04-04 01:14:11 +0100
committerraviteja.karumuri <raviteja.karumuri@est.tech>2023-04-11 15:39:33 +0100
commit246a2d35adcdea8ca5c7b3eba75d01d5f0e8c780 (patch)
tree007c83e467c5712fe2cd7a3846ab9d5131544a07
parentdd3643411ed8bb581a3147e07606919c3b1675d3 (diff)
[CPS] Fix SonarQube Violations / Improve Coverage - Recurring task
Issue-ID: CPS-475 Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech> Change-Id: I7429e1563608159b5592a2dc52ab5383f11a8ab3
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorHelper.java8
-rw-r--r--cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorSpec.groovy42
2 files changed, 29 insertions, 21 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorHelper.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorHelper.java
index 40f70b9c68..852323df7d 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorHelper.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorHelper.java
@@ -1,6 +1,6 @@
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation
+ * Copyright (C) 2022-2023 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -177,10 +177,8 @@ public class LcmEventsCreatorHelper {
private static boolean hasDataSyncEnabledFlagChanged(final NcmpServiceCmHandle targetNcmpServiceCmHandle,
final NcmpServiceCmHandle existingNcmpServiceCmHandle) {
- final Boolean targetDataSyncFlag = targetNcmpServiceCmHandle.getCompositeState() == null
- ? null : targetNcmpServiceCmHandle.getCompositeState().getDataSyncEnabled();
- final Boolean existingDataSyncFlag = existingNcmpServiceCmHandle.getCompositeState() == null
- ? null : existingNcmpServiceCmHandle.getCompositeState().getDataSyncEnabled();
+ final Boolean targetDataSyncFlag = targetNcmpServiceCmHandle.getCompositeState().getDataSyncEnabled();
+ final Boolean existingDataSyncFlag = existingNcmpServiceCmHandle.getCompositeState().getDataSyncEnabled();
if (targetDataSyncFlag == null) {
return existingDataSyncFlag != null;
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorSpec.groovy
index 18041fa6a5..7b8b2b4538 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsCreatorSpec.groovy
@@ -1,6 +1,6 @@
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation
+ * Copyright (C) 2022-2023 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,11 +36,11 @@ class LcmEventsCreatorSpec extends Specification {
def cmHandleId = 'test-cm-handle'
def 'Map the LcmEvent for #operation'() {
- given: 'NCMP cm handle details with current and old details'
+ given: 'NCMP cm handle details with current and old properties'
def existingNcmpServiceCmHandle = new NcmpServiceCmHandle(cmHandleId: cmHandleId, compositeState: new CompositeState(dataSyncEnabled: true, cmHandleState: existingCmHandleState),
- publicProperties: ['publicProperty1': 'value1', 'publicProperty2': 'value2', 'publicProperty3': 'value3'])
- def targetNcmpServiceCmHandle = new NcmpServiceCmHandle(cmHandleId: cmHandleId, compositeState: new CompositeState(dataSyncEnabled: false, cmHandleState: targetCmHandleState),
- publicProperties: ['publicProperty1': 'value1', 'publicProperty2': 'value22'])
+ publicProperties: existingPublicProperties)
+ def targetNcmpServiceCmHandle = new NcmpServiceCmHandle(cmHandleId: cmHandleId, compositeState: new CompositeState(dataSyncEnabled: true, cmHandleState: targetCmHandleState),
+ publicProperties: targetPublicProperties)
when: 'the event is populated'
def result = objectUnderTest.populateLcmEvent(cmHandleId, targetNcmpServiceCmHandle, existingNcmpServiceCmHandle)
then: 'event header is mapped correctly'
@@ -49,21 +49,31 @@ class LcmEventsCreatorSpec extends Specification {
assert result.eventType == LcmEventType.UPDATE.eventType
and: 'event payload is mapped correctly with correct cmhandle id'
assert result.event.cmHandleId == cmHandleId
- and: 'it should have correct old values'
+ and: 'it should have correct old state and properties'
assert result.event.oldValues.cmHandleState == expectedExistingCmHandleState
- assert result.event.oldValues.dataSyncEnabled == true
- and: 'the correct new values'
+ assert result.event.oldValues.cmHandleProperties == [expectedExistingPublicProperties]
+ and: 'the correct new state and properties'
+ assert result.event.newValues.cmHandleProperties == [expectedTargetPublicProperties]
assert result.event.newValues.cmHandleState == expectedTargetCmHandleState
- assert result.event.newValues.dataSyncEnabled == false
- and: 'cmhandle properties are just the one which are differing'
- assert result.event.oldValues.cmHandleProperties == [['publicProperty2': 'value2', 'publicProperty3': 'value3']]
- assert result.event.newValues.cmHandleProperties == [['publicProperty2': 'value22']]
where: 'following parameters are provided'
- operation | existingCmHandleState | targetCmHandleState || expectedExistingCmHandleState | expectedTargetCmHandleState
- 'UPDATE' | ADVISED | READY || Values.CmHandleState.ADVISED | Values.CmHandleState.READY
- 'DELETING' | READY | DELETING || Values.CmHandleState.READY | Values.CmHandleState.DELETING
-
+ operation | existingCmHandleState | targetCmHandleState | existingPublicProperties | targetPublicProperties || expectedExistingPublicProperties | expectedTargetPublicProperties | expectedExistingCmHandleState | expectedTargetCmHandleState
+ 'UPDATE' | ADVISED | READY | ['publicProperty1': 'value1', 'publicProperty2': 'value2'] | ['publicProperty1': 'value11'] || ['publicProperty1': 'value1', 'publicProperty2': 'value2'] | ['publicProperty1': 'value11'] | Values.CmHandleState.ADVISED | Values.CmHandleState.READY
+ 'DELETING' | READY | DELETING | ['publicProperty1': 'value3', 'publicProperty2': 'value4'] | ['publicProperty1': 'value33'] || ['publicProperty1': 'value3', 'publicProperty2': 'value4'] | ['publicProperty1': 'value33'] | Values.CmHandleState.READY | Values.CmHandleState.DELETING
+ 'CHANGE' | READY | READY | ['publicProperty1': 'value3', 'publicProperty2': 'value4'] | ['publicProperty1': 'value33'] || ['publicProperty1': 'value3', 'publicProperty2': 'value4'] | ['publicProperty1': 'value33'] | null | null
+ }
+ def 'Map the LcmEvent for all properties NO CHANGE'() {
+ given: 'NCMP cm handle details without any changes'
+ def publicProperties = ['publicProperty1': 'value3', 'publicProperty2': 'value4']
+ def existingNcmpServiceCmHandle = new NcmpServiceCmHandle(cmHandleId: cmHandleId, compositeState: new CompositeState(dataSyncEnabled: true, cmHandleState: READY),
+ publicProperties: publicProperties)
+ def targetNcmpServiceCmHandle = new NcmpServiceCmHandle(cmHandleId: cmHandleId, compositeState: new CompositeState(dataSyncEnabled: true, cmHandleState: READY),
+ publicProperties: publicProperties)
+ when: 'the event is populated'
+ def result = objectUnderTest.populateLcmEvent(cmHandleId, targetNcmpServiceCmHandle, existingNcmpServiceCmHandle)
+ then: 'Properties are just the one which are same'
+ assert result.event.oldValues == null
+ assert result.event.newValues == null
}
def 'Map the LcmEvent for operation CREATE'() {