aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormark.j.leonard <mark.j.leonard@gmail.com>2019-03-25 18:12:48 +0000
committermark.j.leonard <mark.j.leonard@gmail.com>2019-03-25 18:12:48 +0000
commitf6107af893b29094f84fb2eea2b9dd8acc78dc53 (patch)
treef302b255449fc8bb7bbae52effac355bb76dbb44 /src/main/java/org
parentd2215b5d8b6c8976a9540a9e4706c7bebca80aa2 (diff)
Additional JUnit tests for Model classes
Increase code coverage for Model and Service Change-Id: I02430f470cfa6497535a372a0b18be8678279270 Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java2
-rw-r--r--src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java11
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index d35814a..7415702 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -125,7 +125,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
* @return the generated Artifacts (containing XML models)
* @throws XmlArtifactGenerationException
*/
- private GenerationData generateAllArtifacts(final String serviceVersion, ISdcCsarHelper csarHelper)
+ public GenerationData generateAllArtifacts(final String serviceVersion, ISdcCsarHelper csarHelper)
throws XmlArtifactGenerationException {
List<NodeTemplate> serviceNodeTemplates = csarHelper.getServiceNodeTemplates();
if (serviceNodeTemplates == null) {
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
index 7dd86c6..8215536 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017-2019 European Software Marketing Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aai.babel.xml.generator.types;
public enum ModelType {
- SERVICE,
- RESOURCE,
- WIDGET;
+ SERVICE, // top-level model from the CSAR file
+ RESOURCE, // model type for which we generate XML and which may have children
+ WIDGET; // leaf-level type, pre-defined in A&AI
}