diff options
Diffstat (limited to 'jtosca/src/test/java/org')
5 files changed, 59 insertions, 45 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)); } } diff --git a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java index 2ec41b2..a61fa42 100644 --- a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java +++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java @@ -23,18 +23,17 @@ package org.onap.sdc.toscaparser.api; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; - import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.onap.sdc.toscaparser.api.common.JToscaException; import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue; import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes; @@ -120,7 +119,7 @@ public class JToscaMetadataParse { private File loadCsar(final String csarFilePath) { final URL resourceUrl = JToscaMetadataParse.class.getClassLoader().getResource(csarFilePath); - assertNotNull(String.format("Could not load CSAR file '%s'", csarFilePath), resourceUrl); + assertNotNull(resourceUrl, String.format("Could not load CSAR file '%s'", csarFilePath)); return new File(resourceUrl.getFile()); } diff --git a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java index fd84d6e..b1588a0 100644 --- a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java +++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java @@ -20,8 +20,8 @@ package org.onap.sdc.toscaparser.api.elements; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.onap.sdc.toscaparser.api.JToscaImportTest; import org.onap.sdc.toscaparser.api.NodeTemplate; import org.onap.sdc.toscaparser.api.Property; @@ -32,13 +32,13 @@ import java.io.File; import java.net.URL; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CalculatePropertyByPathTest { private static ToscaTemplate toscaTemplate; - @BeforeClass + @BeforeAll public static void setUpClass() throws JToscaException { URL scarUrl = JToscaImportTest.class.getClassLoader().getResource("csars/service-NetworkCloudVnfServiceMock-csar.csar"); if (scarUrl != null) { diff --git a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java index d65de28..bef51ab 100644 --- a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java +++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java @@ -20,14 +20,14 @@ package org.onap.sdc.toscaparser.api.elements; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class EntityTypeTest { @@ -67,7 +67,7 @@ public class EntityTypeTest { } - @After + @AfterEach public void tearDown() throws Exception { EntityType.TOSCA_DEF = (LinkedHashMap<String, Object>) origMap; } diff --git a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java index 98e5102..bd9c840 100644 --- a/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java +++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java @@ -17,21 +17,24 @@ */ package org.onap.sdc.toscaparser.api.functions; -import org.junit.Test; -import org.onap.sdc.toscaparser.api.*; -import org.onap.sdc.toscaparser.api.common.JToscaException; -import org.onap.sdc.toscaparser.api.elements.constraints.Schema; -import org.onap.sdc.toscaparser.api.parameters.Input; -import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import org.onap.sdc.toscaparser.api.JToscaImportTest; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.Property; +import org.onap.sdc.toscaparser.api.ToscaTemplate; +import org.onap.sdc.toscaparser.api.common.JToscaException; +import org.onap.sdc.toscaparser.api.elements.constraints.Schema; +import org.onap.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder; public class GetInputTest { |