diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-core-lib')
3 files changed, 60 insertions, 47 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/test/java/org/openecomp/core/util/UniqueValueUtilTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/test/java/org/openecomp/core/util/UniqueValueUtilTest.java index eeae2f75b0..72ae4e7227 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/test/java/org/openecomp/core/util/UniqueValueUtilTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/test/java/org/openecomp/core/util/UniqueValueUtilTest.java @@ -19,17 +19,20 @@ package org.openecomp.core.util; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.core.dao.UniqueValueDao; import org.openecomp.core.dao.types.UniqueValueEntity; import org.openecomp.sdc.common.errors.CoreException; import org.testng.Assert; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -public class UniqueValueUtilTest { +@ExtendWith(MockitoExtension.class) +class UniqueValueUtilTest { private static final String ENTITLEMENT_POOL_NAME = "Entitlement Pool name"; private static final String ORIGINAL_ENTITY_NAME = "originalEntityName"; @@ -39,30 +42,31 @@ public class UniqueValueUtilTest { private UniqueValueUtil uniqueValueUtil; - @BeforeMethod + @BeforeEach public void setUp() { - MockitoAnnotations.initMocks(this); uniqueValueUtil = new UniqueValueUtil(uniqueValueDao); } @Test - public void testCreateUniqueValue() { + void testCreateUniqueValue() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(null); uniqueValueUtil.createUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); Mockito.verify(uniqueValueDao, Mockito.times(1)).create(Mockito.any()); } - @Test(expectedExceptions = CoreException.class) - public void testCreateUniqueValueNotUnique() { + @Test + void testCreateUniqueValueNotUnique() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(new UniqueValueEntity()); - uniqueValueUtil.createUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); + Assertions.assertThrows(CoreException.class, () -> { + uniqueValueUtil.createUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); + }); - Mockito.verify(uniqueValueDao, Mockito.times(1)).create(Mockito.any()); + Mockito.verify(uniqueValueDao, Mockito.times(1)).get(Mockito.any()); } @Test - public void testDeleteUniqueValue() { + void testDeleteUniqueValue() { Mockito.doNothing().when(uniqueValueDao).delete(Mockito.any()); uniqueValueUtil.deleteUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); @@ -70,13 +74,13 @@ public class UniqueValueUtilTest { } @Test - public void testDeleteUniqueValueNoValue() { + void testDeleteUniqueValueNoValue() { uniqueValueUtil.deleteUniqueValue(ENTITLEMENT_POOL_NAME); Mockito.verify(uniqueValueDao, Mockito.times(0)).delete(Mockito.any()); } @Test - public void testUpdateUniqueValue() { + void testUpdateUniqueValue() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(null); Mockito.doNothing().when(uniqueValueDao).delete(Mockito.any()); @@ -87,29 +91,31 @@ public class UniqueValueUtilTest { } @Test - public void testValidateUniqueValue() { + void testValidateUniqueValue() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(null); uniqueValueUtil.validateUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); Mockito.verify(uniqueValueDao, Mockito.times(1)).get(Mockito.any()); } - @Test(expectedExceptions = CoreException.class) - public void testValidateUniqueValueNotUnique() { + @Test + void testValidateUniqueValueNotUnique() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(new UniqueValueEntity()); - uniqueValueUtil.createUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); + Assertions.assertThrows(CoreException.class, () -> { + uniqueValueUtil.createUniqueValue(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME); + }); Mockito.verify(uniqueValueDao, Mockito.times(1)).get(Mockito.any()); } @Test - public void testIsUniqueValueOccupied() { + void testIsUniqueValueOccupied() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(new UniqueValueEntity()); Assert.assertTrue(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME)); } @Test - public void testIsUniqueValueOccupiedFalse() { + void testIsUniqueValueOccupiedFalse() { Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(null); Assert.assertFalse(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME)); } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/AsdcSessionContextProviderTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/AsdcSessionContextProviderTest.java index f0a9d2dcf7..80b62c7409 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/AsdcSessionContextProviderTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/AsdcSessionContextProviderTest.java @@ -19,45 +19,48 @@ package org.openecomp.sdc.common.session.impl; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.session.SessionContext; -import org.testng.Assert; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -public class AsdcSessionContextProviderTest { +@ExtendWith(MockitoExtension.class) +class AsdcSessionContextProviderTest { private static final String USER_ID = "cs0008"; @InjectMocks private AsdcSessionContextProvider asdcSessionContextProvider; - @BeforeMethod - public void setUp() { - MockitoAnnotations.initMocks(this); - } - - @Test(expectedExceptions = CoreException.class) - public void testGetUserIdNull() { + @Test + void testGetUserIdNull() { asdcSessionContextProvider.create(null, null); - asdcSessionContextProvider.get(); + Assertions.assertThrows(CoreException.class, () -> { + asdcSessionContextProvider.get(); + }); } - @Test(expectedExceptions = CoreException.class) - public void testGetTenantNull() { + @Test + void testGetTenantNull() { asdcSessionContextProvider.create(USER_ID, null); - asdcSessionContextProvider.get(); + Assertions.assertThrows(CoreException.class, () -> { + asdcSessionContextProvider.get(); + }); } @Test - public void testGet() { + void testGet() { asdcSessionContextProvider.create(USER_ID, "tenant"); SessionContext sessionContext = asdcSessionContextProvider.get(); - Assert.assertNotNull(sessionContext); - Assert.assertSame(USER_ID, sessionContext.getUser().getUserId()); - Assert.assertSame("tenant", sessionContext.getTenant()); + assertNotNull(sessionContext); + assertSame(USER_ID, sessionContext.getUser().getUserId()); + assertSame("tenant", sessionContext.getTenant()); } } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/SessionContextProviderFactoryImplTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/SessionContextProviderFactoryImplTest.java index eec7bd02ad..74cf8d3446 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/SessionContextProviderFactoryImplTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/src/test/java/org/openecomp/sdc/common/session/impl/SessionContextProviderFactoryImplTest.java @@ -19,27 +19,31 @@ package org.openecomp.sdc.common.session.impl; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.MockitoAnnotations; +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.common.session.SessionContextProvider; -import org.testng.Assert; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -public class SessionContextProviderFactoryImplTest { +@ExtendWith(MockitoExtension.class) +class SessionContextProviderFactoryImplTest { @InjectMocks private SessionContextProviderFactoryImpl sessionContextProviderFactoryImpl; - @BeforeMethod + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); } @Test - public void testCreateInterface() { + void testCreateInterface() { SessionContextProvider sessionContextProvider = sessionContextProviderFactoryImpl.createInterface(); - Assert.assertTrue(sessionContextProvider instanceof AsdcSessionContextProvider); + assertTrue(sessionContextProvider instanceof AsdcSessionContextProvider); } } |