Merge "Reorder modifiers"

[so.git] / asdc-controller / src / test / java / org / openecomp / mso / asdc / installer / heat / tests / ToscaResourceInstallerTest.java

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
index 0d81455..ebcae50 100644 (file)
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
 import org.mockito.Mockito;\r
 import org.openecomp.mso.asdc.client.ASDCConfiguration;\r
 import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;\r
-import org.openecomp.mso.asdc.client.tests.ASDCControllerTest;\r
+import org.openecomp.mso.asdc.client.ASDCControllerTest;\r
 import org.openecomp.mso.asdc.installer.ToscaResourceStructure;\r
 import org.openecomp.mso.asdc.installer.VfResourceStructure;\r
 import org.openecomp.mso.asdc.installer.heat.ToscaResourceInstaller;\r
@@ -65,23 +65,23 @@ import org.openecomp.mso.db.catalog.beans.VnfResourceCustomization;
 import org.openecomp.mso.properties.MsoJavaProperties;\r
 import org.openecomp.mso.properties.MsoPropertiesException;\r
 import org.openecomp.mso.properties.MsoPropertiesFactory;\r
-import org.openecomp.sdc.api.IDistributionClient;\r
-import org.openecomp.sdc.api.notification.IArtifactInfo;\r
-import org.openecomp.sdc.api.notification.INotificationData;\r
-import org.openecomp.sdc.api.notification.IResourceInstance;\r
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;\r
-import org.openecomp.sdc.api.results.IDistributionClientResult;\r
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;\r
-import org.openecomp.sdc.tosca.parser.impl.FilterType;\r
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;\r
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignment;\r
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignments;\r
-import org.openecomp.sdc.toscaparser.api.Group;\r
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;\r
-import org.openecomp.sdc.toscaparser.api.RequirementAssignments;\r
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;\r
-import org.openecomp.sdc.toscaparser.api.parameters.Input;\r
-import org.openecomp.sdc.utils.DistributionActionResultEnum;\r
+import org.onap.sdc.api.IDistributionClient;\r
+import org.onap.sdc.api.notification.IArtifactInfo;\r
+import org.onap.sdc.api.notification.INotificationData;\r
+import org.onap.sdc.api.notification.IResourceInstance;\r
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;\r
+import org.onap.sdc.api.results.IDistributionClientResult;\r
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;\r
+import org.onap.sdc.tosca.parser.impl.FilterType;\r
+import org.onap.sdc.tosca.parser.impl.SdcTypes;\r
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;\r
+import org.onap.sdc.toscaparser.api.CapabilityAssignments;\r
+import org.onap.sdc.toscaparser.api.Group;\r
+import org.onap.sdc.toscaparser.api.NodeTemplate;\r
+import org.onap.sdc.toscaparser.api.RequirementAssignments;\r
+import org.onap.sdc.toscaparser.api.elements.Metadata;\r
+import org.onap.sdc.toscaparser.api.parameters.Input;\r
+import org.onap.sdc.utils.DistributionActionResultEnum;\r
 \r
 import mockit.Mock;\r
 import mockit.MockUp;\r