From 8d977df8ba8a63e8c76f58825854fd53f8e638ba Mon Sep 17 00:00:00 2001 From: Lukasz Muszkieta Date: Mon, 8 Jan 2018 12:40:46 +0100 Subject: refactoring - add Optional change possible null return value to Optional Change-Id: I70bf78a51b901a74932b00d1d8735bef5eeacef7 Issue-ID: SO-360 Signed-off-by: Lukasz Muszkieta --- .../tests/MsoHeatUtilsWithUpdateTest.java | 5 ++-- .../org/openecomp/mso/cloud/CloudConfigTest.java | 27 +++++++++++----------- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'adapters/mso-adapter-utils/src/test/java/org/openecomp') diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java index 714bb66e18..62043e83b8 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -68,8 +69,8 @@ public class MsoHeatUtilsWithUpdateTest { cloudIdentity.setKeystoneUrl ("toto"); cloudIdentity.setMsoPass (CloudIdentity.encryptPassword ("mockId")); cloudSite.setIdentityService (cloudIdentity); - when (cloudConfig.getCloudSite ("cloud")).thenReturn (cloudSite); - when (cloudConfig.getCloudSite ("none")).thenReturn (null); + when(cloudConfig.getCloudSite("cloud")).thenReturn (Optional.of(cloudSite)); + when(cloudConfig.getCloudSite("none")).thenReturn (Optional.empty()); } @Test diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudConfigTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudConfigTest.java index a73e4359fc..1c2501e8e4 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudConfigTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/cloud/CloudConfigTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.util.Optional; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -112,29 +113,29 @@ public class CloudConfigTest { @Test public void cloudSiteIsGotById_when_IdFound() throws MsoCloudIdentityNotFound { CloudConfig con = createTestObject(cloudConfigJsonFilePath); - CloudSite cloudSite = con.getCloudSite("MT"); - assertNotNull(cloudSite); - assertEquals("regionOne", cloudSite.getRegionId()); - assertEquals("MT_KEYSTONE", cloudSite.getIdentityServiceId()); + Optional cloudSite = con.getCloudSite("MT"); + assertTrue(cloudSite.isPresent()); + assertEquals("regionOne", cloudSite.get().getRegionId()); + assertEquals("MT_KEYSTONE", cloudSite.get().getIdentityServiceId()); } @Test public void cloudSiteIsGotByClli_when_IdNotFound() throws MsoCloudIdentityNotFound { CloudConfig con = createTestObject(cloudConfigJsonFilePath); - CloudSite cloudSite = con.getCloudSite("CS_clli"); - assertNotNull(cloudSite); - assertEquals("clliRegion", cloudSite.getRegionId()); - assertEquals("CS_clli", cloudSite.getClli()); - assertEquals("CS_service", cloudSite.getIdentityServiceId()); + Optional cloudSite = con.getCloudSite("CS_clli"); + assertTrue(cloudSite.isPresent()); + assertEquals("clliRegion", cloudSite.get().getRegionId()); + assertEquals("CS_clli", cloudSite.get().getClli()); + assertEquals("CS_service", cloudSite.get().getIdentityServiceId()); } @Test public void cloudSiteIsGotByDefault_when_IdAndClliNotFound() throws MsoCloudIdentityNotFound { CloudConfig con = createTestObject(cloudDefaultConfigJsonFilePath); - CloudSite cloudSite = con.getCloudSite("not_existing_id"); - assertNotNull(cloudSite); - assertEquals("not_existing_id", cloudSite.getId()); - assertEquals("not_existing_id", cloudSite.getRegionId()); + Optional cloudSite = con.getCloudSite("not_existing_id"); + assertTrue(cloudSite.isPresent()); + assertEquals("not_existing_id", cloudSite.get().getId()); + assertEquals("not_existing_id", cloudSite.get().getRegionId()); } @Test -- cgit 1.2.3-korg