<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
package org.openecomp.sdc.asdctool.impl.validator.executers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
result = testSubject.getName();
}
- @Test(expected=NullPointerException.class)
- public void testGetVerticesToValidate() throws Exception {
+ @Test
+ public void testGetVerticesToValidate() {
TopologyTemplateValidatorExecuter testSubject;
// default test
testSubject = createTestSubject();
- testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT);
+ Assertions.assertThrows(NullPointerException.class, () -> testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT));
}
}
package org.openecomp.sdc.asdctool.impl.validator.executers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
return new VFToscaArtifactValidatorExecutor(janusGraphDaoMock, toscaOperationFacade);
}
- @Test(expected=NullPointerException.class)
- public void testExecuteValidations() throws Exception {
+ @Test
+ public void testExecuteValidations() {
VFToscaArtifactValidatorExecutor testSubject;
boolean result;
// default test
testSubject = createTestSubject();
- result = testSubject.executeValidations();
+ Assertions.assertThrows(NullPointerException.class, () -> testSubject.executeValidations());
}
@Test
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
* 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.
import fj.data.Either;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.DisplayName;
import org.mockito.Mockito;
import org.openecomp.sdc.be.auditing.impl.AuditingManager;
import org.openecomp.sdc.be.components.utils.ObjectGenerator;
}
@Test
+ @DisplayName("When old component has no inputs then return ok")
public void whenOldComponentHasNoInputs_returnOk() {
ActionStatus actionStatus = testInstance.mergeComponents(new Resource(), new Resource());
assertThat(actionStatus).isEqualTo(ActionStatus.OK);
}
@Test
+ @DisplayName("When current resource has no properties no redeclaration of inputs required")
public void whenCurrResourceHasNoProperties_noRedeclarationOFInputsRequired() {
Resource newResource = new ResourceBuilder().setUniqueId(RESOURCE_ID).build();
when(toscaOperationFacade.updateInputsToComponent(emptyList(), RESOURCE_ID)).thenReturn(Either.left(null));
}
@Test
+ @DisplayName("When current resource has no inputs no merge required, update resource with inputs declared in previous version")
public void whenCurrResourceHasNoInputs_noMergeRequired_updateResourceWithInputsDeclaredInPrevVersion() {
List<InputDefinition> prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2");
currResource.setInputs(null);
}
@Test
+ @DisplayName("Find inputs declared from properties and merge them into new component")
public void findInputsDeclaredFromPropertiesAndMergeThemIntoNewComponent() {
List<InputDefinition> prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2");
List<InputDefinition> currInputsPreMerge = new ArrayList<>(currResource.getInputs());
}
@Test
+ @DisplayName("Identify already existing inputs and don't merge them into new component")
public void identifyAlreadyExistingInputsAndDontMergeThemIntoNewComponent() {
List<InputDefinition> prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2", "input1");
List<InputDefinition> prevDeclaredInputsNotPresentInCurrent = ObjectGenerator.buildInputs("declared1", "declared2");
@Test
+ @DisplayName("When failing to update inputs propagate the error")
public void whenFailingToUpdateInputs_propagateTheError() {
Resource newResource = new ResourceBuilder().setUniqueId(RESOURCE_ID).build();
when(toscaOperationFacade.updateInputsToComponent(emptyList(), RESOURCE_ID)).thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR));
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
import org.onap.portalsdk.core.restful.domain.EcompRole;
return new EcompIntImpl();
}
- @Test(expected=PortalAPIException.class)
- public void testPushUser() throws Exception {
+ @Test
+ public void testPushUser() {
EcompIntImpl testSubject;
EcompUser user = null;
// default test
testSubject = createTestSubject();
- testSubject.pushUser(user);
+ Assertions.assertThrows(PortalAPIException.class, () -> {
+ testSubject.pushUser(user);
+ });
}
- @Test(expected=PortalAPIException.class)
- public void testEditUser() throws Exception {
+ @Test
+ public void testEditUser() {
EcompIntImpl testSubject;
String loginId = "";
EcompUser user = null;
// default test
testSubject = createTestSubject();
- testSubject.editUser(loginId, user);
+ Assertions.assertThrows(PortalAPIException.class, () -> {
+ testSubject.editUser(loginId, user);
+ });
}
- @Test(expected=PortalAPIException.class)
- public void testGetUser() throws Exception {
+ @Test
+ public void testGetUser() {
EcompIntImpl testSubject;
String loginId = "";
- EcompUser result;
// default test
testSubject = createTestSubject();
- result = testSubject.getUser(loginId);
+ Assertions.assertThrows(PortalAPIException.class, () -> {
+ EcompUser result = testSubject.getUser(loginId);
+ });
}
- @Test(expected=PortalAPIException.class)
- public void testGetUsers() throws Exception {
+ @Test
+ public void testGetUsers() {
EcompIntImpl testSubject;
- List<EcompUser> result;
// default test
testSubject = createTestSubject();
- result = testSubject.getUsers();
+ Assertions.assertThrows(PortalAPIException.class, () -> {
+ List<EcompUser> result = testSubject.getUsers();
+ });
+
}
@Test
- public void testGetAvailableRoles() throws Exception {
+ public void testGetAvailableRoles() throws PortalAPIException{
EcompIntImpl testSubject;
- List<EcompRole> result;
// default test
testSubject = createTestSubject();
- result = testSubject.getAvailableRoles("mock-id");
- assertThat(result).hasSameSizeAs(Role.values());
+ List<EcompRole> result = testSubject.getAvailableRoles("mock-id");
+ assertThat(result).hasSameSizeAs(Role.values());
}
-
- @Test(expected= PortalAPIException.class)
- public void testGetUserRoles() throws Exception {
+ @Test
+ public void testGetUserRoles() {
EcompIntImpl testSubject;
String loginId = "";
- List<EcompRole> result;
// default test
testSubject = createTestSubject();
- result = testSubject.getUserRoles(loginId);
+ Assertions.assertThrows(PortalAPIException.class, () -> {
+ List<EcompRole> result = testSubject.getUserRoles(loginId);
+ });
}
@Test
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
import org.onap.portalsdk.core.restful.domain.EcompRole;
import org.openecomp.sdc.be.user.Role;
}
}
- @Test(expected = PortalAPIException.class)
- public void testConvertEcompRoleToRoleFailure() throws PortalAPIException {
+ @Test
+ public void testConvertEcompRoleToRoleFailure() {
EcompRole ecompRole = new EcompRole();
ecompRole.setName("mock-name");
- EcompRoleConverter.convertEcompRoleToRole(ecompRole);
+ Assertions.assertThrows(PortalAPIException.class, () -> EcompRoleConverter.convertEcompRoleToRole(ecompRole));
}
}
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>logging-filter-base</artifactId>
<version>${onap.logging.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${hamcrest-all.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${junit-jupiter.version}</version>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.3.1</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<parent>
<artifactId>openecomp-sdc-conflict-manager</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.3.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<artifactId>openecomp-sdc-datatypes-lib</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.3.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<parent>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
*/
package org.openecomp.sdc.vendorsoftwareproduct;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
public class ComponentManagerFactoryTest {
<version>${togglz.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<!--TESTING-->
<mockito.version>2.18.3</mockito.version>
+ <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
<jmockit.version>1.33</jmockit.version>
<junit.version>4.12</junit.version>
+ <junitJupiter.version>5.6.0</junitJupiter.version>
<assertj.version>3.10.0</assertj.version>
<testng.version>6.14.3</testng.version>
<extentreports.version>3.0.3</extentreports.version>
<bean-matchers.version>0.11</bean-matchers.version>
<hamcrest.version>2.1</hamcrest.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
- <junit-jupiter.version>5.4.0</junit-jupiter.version>
- <junit-vintage.version>5.4.0</junit-vintage.version>
- <junit-platform.version>1.1.0</junit-platform.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <version>${junit-platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit-vintage.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
</plugin>
<plugin>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>