From 72b29baac0c1f08b610fd4daf2078b43ee74b3d8 Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 22 Feb 2021 14:01:13 +0000 Subject: Remove testNG dependencies Signed-off-by: Vasyl Razinkov Change-Id: Ib7632106f9fc0703a90ec3c41cebd5d22471adfd Issue-ID: SDC-3108 --- .../heat/services/tree/HeatTreeManagerTest.java | 23 ++++++++++++---------- .../validation/base/ResourceBaseValidatorTest.java | 21 ++++++++++---------- .../sdc/validation/util/ValidationTestUtil.java | 5 +++-- 3 files changed, 27 insertions(+), 22 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib') diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java index 5b04c6c6f8..37174a91e7 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java @@ -16,11 +16,14 @@ package org.openecomp.sdc.heat.services.tree; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; import org.openecomp.core.utilities.file.FileContentHandler; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree; -import org.testng.Assert; -import org.testng.annotations.Test; import java.io.File; import java.io.FileInputStream; @@ -50,8 +53,8 @@ public class HeatTreeManagerTest { HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap); heatTreeManager.createTree(); HeatStructureTree tree = heatTreeManager.getTree(); - Assert.assertNotNull(tree); - Assert.assertEquals(tree.getHeat().size(), 2); + assertNotNull(tree); + assertEquals(tree.getHeat().size(), 2); } @Test @@ -74,8 +77,8 @@ public class HeatTreeManagerTest { HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap); heatTreeManager.createTree(); HeatStructureTree tree = heatTreeManager.getTree(); - Assert.assertNotNull(tree); - Assert.assertEquals(tree.getHeat().size(), 3); + assertNotNull(tree); + assertEquals(tree.getHeat().size(), 3); verifyHeatArtifacts(tree, "ocgmgr.yaml", 1); verifyHeatArtifacts(tree, "ocgapp.yaml", 0); verifyHeatArtifacts(tree, "base_ocg.yaml", 0); @@ -84,12 +87,12 @@ public class HeatTreeManagerTest { private void verifyHeatArtifacts(HeatStructureTree tree, String heatName, int expectedArtifactNum ) { HeatStructureTree heat = HeatStructureTree.getHeatStructureTreeByName(tree.getHeat(), heatName); - Assert.assertNotNull(heat); + assertNotNull(heat); if (expectedArtifactNum > 0) { - Assert.assertNotNull(heat.getArtifacts()); - Assert.assertEquals(heat.getArtifacts().size(), expectedArtifactNum); + assertNotNull(heat.getArtifacts()); + assertEquals(heat.getArtifacts().size(), expectedArtifactNum); } else { - Assert.assertNull(heat.getArtifacts()); + assertNull(heat.getArtifacts()); } } diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/base/ResourceBaseValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/base/ResourceBaseValidatorTest.java index ec39ead030..35a8c00ee9 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/base/ResourceBaseValidatorTest.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/base/ResourceBaseValidatorTest.java @@ -15,19 +15,20 @@ */ package org.openecomp.sdc.validation.base; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.commons.collections4.MapUtils; +import org.junit.jupiter.api.Test; import org.openecomp.core.validation.types.MessageContainer; import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration; import org.openecomp.sdc.validation.type.ConfigConstants; import org.openecomp.sdc.validation.util.ValidationTestUtil; -import org.testng.Assert; -import org.testng.annotations.Test; import java.util.Collections; import java.util.HashMap; import java.util.Map; -@Test public class ResourceBaseValidatorTest { private String testValidator = "testValidator"; @@ -36,7 +37,7 @@ private String testValidator = "testValidator"; ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator(); Map messages = ValidationTestUtil.testValidator( resourceBaseValidator, "/InvalidResourceType"); - Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(), + assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(), "WARNING: [RBV1]: A resource has an invalid or unsupported type - null, " + "Resource ID [FSB2]"); } @@ -46,7 +47,7 @@ private String testValidator = "testValidator"; ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator(); Map messages = ValidationTestUtil.testValidator(resourceBaseValidator, "/InvalidHeatStructure"); - Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(), + assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(), "ERROR: [RBV2]: Invalid HEAT format problem - [while scanning for the next " + "token\n" + "found character '\\t(TAB)' that cannot start any token. " + "(Do not use \\t(TAB) for indentation)\n" + @@ -62,7 +63,7 @@ private String testValidator = "testValidator"; Map properties = new HashMap<>(); resourceBaseValidator.init(properties); - Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); + assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); } @Test @@ -72,8 +73,8 @@ private String testValidator = "testValidator"; Map resourceTypeToImpl = resourceBaseValidator.getResourceTypeToImpl(); - Assert.assertTrue(MapUtils.isNotEmpty(resourceTypeToImpl)); - Assert.assertTrue(resourceTypeToImpl.containsKey(testValidator)); + assertTrue(MapUtils.isNotEmpty(resourceTypeToImpl)); + assertTrue(resourceTypeToImpl.containsKey(testValidator)); } @Test @@ -84,7 +85,7 @@ private String testValidator = "testValidator"; resourceBaseValidator.init(properties); - Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); + assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); } @Test @@ -92,7 +93,7 @@ private String testValidator = "testValidator"; ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator(); initProperties(resourceBaseValidator, new HashMap<>()); - Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); + assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl())); } public Map getValidImplementationConfiguration() { diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java index 75a581e776..608208c707 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java @@ -16,6 +16,8 @@ package org.openecomp.sdc.validation.util; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.IOUtils; import org.openecomp.core.utilities.file.FileUtils; @@ -33,7 +35,6 @@ import org.openecomp.sdc.validation.ResourceValidator; import org.openecomp.sdc.validation.ValidationContext; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.base.ResourceBaseValidator; -import org.testng.Assert; import java.io.File; import java.io.FileInputStream; @@ -177,7 +178,7 @@ public class ValidationTestUtil { public static void validateErrorMessage(String actualMessage, String expected, String... params) { - Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""), + assertEquals(actualMessage.replace("\n", "").replace("\r", ""), ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "") .replace("\r", "")); } -- cgit 1.2.3-korg