Rename packages from openecomp to onap.

[sdc.git] / common / onap-sdc-artifact-generator-lib / onap-sdc-artifact-generator-test / src / main / java / org / onap / sdc / generator / SampleJUnitTest.java

diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/SampleJUnitTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java
similarity index 97%
rename from common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/SampleJUnitTest.java
rename to common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java
index 089d773..9c4def4 100644 (file)
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/SampleJUnitTest.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/SampleJUnitTest.java
@@ -18,13 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.generator;
-
-import org.openecomp.sdc.generator.aai.model.Widget;
-import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate;
-import org.openecomp.sdc.generator.aai.xml.Model;
-import org.openecomp.sdc.generator.data.*;
-import org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl;
+package org.onap.sdc.generator;
+
+import org.onap.sdc.generator.data.AdditionalParams;
+import org.onap.sdc.generator.data.Artifact;
+import org.onap.sdc.generator.data.ArtifactType;
+import org.onap.sdc.generator.data.GenerationData;
+import org.onap.sdc.generator.data.GeneratorConstants;
+import org.onap.sdc.generator.data.GeneratorUtil;
+import org.onap.sdc.generator.data.GroupType;
+import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl;
+import org.onap.sdc.generator.aai.model.Widget;
+import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
+import org.onap.sdc.generator.aai.xml.Model;
+import org.onap.sdc.generator.data.*;
 
 import junit.framework.TestCase;
 import org.junit.Assert;
@@ -33,8 +40,7 @@ import org.junit.Test;
 import java.io.*;
 import java.util.*;
 
-import static org.openecomp.sdc.generator.ArtifactGenerationServiceTest.*;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.*;
+import static org.onap.sdc.generator.ArtifactGenerationServiceTest.*;
 
 public class SampleJUnitTest extends TestCase {
 
@@ -1167,7 +1173,8 @@ public class SampleJUnitTest extends TestCase {
             GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, new HashMap<String, String>());
 
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
+            Assert.assertEquals(data.getErrorData().get("AAI").get(0),
+                GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION);
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
@@ -1185,21 +1192,22 @@ public class SampleJUnitTest extends TestCase {
             additionalParams.put(AdditionalParams.ServiceVersion.getName(),"1");
             GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),GENERATOR_AAI_INVALID_SERVICE_VERSION);
+            Assert.assertEquals(data.getErrorData().get("AAI").get(0),
+                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
 
             additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.1");
             GenerationData data2 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG,
                 additionalParams);
             Assert.assertEquals(data2.getErrorData().isEmpty(),false);
             Assert.assertEquals(data2.getErrorData().get("AAI").get(0),
-                GENERATOR_AAI_INVALID_SERVICE_VERSION);
+                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
 
             additionalParams.put(AdditionalParams.ServiceVersion.getName(),"0.0");
             GenerationData data3 = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG,
                 additionalParams);
             Assert.assertEquals(data3.getErrorData().isEmpty(),false);
             Assert.assertEquals(data3.getErrorData().get("AAI").get(0),
-                GENERATOR_AAI_INVALID_SERVICE_VERSION);
+                GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION);
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         } finally{
@@ -1263,7 +1271,8 @@ public class SampleJUnitTest extends TestCase {
             GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
             Assert.assertEquals(data.getErrorData().get("AAI").get(0),
-                String.format(GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
+                String.format(
+                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
                     toscas.get(0).getMetadata().get("UUID")));
 
             inputArtifacts.remove(1);
@@ -1273,7 +1282,8 @@ public class SampleJUnitTest extends TestCase {
                 additionalParams);
             Assert.assertEquals(data2.getErrorData().isEmpty(),false);
             Assert.assertEquals(data2.getErrorData().get("AAI").get(0),
-                String.format(GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
+                String.format(
+                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA,
                     toscas.get(0).getMetadata().get("UUID")));
 
         } catch (Exception e) {
@@ -1296,7 +1306,8 @@ public class SampleJUnitTest extends TestCase {
 
             GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
-            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA,toscas.get(0).getMetadata().get("UUID")));
+            Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format(
+                GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA,toscas.get(0).getMetadata().get("UUID")));
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
@@ -1321,7 +1332,7 @@ public class SampleJUnitTest extends TestCase {
 
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
             Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-                (GENERATOR_AAI_PROVIDING_SERVICE_MISSING, toscas.get(1).getModelId()));
+                (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING, toscas.get(1).getModelId()));
 
         } catch (Exception e) {
             Assert.fail(e.getMessage());
@@ -1498,7 +1509,7 @@ public class SampleJUnitTest extends TestCase {
             GenerationData data = obj.generateArtifact(inputArtifacts, GENERATOR_CONFIG, additionalParams);
             Assert.assertEquals(data.getErrorData().isEmpty(),false);
             Assert.assertEquals(data.getErrorData().get("AAI").get(0),String.format
-                (GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, toscas.get(2).getModelId()));
+                (GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING, toscas.get(2).getModelId()));
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
@@ -1570,10 +1581,12 @@ public class SampleJUnitTest extends TestCase {
             try {
                 return GeneratorUtil.translateTosca(new String(decodedInput), ToscaTemplate.class);
             } catch (Exception e) {
-                throw new IllegalArgumentException(String.format(GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName()));
+                throw new IllegalArgumentException(String.format(
+                    GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName()));
             }
         } else {
-            throw new SecurityException(String.format(GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH, input.getName()));
+            throw new SecurityException(String.format(
+                GeneratorConstants.GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH, input.getName()));
         }
     }