Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Rename packages from openecomp to onap.
[sdc.git] / common / onap-sdc-artifact-generator-lib / onap-sdc-artifact-generator-core / src / test / java / org / onap / sdc / generator / ArtifactGenerationServiceTest.java
diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
similarity index 96%
rename from common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
rename to common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
index 2de7535..e6f1abd 100644 (file)
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/test/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
@@ -18,38 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.generator;
-
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION;
+package org.onap.sdc.generator;
 
 import org.apache.commons.io.FileUtils;
-import org.openecomp.sdc.generator.aai.model.Resource;
-import org.openecomp.sdc.generator.aai.model.Service;
-import org.openecomp.sdc.generator.aai.model.Widget;
-import org.openecomp.sdc.generator.aai.tosca.GroupDefinition;
-import org.openecomp.sdc.generator.aai.tosca.NodeTemplate;
-import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate;
-import org.openecomp.sdc.generator.data.AdditionalParams;
-import org.openecomp.sdc.generator.aai.xml.Model;
-import org.openecomp.sdc.generator.aai.xml.ModelElement;
-import org.openecomp.sdc.generator.aai.xml.ModelElements;
-import org.openecomp.sdc.generator.aai.xml.ModelVer;
-import org.openecomp.sdc.generator.aai.xml.Relationship;
-import org.openecomp.sdc.generator.aai.xml.RelationshipData;
-import org.openecomp.sdc.generator.data.Artifact;
-import org.openecomp.sdc.generator.data.ArtifactType;
-import org.openecomp.sdc.generator.data.GenerationData;
-import org.openecomp.sdc.generator.data.GeneratorConstants;
-import org.openecomp.sdc.generator.data.GeneratorUtil;
-import org.openecomp.sdc.generator.data.GroupType;
-import org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl;
+import org.onap.sdc.generator.aai.tosca.GroupDefinition;
+import org.onap.sdc.generator.data.AdditionalParams;
+import org.onap.sdc.generator.data.GenerationData;
+import org.onap.sdc.generator.data.GeneratorConstants;
+import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl;
+import org.onap.sdc.generator.aai.model.Resource;
+import org.onap.sdc.generator.aai.model.Service;
+import org.onap.sdc.generator.aai.model.Widget;
+import org.onap.sdc.generator.aai.tosca.NodeTemplate;
+import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
+import org.onap.sdc.generator.aai.xml.Model;
+import org.onap.sdc.generator.aai.xml.ModelElement;
+import org.onap.sdc.generator.aai.xml.ModelElements;
+import org.onap.sdc.generator.aai.xml.ModelVer;
+import org.onap.sdc.generator.aai.xml.Relationship;
+import org.onap.sdc.generator.aai.xml.RelationshipData;
+import org.onap.sdc.generator.data.Artifact;
+import org.onap.sdc.generator.data.ArtifactType;
+import org.onap.sdc.generator.data.GeneratorUtil;
+import org.onap.sdc.generator.data.GroupType;
 import org.testng.Assert;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
@@ -328,7 +319,8 @@ public class ArtifactGenerationServiceTest {
       ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(
-          data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID,
+          data.getErrorData().get("AAI").get(0),String.format(
+              GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID,
               "invariantUUID",inputArtifacts.get(0).getName()));
 
     } catch (Exception e) {
@@ -362,7 +354,8 @@ public class ArtifactGenerationServiceTest {
       ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(
-          data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID,
+          data.getErrorData().get("AAI").get(0),String.format(
+              GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID,
               "UUID",inputArtifacts.get(0).getName()));
 
     } catch (Exception e) {
@@ -431,7 +424,8 @@ public class ArtifactGenerationServiceTest {
       ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(
-          data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID,
+          data.getErrorData().get("AAI").get(0),String.format(
+              GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID,
               "vfModuleModelInvariantUUID", inputArtifacts.get(1).getName() ));
 
     } catch (Exception e) {
@@ -505,7 +499,8 @@ public class ArtifactGenerationServiceTest {
       ArtifactGenerationServiceImpl obj = new ArtifactGenerationServiceImpl();
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(
-          data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_INVALID_ID,
+          data.getErrorData().get("AAI").get(0),String.format(
+              GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID,
               "vfModuleModelUUID", inputArtifacts.get(1).getName() ));
 
     } catch (Exception e) {
@@ -543,7 +538,7 @@ public class ArtifactGenerationServiceTest {
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(false,data.getErrorData().isEmpty());
       Assert.assertEquals(data.getErrorData().
-          get("AAI").get(0),GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND);
+          get("AAI").get(0), GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND);
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
@@ -579,7 +574,7 @@ public class ArtifactGenerationServiceTest {
       List<Artifact> inputArtifacts = init(aaiResourceBasePaths);
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(false,data.getErrorData().isEmpty());
-      String errMsg = String.format(GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,assertMsg);
+      String errMsg = String.format(GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,assertMsg);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),errMsg);
     } catch (Exception e) {
       Assert.fail(e.getMessage());
@@ -604,7 +599,8 @@ public class ArtifactGenerationServiceTest {
       List<Artifact> inputArtifacts = init(aaiResourceBasePaths);
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
-      Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_CONFIGFILE_NOT_FOUND,System.getProperty
+      Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(
+          GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND,System.getProperty
           ("artifactgenerator.config")));
     } catch (Exception e) {
       Assert.fail(e.getMessage());
@@ -625,7 +621,7 @@ public class ArtifactGenerationServiceTest {
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-          GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
+          GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
@@ -690,19 +686,19 @@ public class ArtifactGenerationServiceTest {
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-          GENERATOR_AAI_INVALID_SERVICE_VERSION);
+          GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
 
       additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.1");
       data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-          GENERATOR_AAI_INVALID_SERVICE_VERSION);
+          GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
 
       additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.0");
       data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-          GENERATOR_AAI_INVALID_SERVICE_VERSION);
+          GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
 
     } catch (Exception e) {
       Assert.fail(e.getMessage());
@@ -823,7 +819,7 @@ public class ArtifactGenerationServiceTest {
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-              (GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, "707b2850-e830-4b00-9902-879f44ac05a4"));
+              (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, "707b2850-e830-4b00-9902-879f44ac05a4"));
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
@@ -838,7 +834,7 @@ public class ArtifactGenerationServiceTest {
       GenerationData data = obj.generateArtifact(inputArtifacts, generatorConfig, additionalParams);
       Assert.assertEquals(data.getErrorData().isEmpty(),false);
       Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-          (GENERATOR_AAI_PROVIDING_SERVICE_MISSING, "a54a5235-b69d-4f8a-838b-d011e6783fa5"));
+          (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, "a54a5235-b69d-4f8a-838b-d011e6783fa5"));
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
SDC Parent Project Catalog FE and BE