diff options
author | vasraz <vasyl.razinkov@est.tech> | 2022-04-12 18:44:00 +0100 |
---|---|---|
committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2022-04-13 09:46:37 +0000 |
commit | 06fda9a063c89fe1b077437f054b047ccdebe0f4 (patch) | |
tree | 3a26dc18803c4711d17c6e0fd4319ccdde37bafc /jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java | |
parent | d8210d49cebb6f5d9cb13e0d27b36c378df94c51 (diff) |
Migrate Junit4 to Junit5
Remove Junit4 dependency
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I9b7965537f55fe479f5e17b6e3ec02f8ff5d93b3
Issue-ID: SDC-3963
Diffstat (limited to 'jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java')
-rw-r--r-- | jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java index 5876ac7..80faa3a 100644 --- a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java +++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java @@ -19,7 +19,24 @@ */ package org.onap.sdc.toscaparser.api; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; import org.onap.sdc.toscaparser.api.common.JToscaException; import org.onap.sdc.toscaparser.api.elements.DataType; import org.onap.sdc.toscaparser.api.elements.PropertyDef; @@ -28,25 +45,16 @@ import org.onap.sdc.toscaparser.api.parameters.Annotation; import org.onap.sdc.toscaparser.api.parameters.Input; import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder; -import java.io.File; -import java.util.*; -import java.util.stream.Collectors; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.*; - public class JToscaImportTest { @Test public void testNoMissingTypeValidationError() throws JToscaException { String fileStr = JToscaImportTest.class.getClassLoader().getResource("csars/sdc-onboarding_csar.csar") - .getFile(); + .getFile(); File file = new File(fileStr); new ToscaTemplate(file.getAbsolutePath(), null, true, null); List<String> missingTypeErrors = ThreadLocalsHolder.getCollector().getValidationIssueReport().stream() - .filter(s -> s.contains("JE136")).collect(Collectors.toList()); + .filter(s -> s.contains("JE136")).collect(Collectors.toList()); assertEquals(0, missingTypeErrors.size()); } @@ -55,7 +63,7 @@ public class JToscaImportTest { Exception jte = null; try { String fileStr = JToscaImportTest.class.getClassLoader().getResource("csars/sdc-onboarding_csar.csar") - .getFile(); + .getFile(); File file = new File(fileStr); new ToscaTemplate(file.getAbsolutePath(), null, true, null); } catch (Exception e) { @@ -76,7 +84,7 @@ public class JToscaImportTest { File file = new File(fileStr); new ToscaTemplate(file.getAbsolutePath(), null, true, null); List<String> invalidImportErrors = ThreadLocalsHolder.getCollector().getValidationIssueReport().stream() - .filter(s -> s.contains("JE195")).collect(Collectors.toList()); + .filter(s -> s.contains("JE195")).collect(Collectors.toList()); assertEquals(0, invalidImportErrors.size()); } } @@ -200,7 +208,7 @@ public class JToscaImportTest { private void validateInputsAnnotations(List<Input> inputs) { List<Input> inputsWithAnnotations = inputs.stream().filter(i -> i.getAnnotations() != null) - .collect(Collectors.toList()); + .collect(Collectors.toList()); assertTrue(!inputs.isEmpty()); inputsWithAnnotations.stream().forEach(i -> validateAnnotations(i)); } @@ -213,7 +221,7 @@ public class JToscaImportTest { assertEquals(annotation.getType().toLowerCase(), "org.openecomp.annotations.source"); assertNotNull(annotation.getProperties()); Optional<Property> source_type = annotation.getProperties().stream() - .filter(p -> p.getName().equals("source_type")).findFirst(); + .filter(p -> p.getName().equals("source_type")).findFirst(); assertTrue(source_type.isPresent()); assertEquals(source_type.get().getValue(), "HEAT"); } @@ -260,8 +268,10 @@ public class JToscaImportTest { assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_TYPE), is(Schema.LIST)); assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_ENTRY_SCHEMA), is(TEST_DATATYPE_TEST1)); - assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST1), notNullValue()); - assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST2), notNullValue()); + assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST1), + notNullValue()); + assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST2), + notNullValue()); assertThat(toscaTemplate.toString(), containsString(TEST_DATATYPE_TOSTRING)); } } @@ -300,8 +310,10 @@ public class JToscaImportTest { assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_TYPE), is(Schema.LIST)); assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_ENTRY_SCHEMA), is(TEST_DATATYPE_TEST1)); - assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST1), notNullValue()); - assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST2), notNullValue()); + assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST1), + notNullValue()); + assertThat((LinkedHashMap<String, Object>) toscaTemplate.getTopologyTemplate().getCustomDefs().get(TEST_DATATYPE_TEST2), + notNullValue()); assertThat(toscaTemplate.toString(), containsString(TEST_DATATYPE_TOSTRING)); } } |