diff options
20 files changed, 142 insertions, 168 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index f0227f24e8..de4c7a9a35 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -512,19 +512,6 @@ </dependency> <dependency> - <groupId>com.github.testng-team</groupId> - <artifactId>testng-junit5</artifactId> - <version>0.0.1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-engine</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 9cc0b04e12..522ffeec4a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -48,12 +48,6 @@ <artifactId>openecomp-sdc-item-permissions-manager</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - <scope>test</scope> - </dependency> <!-- CXF --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/ChoiceOrOtherMappingTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/ChoiceOrOtherMappingTest.java index 6ad8c6f747..c7901c8458 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/ChoiceOrOtherMappingTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/ChoiceOrOtherMappingTest.java @@ -16,11 +16,12 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther; import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto; -import org.testng.annotations.Test; /** * Any change to ChoiceOrOther easily break reconstruction of objects of this type. @@ -29,7 +30,7 @@ import org.testng.annotations.Test; * @author EVITALIY * @since 28 Dec 17 */ -public class ChoiceOrOtherMappingTest { +class ChoiceOrOtherMappingTest { private static final String UNKNOWN = "Unknown"; @@ -38,7 +39,7 @@ public class ChoiceOrOtherMappingTest { } @Test - public void testApplyMappingFromDto() { + void testApplyMappingFromDto() { ChoiceOrOtherDto<TestEnum> source = new ChoiceOrOtherDto<>(); source.setChoice(TestEnum.Yes); @@ -51,7 +52,7 @@ public class ChoiceOrOtherMappingTest { } @Test - public void testApplyMappingToDto() { + void testApplyMappingToDto() { ChoiceOrOther<TestEnum> source = new ChoiceOrOther<>(TestEnum.Yes, UNKNOWN); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOtherTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOtherTest.java index 1a1dae8352..a83c74a847 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOtherTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOtherTest.java @@ -16,16 +16,17 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther; import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto; -import org.testng.annotations.Test; -public class MapChoiceOrOtherDtoToChoiceOrOtherTest { +class MapChoiceOrOtherDtoToChoiceOrOtherTest { @Test - public void testChoice() { + void testChoice() { ChoiceOrOtherDto<TestEnum> source = new ChoiceOrOtherDto<>(); ChoiceOrOther target = new ChoiceOrOther(); MapChoiceOrOtherDtoToChoiceOrOther mapper = new MapChoiceOrOtherDtoToChoiceOrOther(); @@ -36,7 +37,7 @@ public class MapChoiceOrOtherDtoToChoiceOrOtherTest { } @Test - public void testOther() { + void testOther() { ChoiceOrOtherDto source = new ChoiceOrOtherDto(); ChoiceOrOther target = new ChoiceOrOther(); MapChoiceOrOtherDtoToChoiceOrOther mapper = new MapChoiceOrOtherDtoToChoiceOrOther(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDtoTest.java index aff5237de7..309205e522 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDtoTest.java @@ -16,18 +16,19 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther; import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto; -import org.testng.annotations.Test; -public class MapChoiceOrOtherToChoiceOrOtherDtoTest { +class MapChoiceOrOtherToChoiceOrOtherDtoTest { @Test - public void testOther() { + void testOther() { ChoiceOrOther source = new ChoiceOrOther(); ChoiceOrOtherDto target = new ChoiceOrOtherDto(); MapChoiceOrOtherToChoiceOrOtherDto mapper = new MapChoiceOrOtherToChoiceOrOtherDto(); @@ -38,7 +39,7 @@ public class MapChoiceOrOtherToChoiceOrOtherDtoTest { } @Test - public void testChoice() { + void testChoice() { ChoiceOrOther source = new ChoiceOrOther(); ChoiceOrOtherDto target = new ChoiceOrOtherDto(); MapChoiceOrOtherToChoiceOrOtherDto mapper = new MapChoiceOrOtherToChoiceOrOtherDto(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest.java index 999b430bd8..c8eb2a8e31 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest.java @@ -16,24 +16,25 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolType; import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther; import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope; import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto; -import org.testng.annotations.Test; -public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { +class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { @Test - public void testReferencingFeatureGroups() { + void testReferencingFeatureGroups() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -45,7 +46,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testDescription() { + void testDescription() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -57,7 +58,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testIncrements() { + void testIncrements() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -69,7 +70,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testExpiryDate() { + void testExpiryDate() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -81,7 +82,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testId() { + void testId() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -93,7 +94,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testThresholdValue() { + void testThresholdValue() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -105,7 +106,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testName() { + void testName() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -119,7 +120,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testOperationalScope() { + void testOperationalScope() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -132,7 +133,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testStartDate() { + void testStartDate() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = @@ -144,7 +145,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testManufacturerReferenceNumber() { + void testManufacturerReferenceNumber() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = new @@ -157,7 +158,7 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest { } @Test - public void testType() { + void testType() { EntitlementPoolEntity source = new EntitlementPoolEntity(); EntitlementPoolEntityDto target = new EntitlementPoolEntityDto(); MapEntitlementPoolEntityToEntitlementPoolEntityDto mapper = diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest.java index 0c28ceef36..f52bda8279 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest.java @@ -16,22 +16,23 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.HashSet; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolType; import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope; import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolRequestDto; import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto; -import org.testng.annotations.Test; -public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { +class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { @Test - public void testExpiryDate() { + void testExpiryDate() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -43,7 +44,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testName() { + void testName() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -55,7 +56,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testDescription() { + void testDescription() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -67,7 +68,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testThresholdValue() { + void testThresholdValue() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -79,7 +80,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testIncrements() { + void testIncrements() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -91,7 +92,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testOperationalScope() { + void testOperationalScope() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -104,7 +105,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testStartDate() { + void testStartDate() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = @@ -116,7 +117,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testManufacturerReferenceNumber() { + void testManufacturerReferenceNumber() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = new @@ -128,7 +129,7 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { } @Test - public void testType() { + void testType() { EntitlementPoolRequestDto source = new EntitlementPoolRequestDto(); EntitlementPoolEntity target = new EntitlementPoolEntity(); MapEntitlementPoolRequestDtoToEntitlementPoolEntity mapper = new @@ -139,7 +140,6 @@ public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest { assertEquals(target.getType(), entitlementPoolType); } - enum TestEnum { Yes } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest.java index 035d36707e..92e2d119bd 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest.java @@ -16,17 +16,18 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity; import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto; -import org.testng.annotations.Test; -public class MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest { +class MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest { @Test - public void testName() { + void testName() { FeatureGroupDescriptorDto source = new FeatureGroupDescriptorDto(); FeatureGroupEntity target = new FeatureGroupEntity(); MapFeatureGroupDescriptorDtoToFeatureGroupEntity mapper = @@ -38,7 +39,7 @@ public class MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest { } @Test - public void testDescription() { + void testDescription() { FeatureGroupDescriptorDto source = new FeatureGroupDescriptorDto(); FeatureGroupEntity target = new FeatureGroupEntity(); MapFeatureGroupDescriptorDtoToFeatureGroupEntity mapper = @@ -50,7 +51,7 @@ public class MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest { } @Test - public void testPartNumber() { + void testPartNumber() { FeatureGroupDescriptorDto source = new FeatureGroupDescriptorDto(); FeatureGroupEntity target = new FeatureGroupEntity(); MapFeatureGroupDescriptorDtoToFeatureGroupEntity mapper = diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest.java index cc67603dea..9707e06c35 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest.java @@ -16,17 +16,18 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity; import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto; -import org.testng.annotations.Test; -public class MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest { +class MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest { @Test - public void testDescription() { + void testDescription() { FeatureGroupEntity source = new FeatureGroupEntity(); FeatureGroupDescriptorDto target = new FeatureGroupDescriptorDto(); MapFeatureGroupEntityToFeatureGroupDescriptorDto mapper = @@ -38,7 +39,7 @@ public class MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest { } @Test - public void testName() { + void testName() { FeatureGroupEntity source = new FeatureGroupEntity(); FeatureGroupDescriptorDto target = new FeatureGroupDescriptorDto(); MapFeatureGroupEntityToFeatureGroupDescriptorDto mapper = @@ -50,7 +51,7 @@ public class MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest { } @Test - public void testPartNumber() { + void testPartNumber() { FeatureGroupEntity source = new FeatureGroupEntity(); FeatureGroupDescriptorDto target = new FeatureGroupDescriptorDto(); MapFeatureGroupEntityToFeatureGroupDescriptorDto mapper = diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest.java index 2b94178a54..a8ebe957a1 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest.java @@ -16,19 +16,19 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm; import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto; import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest { +class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest { @Test - public void testName() { + void testName() { LicenseAgreementDescriptorDto source = new LicenseAgreementDescriptorDto(); LicenseAgreementEntity target = new LicenseAgreementEntity(); MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity mapper = @@ -40,7 +40,7 @@ public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest { } @Test - public void testDescription() { + void testDescription() { LicenseAgreementDescriptorDto source = new LicenseAgreementDescriptorDto(); LicenseAgreementEntity target = new LicenseAgreementEntity(); MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity mapper = @@ -52,7 +52,7 @@ public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest { } @Test - public void testRequirementsAndConstrains() { + void testRequirementsAndConstrains() { LicenseAgreementDescriptorDto source = new LicenseAgreementDescriptorDto(); LicenseAgreementEntity target = new LicenseAgreementEntity(); MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity mapper = @@ -64,7 +64,7 @@ public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest { } @Test - public void testLicenseTerm() { + void testLicenseTerm() { LicenseAgreementDescriptorDto source = new LicenseAgreementDescriptorDto(); LicenseAgreementEntity target = new LicenseAgreementEntity(); MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity mapper = diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest.java index b7c74e0bc1..f2c2e7a0a5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest.java @@ -16,19 +16,19 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther; import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm; import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest { +class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest { @Test - public void testLicenseTerm() { + void testLicenseTerm() { LicenseAgreementEntity source = new LicenseAgreementEntity(); LicenseAgreementDescriptorDto target = new LicenseAgreementDescriptorDto(); MapLicenseAgreementEntityToLicenseAgreementDescriptorDto mapper = @@ -41,7 +41,7 @@ public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest { } @Test - public void testName() { + void testName() { LicenseAgreementEntity source = new LicenseAgreementEntity(); LicenseAgreementDescriptorDto target = new LicenseAgreementDescriptorDto(); MapLicenseAgreementEntityToLicenseAgreementDescriptorDto mapper = @@ -53,7 +53,7 @@ public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest { } @Test - public void testDescription() { + void testDescription() { LicenseAgreementEntity source = new LicenseAgreementEntity(); LicenseAgreementDescriptorDto target = new LicenseAgreementDescriptorDto(); MapLicenseAgreementEntityToLicenseAgreementDescriptorDto mapper = @@ -65,7 +65,7 @@ public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest { } @Test - public void testRequirementsAndConstrains() { + void testRequirementsAndConstrains() { LicenseAgreementEntity source = new LicenseAgreementEntity(); LicenseAgreementDescriptorDto target = new LicenseAgreementDescriptorDto(); MapLicenseAgreementEntityToLicenseAgreementDescriptorDto mapper = diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest.java index 6a6ae363f7..3c66a322df 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest.java @@ -16,7 +16,7 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.HashSet; @@ -27,13 +27,13 @@ import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther; import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope; import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit; import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { +class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { @Test - public void testReferencingFeatureGroups() { + void testReferencingFeatureGroups() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -45,7 +45,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testDescription() { + void testDescription() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -57,7 +57,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testType() { + void testType() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -69,7 +69,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testIncrements() { + void testIncrements() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -81,7 +81,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testExpiryDate() { + void testExpiryDate() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -93,7 +93,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testId() { + void testId() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -105,7 +105,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testThresholdUnits() { + void testThresholdUnits() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -117,7 +117,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testThresholdValue() { + void testThresholdValue() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -129,7 +129,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testName() { + void testName() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -141,7 +141,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testOperationalScope() { + void testOperationalScope() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -156,7 +156,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testStartDate() { + void testStartDate() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = @@ -168,7 +168,7 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest { } @Test - public void testManufacturerReferenceNumber() { + void testManufacturerReferenceNumber() { LicenseKeyGroupEntity source = new LicenseKeyGroupEntity(); LicenseKeyGroupEntityDto target = new LicenseKeyGroupEntityDto(); MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto mapper = new diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest.java index a4c1cd9d45..ebb59470ca 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest.java @@ -16,7 +16,7 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity; import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType; @@ -24,14 +24,14 @@ import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope; import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit; import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupRequestDto; import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { +class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { @Test - public void testExpiryDate() { + void testExpiryDate() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -43,7 +43,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testThresholdUnits() { + void testThresholdUnits() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -55,7 +55,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testName() { + void testName() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -67,7 +67,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testDescription() { + void testDescription() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -79,7 +79,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testThresholdValue() { + void testThresholdValue() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -91,7 +91,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testType() { + void testType() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -103,7 +103,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testIncrements() { + void testIncrements() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -115,7 +115,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testOperationalScope() { + void testOperationalScope() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -127,7 +127,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testStartDate() { + void testStartDate() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = @@ -139,7 +139,7 @@ public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest { } @Test - public void testManufacturerReferenceNumber() { + void testManufacturerReferenceNumber() { LicenseKeyGroupRequestDto source = new LicenseKeyGroupRequestDto(); LicenseKeyGroupEntity target = new LicenseKeyGroupEntity(); MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity mapper = new diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDtoTest.java index 2137914f82..88b6bea170 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDtoTest.java @@ -15,15 +15,15 @@ */ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLimitEntityToLimitCreationDtoTest { +class MapLimitEntityToLimitCreationDtoTest { @Test - public void testId() { + void testId() { LimitEntity source = new LimitEntity(); LimitCreationDto target = new LimitCreationDto(); MapLimitEntityToLimitCreationDto mapper = new MapLimitEntityToLimitCreationDto(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDtoTest.java index d8034dd65b..6f65a3c74d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDtoTest.java @@ -16,19 +16,19 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.AggregationFunction; import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity; import org.openecomp.sdc.vendorlicense.dao.types.LimitType; import org.openecomp.sdcrests.vendorlicense.types.LimitEntityDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapLimitEntityToLimitDtoTest { +class MapLimitEntityToLimitDtoTest { @Test - public void testDescription() { + void testDescription() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -39,7 +39,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testAggregationFunction() { + void testAggregationFunction() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -50,7 +50,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testType() { + void testType() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -61,7 +61,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testUnit() { + void testUnit() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -72,7 +72,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testMetric() { + void testMetric() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -83,7 +83,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testName() { + void testName() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -94,7 +94,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testId() { + void testId() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -105,7 +105,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testTime() { + void testTime() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); @@ -116,7 +116,7 @@ public class MapLimitEntityToLimitDtoTest { } @Test - public void testValue() { + void testValue() { LimitEntity source = new LimitEntity(); LimitEntityDto target = new LimitEntityDto(); MapLimitEntityToLimitDto mapper = new MapLimitEntityToLimitDto(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest.java index 21f572963e..c12dae06eb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest.java @@ -16,19 +16,19 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashSet; import java.util.Set; import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther; import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest { +class MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest { @Test - public void testChoices() { + void testChoices() { MultiChoiceOrOtherDto source = new MultiChoiceOrOtherDto(); MultiChoiceOrOther target = new MultiChoiceOrOther(); MapMultiChoiceOrOtherDtoToMultiChoiceOrOther mapper = new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther(); @@ -41,7 +41,7 @@ public class MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest { } @Test - public void testOther() { + void testOther() { MultiChoiceOrOtherDto source = new MultiChoiceOrOtherDto(); MultiChoiceOrOther target = new MultiChoiceOrOther(); MapMultiChoiceOrOtherDtoToMultiChoiceOrOther mapper = new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest.java index a0db43e4cd..d2388a1c61 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest.java @@ -16,20 +16,20 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.HashSet; import java.util.Set; import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther; import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest { +class MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest { @Test - public void testOther() { + void testOther() { MultiChoiceOrOther source = new MultiChoiceOrOther(); MultiChoiceOrOtherDto target = new MultiChoiceOrOtherDto(); MapMultiChoiceOrOtherToMultiChoiceOrOtherDto mapper = new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto(); @@ -40,7 +40,7 @@ public class MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest { } @Test - public void testChoices() { + void testChoices() { MultiChoiceOrOther source = new MultiChoiceOrOther(); MultiChoiceOrOtherDto target = new MultiChoiceOrOtherDto(); MapMultiChoiceOrOtherToMultiChoiceOrOtherDto mapper = new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDtoTest.java index b40c6692e5..916711cc97 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDtoTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDtoTest.java @@ -16,17 +16,17 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelEntityDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapVendorLicenseModelEntityToDtoTest { +class MapVendorLicenseModelEntityToDtoTest { @Test - public void testIconRef() { + void testIconRef() { VendorLicenseModelEntity source = new VendorLicenseModelEntity(); VendorLicenseModelEntityDto target = new VendorLicenseModelEntityDto(); MapVendorLicenseModelEntityToDto mapper = new MapVendorLicenseModelEntityToDto(); @@ -37,7 +37,7 @@ public class MapVendorLicenseModelEntityToDtoTest { } @Test - public void testDescription() { + void testDescription() { VendorLicenseModelEntity source = new VendorLicenseModelEntity(); VendorLicenseModelEntityDto target = new VendorLicenseModelEntityDto(); MapVendorLicenseModelEntityToDto mapper = new MapVendorLicenseModelEntityToDto(); @@ -48,7 +48,7 @@ public class MapVendorLicenseModelEntityToDtoTest { } @Test - public void testId() { + void testId() { VendorLicenseModelEntity source = new VendorLicenseModelEntity(); VendorLicenseModelEntityDto target = new VendorLicenseModelEntityDto(); MapVendorLicenseModelEntityToDto mapper = new MapVendorLicenseModelEntityToDto(); @@ -59,7 +59,7 @@ public class MapVendorLicenseModelEntityToDtoTest { } @Test - public void testVendorName() { + void testVendorName() { VendorLicenseModelEntity source = new VendorLicenseModelEntity(); VendorLicenseModelEntityDto target = new VendorLicenseModelEntityDto(); MapVendorLicenseModelEntityToDto mapper = new MapVendorLicenseModelEntityToDto(); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest.java index bd4869ee49..29db7dc5f1 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/test/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest.java @@ -16,17 +16,17 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelRequestDto; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest { +class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest { @Test - public void testDescription() { + void testDescription() { VendorLicenseModelRequestDto source = new VendorLicenseModelRequestDto(); VendorLicenseModelEntity target = new VendorLicenseModelEntity(); MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity mapper = @@ -38,7 +38,7 @@ public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest { } @Test - public void testVendorName() { + void testVendorName() { VendorLicenseModelRequestDto source = new VendorLicenseModelRequestDto(); VendorLicenseModelEntity target = new VendorLicenseModelEntity(); MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity mapper = @@ -50,7 +50,7 @@ public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest { } @Test - public void testIconRef() { + void testIconRef() { VendorLicenseModelRequestDto source = new VendorLicenseModelRequestDto(); VendorLicenseModelEntity target = new VendorLicenseModelEntity(); MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity mapper = diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 85e68f0a9a..6ec59da97a 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -48,19 +48,6 @@ </dependency> <dependency> - <groupId>com.github.testng-team</groupId> - <artifactId>testng-junit5</artifactId> - <version>0.0.1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-engine</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>com.google.code.bean-matchers</groupId> <artifactId>bean-matchers</artifactId> <version>${bean-matchers.version}</version> |