diff options
Diffstat (limited to 'openecomp-be/lib')
9 files changed, 61 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index f20b24aa95..eee0b85e40 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -72,6 +72,12 @@ <version>${project.version}</version> </dependency> </dependencies> - - + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + </build> </project> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index cf0150a58e..950f5dc923 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -31,6 +31,11 @@ <artifactId>lombok</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api.version}</version> + </dependency> </dependencies> </project> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index d635fb0a08..83ad8738d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -81,6 +81,12 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index a63fc9bfdd..eeca992bc8 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -58,5 +58,23 @@ </parent> <artifactId>openecomp-tosca-converter-core</artifactId> - + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <excludes> + <exclude>**/*.csar</exclude> + </excludes> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources/csar</directory> + <includes> + <include>**.csar</include> + </includes> + <filtering>false</filtering> + <targetPath>csar</targetPath> + </testResource> + </testResources> + </build> </project>
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java index f130f262a7..a9ee1a7518 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java @@ -135,7 +135,7 @@ public class ToscaSolConverterVnfTest { } private byte[] getFileResource(final String filePath) { - try (final InputStream inputStream = ClassLoader.class.getResourceAsStream(filePath)) { + try (final InputStream inputStream = this.getClass().getResourceAsStream(filePath)) { return IOUtils.toByteArray(inputStream); } catch (final IOException ex) { fail(String.format("Could not load file: %s", filePath)); diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 6867d17cde..fd1728e905 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -109,6 +109,24 @@ <properties> <useSystemClassLoader>false</useSystemClassLoader> </properties> - + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <excludes> + <exclude>**/*.csar</exclude> + </excludes> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources/mock/analyzerService</directory> + <includes> + <include>**.csar</include> + </includes> + <filtering>false</filtering> + <targetPath>mock/analyzerService</targetPath> + </testResource> + </testResources> + </build> </project> diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java index 70cae71f17..f7188379dc 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java @@ -373,12 +373,9 @@ public class DataModelUtil { throw new CoreException(new InvalidRequirementAssignmentErrorBuilder(requirementId).build()); } - if (nodeTemplate.getRequirements() == null) { - nodeTemplate.setRequirements(new ArrayList<>()); - } Map<String, RequirementAssignment> requirement = new HashMap<>(); requirement.put(requirementId, requirementAssignment); - nodeTemplate.getRequirements().add(requirement); + nodeTemplate.addRequirements(requirement); } /** diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java index 4ad4d2b53e..5a19eacf3e 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java @@ -268,8 +268,7 @@ public class ToscaModelTest { Map<String, RequirementAssignment> nodeTemplateRequirement2 = new HashMap<>(); nodeTemplateRequirement1.put(REQ1, reqAssignment1); nodeTemplateRequirement2.put(REQ2, reqAssignment2); - nodeTemplate.setRequirements(new ArrayList<>()); - nodeTemplate.getRequirements().add(nodeTemplateRequirement1); + nodeTemplate.addRequirements(nodeTemplateRequirement1); nodeTemplate.getRequirements().add(nodeTemplateRequirement2); CapabilityAssignment capAss = new CapabilityAssignment(); diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java index fe4a37f39b..8b732df95c 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java @@ -681,7 +681,7 @@ public class DataModelUtilTest { requirementAssignment1.setRelationship("relationshipId"); DataModelUtil.removeRequirementAssignment(nodeTemplate, REQUIREMENT_KEY, requirementAssignment); - assertTrue(requirementList.isEmpty()); + assertTrue(nodeTemplate.getRequirements().isEmpty()); } @Test |