Code Review
/
aai
/
babel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor Junit test code to remove duplication
[aai/babel.git]
/
src
/
test
/
java
/
org
/
onap
/
aai
/
babel
/
parser
/
TestToscaParser.java
diff --git
a/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
b/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
index
93b3576
..
f340132
100644
(file)
--- a/
src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
+++ b/
src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
@@
-34,7
+34,7
@@
import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
import org.onap.aai.babel.csar.extractor.InvalidArchiveException;
import org.junit.Before;
import org.junit.Test;
import org.onap.aai.babel.csar.extractor.InvalidArchiveException;
-import org.onap.aai.babel.
csar.extractor.YamlExtractor
;
+import org.onap.aai.babel.
testdata.CsarTest
;
import org.onap.aai.babel.util.ArtifactTestUtils;
import org.onap.aai.babel.xml.generator.api.AaiArtifactGenerator;
import org.onap.aai.babel.xml.generator.data.AdditionalParams;
import org.onap.aai.babel.util.ArtifactTestUtils;
import org.onap.aai.babel.xml.generator.api.AaiArtifactGenerator;
import org.onap.aai.babel.xml.generator.data.AdditionalParams;
@@
-59,6
+59,7
@@
public class TestToscaParser {
public void setup() throws FileNotFoundException, IOException {
System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
new ArtifactTestUtils().getResourcePath(ARTIFACT_GENERATOR_CONFIG));
public void setup() throws FileNotFoundException, IOException {
System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
new ArtifactTestUtils().getResourcePath(ARTIFACT_GENERATOR_CONFIG));
+
InputStream in = TestToscaParser.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
Properties properties = new Properties();
properties.load(in);
InputStream in = TestToscaParser.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
Properties properties = new Properties();
properties.load(in);
@@
-68,15
+69,13
@@
public class TestToscaParser {
@Test
public void testParserWithCsarFile() throws IOException, InvalidArchiveException {
@Test
public void testParserWithCsarFile() throws IOException, InvalidArchiveException {
- String csarResourceName = "catalog_csar.csar";
- byte[] csarBytes = new ArtifactTestUtils().getCompressedArtifact(csarResourceName);
- List<Artifact> ymlFiles = new YamlExtractor().extract(csarBytes, csarResourceName, "1.0");
-
+ List<Artifact> ymlFiles = CsarTest.VNF_VENDOR_CSAR.extractArtifacts();
Map<String, String> additionalParams = new HashMap<>();
additionalParams.put(AdditionalParams.SERVICE_VERSION.getName(), "1.0");
AaiArtifactGenerator generator = new AaiArtifactGenerator();
Map<String, String> additionalParams = new HashMap<>();
additionalParams.put(AdditionalParams.SERVICE_VERSION.getName(), "1.0");
AaiArtifactGenerator generator = new AaiArtifactGenerator();
- GenerationData data = generator.generateArtifact(csarBytes, ymlFiles, additionalParams);
+ GenerationData data = generator.generateArtifact(CsarTest.VNF_VENDOR_CSAR.getContent(), ymlFiles,
+ additionalParams);
assertThat(data.getErrorData().size(), is(equalTo(0)));
assertThat(data.getResultData().size(), is(equalTo(2)));
assertThat(data.getErrorData().size(), is(equalTo(0)));
assertThat(data.getResultData().size(), is(equalTo(2)));