Implementing download service CSAR endpoint

Change-Id: If0de06835d0bfc2a1531fddba0b0298a4bc15af8
Issue-ID: INT-1839
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

2 files changed, 16 insertions, 3 deletions

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
index 57db74c3..e3d040da 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.UUID;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.so.sdcsimulator.models.Metadata;
 import org.onap.so.sdcsimulator.models.ResourceAssetInfo;
 import org.onap.so.sdcsimulator.models.ResourceMetadata;
 import org.onap.so.sdcsimulator.models.ServiceAssetInfo;
@@ -80,7 +79,7 @@ public class CatalogControllerTest {
     private UserCredentials userCredentials;
 
     @Test
-    public void test_getCsar_validCsarId_matchContent() {
+    public void test_getResourceCsar_validCsarId_matchContent() {
 
         final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/toscaModel";
 
@@ -94,6 +93,20 @@ public class CatalogControllerTest {
     }
 
     @Test
+    public void test_getServiceCsar_validCsarId_matchContent() {
+
+        final String url = getBaseUrl() + "/services/" + SERVICE_ID + "/toscaModel";
+
+        final ResponseEntity<byte[]> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertTrue(response.hasBody());
+        assertEquals(147743, response.getBody().length);
+
+    }
+
+    @Test
     public void test_getResources_validResourcesFromClassPath() {
 
         final ResponseEntity<Set<ResourceAssetInfo>> response =
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
index 293d70d2..24f5c754 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
@@ -62,7 +62,7 @@ public class AssetProviderImplTest {
 
         Files.write(file, DUMMY_CONTENT.getBytes());
 
-        final AssetProviderImpl objUnderTest = new AssetProviderImpl(folder.getPath(), resourcePatternResolver);
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl(folder.getParent(), resourcePatternResolver);
 
         assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getAsset(uuid, RESOURCES).get());
     }