diff options
author | Blackwell, Ian (ib733q) <IanB@amdocs.com> | 2018-04-03 17:28:44 +0100 |
---|---|---|
committer | Blackwell, Ian (ib733q) <IanB@amdocs.com> | 2018-04-03 17:28:44 +0100 |
commit | 7b1f813441f94261f43ec4f5bb0944ad2570fbdf (patch) | |
tree | 7c5a2d1f378b2a0b358905e82d21cce73f3e1d6d /src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java | |
parent | 4dd316529148d07059d844197cdb676806bdc0c6 (diff) |
Revisions made to the Model Loader to use Babel
Change the Model Loader to use the Babel micro service.
Responsibility for transformation of ASDC TOSCA models,
the yaml files, has been moved from ASDC and placed into
the Bable microservice. Model Loader will forward any
CSAR received from ASDC and delegate transformation to
Babel. Babel will return the transformed TOSCA models
to Model Loader which will then ingest them into the
A&AI Inventory.
Issue-ID: AAI-987
Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
Diffstat (limited to 'src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java')
-rw-r--r-- | src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java index c408a53..4fd6d1e 100644 --- a/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java @@ -25,40 +25,37 @@ import static org.junit.Assert.assertTrue; import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; - import org.junit.Test; import org.onap.aai.modelloader.entity.Artifact; -import org.onap.aai.modelloader.entity.model.NamedQueryArtifact; -import org.onap.aai.modelloader.entity.model.NamedQueryArtifactParser; public class NamedQueryArtifactParserTest { - @Test - public void testParseNamedQuery() throws Exception { - final String MODEL_FILE = "src/test/resources/models/named-query-wan-connector.xml"; - - try { - byte[] xmlBytes = Files.readAllBytes(Paths.get(MODEL_FILE)); - - NamedQueryArtifactParser parser = new NamedQueryArtifactParser(); - List<Artifact> modelList = parser.parse(xmlBytes, "test-artifact"); - - assertTrue(modelList.size() == 1); - - NamedQueryArtifact model = (NamedQueryArtifact) modelList.get(0); - System.out.println(model.toString()); - - assertTrue(model.getNamedQueryUuid().equalsIgnoreCase("94cac189-8d88-4d63-a194-f44214e080ff")); - assertTrue(model.getType().toString().equalsIgnoreCase("NAMED_QUERY")); - assertTrue(model.getDependentModelIds().size() == 4); - assertTrue(model.getDependentModelIds().contains("d09dd9da-0148-46cd-a947-591afc844d24")); - assertTrue(model.getDependentModelIds().contains("997fc7-fca1-451f-b953-9a1e6197b4d6")); - assertTrue(model.getDependentModelIds().contains("897df7ea-8938-42b0-bc57-46e913a4d93b")); - assertTrue(model.getDependentModelIds().contains("f2b24d95-c582-48d5-b2d6-c5b3a94ce812")); - } catch (Exception e) { - e.printStackTrace(); - assertTrue(false); - } - } + @Test + public void testParseNamedQuery() throws Exception { + final String MODEL_FILE = "src/test/resources/models/named-query-wan-connector.xml"; + + try { + String fileString = new String(Files.readAllBytes(Paths.get(MODEL_FILE))); + + NamedQueryArtifactParser parser = new NamedQueryArtifactParser(); + List<Artifact> modelList = parser.parse(fileString, "test-artifact"); + + assertTrue(modelList.size() == 1); + + NamedQueryArtifact model = (NamedQueryArtifact) modelList.get(0); + System.out.println(model.toString()); + + assertTrue(model.getNamedQueryUuid().equalsIgnoreCase("94cac189-8d88-4d63-a194-f44214e080ff")); + assertTrue(model.getType().toString().equalsIgnoreCase("NAMED_QUERY")); + assertTrue(model.getDependentModelIds().size() == 4); + assertTrue(model.getDependentModelIds().contains("d09dd9da-0148-46cd-a947-591afc844d24")); + assertTrue(model.getDependentModelIds().contains("997fc7-fca1-451f-b953-9a1e6197b4d6")); + assertTrue(model.getDependentModelIds().contains("897df7ea-8938-42b0-bc57-46e913a4d93b")); + assertTrue(model.getDependentModelIds().contains("f2b24d95-c582-48d5-b2d6-c5b3a94ce812")); + } catch (Exception e) { + e.printStackTrace(); + assertTrue(false); + } + } } |