From abe242987a35b162e2386b910c3f0cef6e3fef33 Mon Sep 17 00:00:00 2001 From: Mateusz Gołuchowski Date: Mon, 1 Jun 2020 13:59:14 +0200 Subject: Sonar fixes Changed input parameter for didCreateAuditFail. Now clients must pass object without Optional wrapper. Issue-ID: SO-1841 Change-Id: I96f7793e7e4d7871908f8dbbc1e4cd3a028498d5 Signed-off-by: Mateusz Goluchowski --- .../so/adapters/tasks/audit/AbstractAuditServiceTest.java | 13 ++++++------- .../so/adapters/tasks/audit/AuditStackServiceDataTest.java | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'adapters/mso-openstack-adapters/src/test') diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AbstractAuditServiceTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AbstractAuditServiceTest.java index a93897f83e..c70e60e9d3 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AbstractAuditServiceTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AbstractAuditServiceTest.java @@ -3,35 +3,34 @@ package org.onap.so.adapters.tasks.audit; import org.junit.Test; import org.onap.so.objects.audit.AAIObjectAudit; import org.onap.so.objects.audit.AAIObjectAuditList; -import java.util.Optional; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class AbstractAuditServiceTest extends AbstractAuditService { - private AAIObjectAuditList getAuditListWithObjectWithExistenceStateOf(boolean existState) { + private AAIObjectAuditList getAuditListWithObjectWithExistenceStateOf(boolean existenceState) { AAIObjectAudit auditObject = new AAIObjectAudit(); AAIObjectAuditList auditList = new AAIObjectAuditList(); - auditObject.setDoesObjectExist(existState); + auditObject.setDoesObjectExist(existenceState); auditList.getAuditList().add(auditObject); return auditList; } @Test - public void didCreateAuditFail_shouldReturnFalse_whenGivenEmptyAudit() { - assertFalse(didCreateAuditFail(Optional.empty())); + public void didCreateAuditFail_shouldReturnFalse_whenGivenNull() { + assertFalse(didCreateAuditFail(null)); } @Test public void didCreateAuditFail_shouldReturnTrue_whenGivenNotExistingObject() { - assertTrue(didCreateAuditFail(Optional.of(getAuditListWithObjectWithExistenceStateOf(false)))); + assertTrue(didCreateAuditFail(getAuditListWithObjectWithExistenceStateOf(false))); } @Test public void didCreateAuditFail_shouldReturnFalse_whenGivenExistingObject() { - assertFalse(didCreateAuditFail(Optional.of(getAuditListWithObjectWithExistenceStateOf(true)))); + assertFalse(didCreateAuditFail(getAuditListWithObjectWithExistenceStateOf(true))); } @Test diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AuditStackServiceDataTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AuditStackServiceDataTest.java index a10ab4b7df..78dbcd94c2 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AuditStackServiceDataTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/audit/AuditStackServiceDataTest.java @@ -179,13 +179,13 @@ public class AuditStackServiceDataTest extends AuditCreateStackService { @Test public void determineAuditResult_Test() throws Exception { - boolean actual = auditStackService.didCreateAuditFail(auditListOptSuccess); + boolean actual = auditStackService.didCreateAuditFail(auditListOptSuccess.get()); assertEquals(false, actual); } @Test public void determineAuditResult_Failure_Test() throws Exception { - boolean actual = auditStackService.didCreateAuditFail(auditListOptFailure); + boolean actual = auditStackService.didCreateAuditFail(auditListOptFailure.get()); assertEquals(true, actual); } } -- cgit 1.2.3-korg