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 / ArtifactGenerationServiceTest.java

diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
similarity index 98%
rename from common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
rename to common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
index 38462d0..b11c33e 100644 (file)
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/src/main/java/org/openecomp/sdc/generator/ArtifactGenerationServiceTest.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.generator;
-
-import org.openecomp.sdc.generator.aai.model.*;
-import org.openecomp.sdc.generator.aai.model.Service;
-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.aai.xml.*;
-import org.openecomp.sdc.generator.aai.xml.Model;
-import org.openecomp.sdc.generator.data.*;
+package org.onap.sdc.generator;
+
+import org.onap.sdc.generator.aai.model.*;
+import org.onap.sdc.generator.aai.model.Service;
+import org.onap.sdc.generator.aai.tosca.GroupDefinition;
+import org.onap.sdc.generator.aai.tosca.NodeTemplate;
+import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
+import org.onap.sdc.generator.aai.xml.*;
+import org.onap.sdc.generator.aai.xml.Model;
+import org.onap.sdc.generator.data.*;
 import org.junit.Assert;
 
 import javax.xml.bind.JAXBContext;
@@ -41,8 +41,6 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.openecomp.sdc.generator.SampleJUnitTest.additionalParams;
-
 @SuppressWarnings("Duplicates")
 public class ArtifactGenerationServiceTest {
 
@@ -367,7 +365,8 @@ public class ArtifactGenerationServiceTest {
         if (serviceTosca == null) {
             org.testng.Assert.fail("Service Tosca not found");
         }
-        serviceTosca.getMetadata().put("version", additionalParams.get(AdditionalParams
+        serviceTosca.getMetadata().put("version", SampleJUnitTest.additionalParams.get(
+            AdditionalParams
             .ServiceVersion.getName()));
         Service service = new Service();
         service.populateModelIdentificationInformation(serviceTosca.getMetadata());
@@ -434,7 +433,8 @@ public class ArtifactGenerationServiceTest {
     private static void validateWidgetIds(List<ModelElement> matchedServiceBaseWidgetElements,
                                           String widgetName, String widgetInvUuId) {
         org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0)
-            .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty(ArtifactType.AAI.name()
+            .getRelationshipData().get(0).getRelationshipValue(), properties.getProperty(
+            ArtifactType.AAI.name()
             + ".model-version-id."+ widgetName));
 
         org.testng.Assert.assertEquals(matchedServiceBaseWidgetElements.get(0).getRelationshipList().getRelationship().get(0)