Validate the Resource Model before importing VSP

Validates the Resource Model selected during the Import VSP.
This model must be aligned with one of the models that the
imported VSP relates to.
Fix VSP package retrieval to get the exact version from the
VSP chosen during the Import VSP process.
Introduces a client in the Catalog to retrieve from the
Onboarding backend a VSP information using its Id and
version Id.

Change-Id: Ic8fb52b6daadc0e7203c81a9c15c3e46d5b9fffb
Issue-ID: SDC-3675
Signed-off-by: andre.schmid <andre.schmid@est.tech>

1 files changed, 11 insertions, 8 deletions

diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploaderTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploaderTest.java
index 3a7fd0e11b..40f0faed21 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploaderTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploaderTest.java
@@ -20,19 +20,22 @@
 
 package org.openecomp.sdc.asdctool.configuration;
 
-import org.junit.Test;
 
-public class ConfigurationUploaderTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-	private ConfigurationUploader createTestSubject() {
-		return new ConfigurationUploader();
-	}
+import org.junit.jupiter.api.Test;
+
+class ConfigurationUploaderTest {
 
 	@Test
-	public void testUploadConfigurationFiles() throws Exception {
-		String appConfigDir = "src/main/resources/config/";
+	void testUploadConfigurationFiles() {
+		final var appConfigDir = "src/main/resources/config/";
 
-		// default test
+		//when
 		ConfigurationUploader.uploadConfigurationFiles(appConfigDir);
+
+		//then
+		assertEquals(appConfigDir, System.getProperty("config.home"));
+		assertEquals(appConfigDir + "Artifact-Generator.properties", System.getProperty("artifactgenerator.config"));
 	}
 }