diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd')
2 files changed, 12 insertions, 6 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionDefinitionYamlParserTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionDefinitionYamlParserTest.java index cb901b6f3c..b57bf74571 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionDefinitionYamlParserTest.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionDefinitionYamlParserTest.java @@ -29,22 +29,25 @@ import static org.openecomp.core.converter.pnfd.model.PnfTransformationToken.TO_ import java.io.IOException; import java.io.InputStream; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Optional; import org.junit.Test; import org.openecomp.core.converter.pnfd.model.ConversionDefinition; import org.openecomp.core.converter.pnfd.model.ConversionStrategyType; -import org.openecomp.core.util.TestResourcesUtil; import org.openecomp.core.util.YamlTestUtil; +import org.openecomp.sdc.be.test.util.TestResourcesHandler; public class ConversionDefinitionYamlParserTest { @Test public void shouldBuildDefinition() { final Map<String, Object> definitionYaml; - final String definitionYamlFilePath = "transformation/conversionDefinition/conversionDefinitionWithReplaceStrategy.yaml"; - try (final InputStream resourceInputStream = TestResourcesUtil.getFileResourceAsStream(definitionYamlFilePath)) { + final Path definitionYamlFilePath = + Paths.get("transformation", "conversionDefinition", "conversionDefinitionWithReplaceStrategy.yaml"); + try (final InputStream resourceInputStream = TestResourcesHandler.getResourceAsStream(definitionYamlFilePath)) { definitionYaml = (Map<String, Object>) YamlTestUtil.read(resourceInputStream); } catch (final IOException e) { fail(String.format("Could not load %s", definitionYamlFilePath)); diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdConversionStrategyYamlParserTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdConversionStrategyYamlParserTest.java index 1eab214980..18d10436be 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdConversionStrategyYamlParserTest.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdConversionStrategyYamlParserTest.java @@ -25,20 +25,23 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Map; import java.util.Optional; import org.junit.Test; import org.openecomp.core.converter.pnfd.strategy.PnfdConversionStrategy; -import org.openecomp.core.util.TestResourcesUtil; import org.openecomp.core.util.YamlTestUtil; +import org.openecomp.sdc.be.test.util.TestResourcesHandler; public class PnfdConversionStrategyYamlParserTest { @Test public void parseInvalidYamlObject() { final Object replaceStrategyYaml; - final String strategyYamlFilePath = "transformation/strategy/strategyMissingStrategyAttribute.yaml"; - try (final InputStream resourceInputStream = TestResourcesUtil.getFileResourceAsStream(strategyYamlFilePath)) { + final Path strategyYamlFilePath = + Paths.get("transformation", "strategy", "strategyMissingStrategyAttribute.yaml"); + try (final InputStream resourceInputStream = TestResourcesHandler.getResourceAsStream(strategyYamlFilePath)) { replaceStrategyYaml = YamlTestUtil.read(resourceInputStream); } catch (final IOException e) { fail(String.format("Could not load %s", strategyYamlFilePath)); |