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 --- .../tools/commands/exportinfo/serialize/VLMExtractTest.java | 12 ++++++------ .../org/openecomp/core/tools/model/ColumnDefinitionTest.java | 4 ++-- .../tools/store/zusammen/datatypes/ElementEntityTest.java | 2 +- .../tools/store/zusammen/datatypes/HealingEntityTest.java | 2 +- .../store/zusammen/datatypes/VersionElementsEntityTest.java | 3 ++- .../tools/store/zusammen/datatypes/VersionEntityTest.java | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) (limited to 'openecomp-be/tools/zusammen-tools') diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/commands/exportinfo/serialize/VLMExtractTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/commands/exportinfo/serialize/VLMExtractTest.java index 9faf5918c6..9c8b1815a1 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/commands/exportinfo/serialize/VLMExtractTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/commands/exportinfo/serialize/VLMExtractTest.java @@ -20,14 +20,14 @@ package org.openecomp.core.tools.commands.exportinfo.serialize; -import org.openecomp.core.tools.exportinfo.ExportSerializer; -import org.testng.annotations.Test; +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 static org.testng.Assert.*; +import org.junit.Test; +import org.openecomp.core.tools.exportinfo.ExportSerializer; public class VLMExtractTest { - - @Test public void extractVLM(){ String vlmId = "979a56c7b2fa41e6a5742137f53a5c1b"; @@ -51,7 +51,7 @@ public class VLMExtractTest { } - @Test(expectedExceptions = IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void failToExtractVLMBecauseJsonIsCorrupted(){ String elemenet_info_string = "gfhhhghgh"; assertNull(new CustomExportSerializer().extractVlm(elemenet_info_string)); diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/model/ColumnDefinitionTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/model/ColumnDefinitionTest.java index d756179368..b45a3370ff 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/model/ColumnDefinitionTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/model/ColumnDefinitionTest.java @@ -19,10 +19,10 @@ */ package org.openecomp.core.tools.model; -import static org.testng.AssertJUnit.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.datastax.driver.core.DataType; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class ColumnDefinitionTest { diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/ElementEntityTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/ElementEntityTest.java index 2ce73f469e..67ce2e78f0 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/ElementEntityTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/ElementEntityTest.java @@ -22,7 +22,7 @@ package org.openecomp.core.tools.store.zusammen.datatypes; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class ElementEntityTest { @Test diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/HealingEntityTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/HealingEntityTest.java index a62c4021a7..fec6ef1782 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/HealingEntityTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/HealingEntityTest.java @@ -22,7 +22,7 @@ package org.openecomp.core.tools.store.zusammen.datatypes; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class HealingEntityTest { @Test diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionElementsEntityTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionElementsEntityTest.java index 617665d2ef..9e7bdaa6f6 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionElementsEntityTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionElementsEntityTest.java @@ -22,7 +22,8 @@ package org.openecomp.core.tools.store.zusammen.datatypes; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; + public class VersionElementsEntityTest { @Test diff --git a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionEntityTest.java b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionEntityTest.java index 742bff6992..e122c5f519 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionEntityTest.java +++ b/openecomp-be/tools/zusammen-tools/src/test/java/org/openecomp/core/tools/store/zusammen/datatypes/VersionEntityTest.java @@ -22,7 +22,7 @@ package org.openecomp.core.tools.store.zusammen.datatypes; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.MatcherAssert.assertThat; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class VersionEntityTest { @Test -- cgit 1.2.3-korg