From: Baumel, Dvir (db384r) Date: Tue, 21 Apr 2020 11:14:15 +0000 (+0300) Subject: Fix unit tests not running X-Git-Tag: 1.7.0~206 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F106340%2F6;p=sdc.git Fix unit tests not running Change-Id: I06462b6180a1f1a310aae994f4e703a498f80247 Issue-ID: SDC-2933 Signed-off-by: Baumel, Dvir (db384r) --- diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java index 9868e66ff7..b1fa55827f 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java @@ -23,7 +23,6 @@ package org.openecomp.sdc.be.components.merge.input; 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; @@ -61,7 +60,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @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); @@ -69,7 +67,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @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)); @@ -80,7 +77,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @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 prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2"); currResource.setInputs(null); @@ -94,7 +90,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test - @DisplayName("Find inputs declared from properties and merge them into new component") public void findInputsDeclaredFromPropertiesAndMergeThemIntoNewComponent() { List prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2"); List currInputsPreMerge = new ArrayList<>(currResource.getInputs()); @@ -109,7 +104,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test - @DisplayName("Identify already existing inputs and don't merge them into new component") public void identifyAlreadyExistingInputsAndDontMergeThemIntoNewComponent() { List prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2", "input1"); List prevDeclaredInputsNotPresentInCurrent = ObjectGenerator.buildInputs("declared1", "declared2"); @@ -127,7 +121,6 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { @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)); diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 3275321abf..dda15ea941 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -309,18 +309,6 @@ ${junit.version} test - - org.junit.jupiter - junit-jupiter - ${junitJupiter.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockitoJupiter.version} - test - org.mockito mockito-all diff --git a/pom.xml b/pom.xml index fb54ec1f26..5fe1cb5b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ Modifications copyright (c) 2018-2019 Nokia ================================================================================ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.openecomp.sdc @@ -124,16 +124,16 @@ Modifications copyright (c) 2018-2019 Nokia 0.11 2.1 1.3 - 2.22.0 + 2.19.1 2.4 1.6.5 - - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + ${project.build.sourceEncoding} ${project.basedir} ${project.version} @@ -459,12 +459,12 @@ Modifications copyright (c) 2018-2019 Nokia pom.properties['deploy.url'] = - pom.version.contains('-SNAPSHOT') ? - project.distributionManagement.snapshotRepository.url : - project.distributionManagement.repository.url; + pom.version.contains('-SNAPSHOT') ? + project.distributionManagement.snapshotRepository.url : + project.distributionManagement.repository.url; pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ? - project.distributionManagement.snapshotRepository.id : - project.distributionManagement.repository.id; + project.distributionManagement.snapshotRepository.id : + project.distributionManagement.repository.id; @@ -617,3 +617,4 @@ Modifications copyright (c) 2018-2019 Nokia + diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml index 5437f4e978..6152fdff83 100644 --- a/utils/DmaapPublisher/pom.xml +++ b/utils/DmaapPublisher/pom.xml @@ -64,18 +64,6 @@ 4.12 test - - org.junit.jupiter - junit-jupiter - ${junitJupiter.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockitoJupiter.version} - test - org.mockito mockito-core diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 214671c65c..ed38278b7f 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -30,20 +30,6 @@ test - - org.junit.jupiter - junit-jupiter - ${junitJupiter.version} - test - - - - org.mockito - mockito-junit-jupiter - ${mockitoJupiter.version} - test - - javax.servlet servlet-api